Mercurial Mercurial > cooking / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile
changeset 79 a0f224c26f08
parent 78 093ee7c2985f
child 80 9a1292a6be3e 
--- a/Makefile	Thu Aug 04 15:20:07 2016 +0300
+++ b/Makefile	Thu Aug 04 15:31:15 2016 +0300
@@ -101,8 +101,8 @@
 .PHONY: html
 html: $(HTML_FILES)
 
-$(HTML_DIR)/%.html: %.rst rst.css rst-multi.css $(HTML_DIR)/rst.tmpl $(MAKEFILE_LIST) | $(HTML_DIR)
-	$(RST2HTML) $(RST_FLAGS) --stylesheet=rst.css,rst-multi.css --template=$(HTML_DIR)/rst.tmpl $*.rst $@
+$(HTML_DIR)/%.html: %.rst www/rst.css www/rst-multi.css $(HTML_DIR)/rst.tmpl $(MAKEFILE_LIST) | $(HTML_DIR)
+	$(RST2HTML) $(RST_FLAGS) --stylesheet=www/rst.css,www/rst-multi.css --template=$(HTML_DIR)/rst.tmpl $*.rst $@
 
 $(HTML_DIR)/iframe.html: $(RST_FILES) $(MAKEFILE_LIST) | $(HTML_DIR)
 	{ \
@@ -121,7 +121,7 @@
 echo '</body></html>'; \
 } >$@
 
-$(HTML_DIR)/rst.tmpl: rst.tmpl $(MAKEFILE_LIST)
+$(HTML_DIR)/rst.tmpl: www/rst.tmpl $(MAKEFILE_LIST)
 	sed -e "s|{date}|$$(date +%F)|" -e "s|{rev}|$$(hg id -i)|"  <$< >$@
 
 $(HTML_DIR)/index.html: $(HTML_DIR)/README.html $(MAKEFILE_LIST) | $(HTML_DIR)
@@ -131,20 +131,20 @@
 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)
+$(HTML_DIR)/%.stp: misc/%.stp $(MAKEFILE_LIST) | $(HTML_DIR)
 	cp $< $@
 
-$(HTML_DIR)/chm.hhp: chm-hhp.sh $(MAKEFILE_LIST) | $(HTML_DIR)
-	./chm-hhp.sh >$@
+$(HTML_DIR)/chm.hhp: misc/chm-hhp.sh $(MAKEFILE_LIST) | $(HTML_DIR)
+	./$<  >$@
 
-$(HTML_DIR)/chm.hhc: chm-hhc.sh $(MAKEFILE_LIST) | $(HTML_DIR)
-	./chm-hhc.sh >$@
+$(HTML_DIR)/chm.hhc: misc/chm-hhc.sh $(MAKEFILE_LIST) | $(HTML_DIR)
+	./$<  >$@
 
 .PHONY: single-html
 single-html: $(HTML_DIR)/single.html
 
-$(HTML_DIR)/single.html: $(HTML_DIR)/single.rest rst.css rst-single.css $(RST_FILES)
-	$(RST2HTML) $(RST_FLAGS) --stylesheet=rst.css,rst-single.css $(HTML_DIR)/single.rest $@
+$(HTML_DIR)/single.html: $(HTML_DIR)/single.rest www/rst.css www/rst-single.css $(RST_FILES)
+	$(RST2HTML) $(RST_FLAGS) --stylesheet=www/rst.css,www/rst-single.css $(HTML_DIR)/single.rest $@
 
 $(HTML_DIR)/single.rest: $(RST_FILES) $(MAKEFILE_LIST)
 	{ \
cooking