changeset 65:6e28048f3e74

Remove frame based publishing, stick to iframe. Clean CHM code generation.
author Oleksandr Gavenko <gavenkoa@gmail.com>
date Sat, 20 Feb 2016 15:20:24 +0200
parents e1866d4fdbad
children edb06d57511f
files Makefile
diffstat 1 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Feb 20 02:42:01 2016 +0200
+++ b/Makefile	Sat Feb 20 15:20:24 2016 +0200
@@ -46,7 +46,7 @@
 HTML_DIR := tips-html
 RST_HTML_FILES := $(patsubst %.rst,$(HTML_DIR)/%.html,$(RST_FILES))
 HTML_FILES := $(RST_HTML_FILES) \
-        $(HTML_DIR)/index.html $(HTML_DIR)/iframe.html $(HTML_DIR)/frame.html $(HTML_DIR)/frame-index.html
+        $(HTML_DIR)/index.html $(HTML_DIR)/iframe.html
 TXT__FILES := $(addprefix $(HTML_DIR)/,$(TXT_FILES))
 
 CHM_FILES := $(addprefix $(HTML_DIR)/,chm.hhp chm.hhc chm.stp)
@@ -68,7 +68,7 @@
 .PHONY: deploy
 deploy: deploy2defun-web deploy2defun-hg deploy2sf-web deploy2sf-hg
 
-# Will be accessible via: http://tips.defun.work/frame.html
+# Will be accessible via: http://tips.defun.work/
 .PHONY: deploy2defun-web
 deploy2defun-web: html
 	rsync --delete -avP -e ssh tips-html/ $(WWW_SRV_USER)@$(WWW_SRV_NAME):/srv/www/tips/
@@ -77,7 +77,7 @@
 deploy2defun-hg:
 	hg push ssh://$(HG_SRV_USER)@$(HG_SRV_NAME)//srv/hg/tips || [ $$? = 1 ]
 
-# Will be accessible via: http://gavenkoa.users.sourceforge.net/tips-html/frame.html
+# Will be accessible via: http://gavenkoa.users.sourceforge.net/tips-html/
 .PHONY: deploy2sf-web
 deploy2sf-web: html
 	rsync --delete -avP -e ssh tips-html/ gavenkoa@frs.sourceforge.net:/home/user-web/g/ga/gavenkoa/htdocs/tips-html/
@@ -106,7 +106,7 @@
 echo '<ul style="padding-left: 1em;">'; \
 for f in $(sort $(RST_FILES)); do \
   n=$${f%.rst}; \
-  printf '<li><a target="_parent" href="%s.html">%s</a></li>' $$n $$n; \
+  printf '<li><a target="_parent" href="%s.html">%s</a></li>\n' $$n $$n; \
 done; \
 echo '</ul>'; \
 echo '</body></html>'; \
@@ -132,9 +132,6 @@
 echo '  Written by Oleksandr Gavenko (AKA gavenkoa), compiled at ``'`date +%F`'`` from rev ``'`hg id -i`'``.'; \
 } >$@
 
-$(HTML_DIR)/frame-index.html: index.sh $(RST_HTML_FILES) $(MAKEFILE_LIST) | $(HTML_DIR)
-	./index.sh frame >$@
-
 $(HTML_DIR)/index.html: $(HTML_DIR)/README.html $(MAKEFILE_LIST) | $(HTML_DIR)
 	cp $< $@
 
@@ -145,7 +142,7 @@
 	cp $< $@
 
 .PHONY: chm
-chm: html $(CHM_FILES) $(HTML_DIR)/index-chm.html
+chm: html $(CHM_FILES) $(HTML_DIR)/iframe.html
 	cd $(HTML_DIR); for file in *.html; do sed -i '/<\?xml.*\?>/d' $$file; done
 
 $(HTML_DIR)/%.stp: %.stp $(MAKEFILE_LIST) | $(HTML_DIR)
@@ -157,9 +154,6 @@
 $(HTML_DIR)/chm.hhc: chm-hhc.sh $(MAKEFILE_LIST) | $(HTML_DIR)
 	./chm-hhc.sh >$@
 
-$(HTML_DIR)/index-chm.html: index.sh $(MAKEFILE_LIST) | $(HTML_DIR)
-	./index.sh html >$@
-
 ################################################################
 # Init targets.