2
0
Эх сурвалжийг харах

* fix include dependencies

peter 20 жил өмнө
parent
commit
e168bf6b91

+ 8 - 10
docs/Makefile.4ht

@@ -4,8 +4,6 @@
 HTFONTS=/usr/share/texmf/tex/generic/tex4ht/ht-fonts/
 HTFONTS=/usr/share/texmf/tex/generic/tex4ht/ht-fonts/
 .PHONY: preamble3 preamble4 $(HTML)
 .PHONY: preamble3 preamble4 $(HTML)
 
 
-htmlincludes: includes
-
 preamble3:
 preamble3:
 	cp preamble.ts3 preamble.inc		
 	cp preamble.ts3 preamble.inc		
 
 
@@ -24,12 +22,12 @@ preamble4:
 	rm $(basename $<)*.html
 	rm $(basename $<)*.html
 
 
 
 
-user: htmlincludes preamble3 user.html 
-units: htmlincludes preamble3 units.html
-prog: htmlincludes preamble3 prog.html
-onechap: htmlincludes preamble3 onechap.html
-ref: htmlincludes preamble4 ref.html
-fpdoc: htmlincludes preamble3 fpdoc.html
-chart: htmlincludes preamble3 chart.html
+user: $(INCLUDES) preamble3 user.html 
+units: $(INCLUDES) preamble3 units.html
+prog: $(INCLUDES) preamble3 prog.html
+onechap: $(INCLUDES) preamble3 onechap.html
+ref: $(INCLUDES) preamble4 ref.html
+fpdoc: $(INCLUDES) preamble3 fpdoc.html
+chart: $(INCLUDES) preamble3 chart.html
 
 
-html: htmlincludes $(HTML)
+html: $(INCLUDES) $(HTML)

+ 7 - 9
docs/Makefile.hev

@@ -2,16 +2,14 @@
 # Create HTML using hevea tex 2 html conversion
 # Create HTML using hevea tex 2 html conversion
 #
 #
 
 
-htmlincludes: includes
-
 %.html: %.tex fpc-hevea.tex
 %.html: %.tex fpc-hevea.tex
 	$(HEVEA) $(HEVEAOPTS) $<
 	$(HEVEA) $(HEVEAOPTS) $<
 
 
-user: htmlincludes user.html
-units: htmlincludes units.html
-prog: htmlincludes prog.html
-onechap: htmlincludes onechap.html
-ref: htmlincludes ref.html
-fpdoc: htmlincludes fpdoc.html
+user: $(INCLUDES) user.html
+units: $(INCLUDES) units.html
+prog: $(INCLUDES) prog.html
+onechap: $(INCLUDES) onechap.html
+ref: $(INCLUDES) ref.html
+fpdoc: $(INCLUDES) fpdoc.html
 
 
-html: htmlincludes $(addsuffix .html,$(HTML))
+html: $(INCLUDES) $(addsuffix .html,$(HTML))