* updated html target

docs/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/19]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/09]
 #
 default: help
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd arm-linux
@@ -954,7 +954,7 @@ export UPXPROG
 ZIPOPT=-9
 ZIPEXT=.zip
 ifeq ($(USETAR),bz2)
-TAROPT=vj
+TAROPT=vI
 TAREXT=.tar.bz2
 else
 TAROPT=vz
@@ -1440,15 +1440,7 @@ endif
 ifndef DOCS
 DOCS = user rtl ref prog fpdoc chart
 endif
-ifdef USEHEVEA
-PREAMBLETYPE = hevea
-else
-ifdef USEL2H
-PREAMBLETYPE = html
-else
 PREAMBLETYPE = report
-endif
-endif
 ifndef CROSSCOMPILE
 ifndef FPDOC
 ifneq ($(wildcard ../utils/fpdoc/fpdoc),)
@@ -1502,7 +1494,6 @@ endif
 endif # USEHEVEA
 export TMP=/tmp
 PS = $(addsuffix .ps, $(DOCS))
-HTML = $(addsuffix .html, $(DOCS))
 DVI = $(addsuffix .dvi, $(DOCS))
 TXT = $(addsuffix .txt, $(DOCS))
 PDF = $(addsuffix .pdf, $(DOCS))
@@ -1511,6 +1502,8 @@ AUX = $(addsuffix .aux, $(DOCS))
 LOG = $(addsuffix .log, $(DOCS))
 LOT = $(addsuffix .lot, $(DOCS))
 OUT = $(addsuffix .out, $(DOCS))
+HTML = $(DOCS)
+CHK = $(addsuffix .chk, $(DOCS))
 .PHONY: clean dvi help html ps psdist htmldist htmdist htdist pdfdist \
 	txtdist htm txt pdf refex alldist messages onechap gtk \
 	user ref prog rtl
@@ -1519,6 +1512,7 @@ OUT = $(addsuffix .out, $(DOCS))
 	$(DVIPS) $<
 .tex.dvi:
 	-rm $*.aux $*.idx  $*.ilg  $*.ind  $*.log  $*.out  $*.toc $*.tmp $*.xref $*.4ht
+	cp -f preamble.$(PREAMBLETYPE) preamble.inc
 	$(LATEX) $*
 	-$(MAKEINDEX) $*
 	$(LATEX) $*
@@ -1528,6 +1522,7 @@ OUT = $(addsuffix .out, $(DOCS))
 	$(DVITXT) -o $*.txt  $*.dvi
 .tex.pdf:
 	-rm $*.aux $*.idx  $*.ilg  $*.ind  $*.log  $*.out  $*.toc $*.tmp $*.xref $*.4ht
+	cp -f preamble.$(PREAMBLETYPE) preamble.inc
 	$(PDFLATEX) $*
 	-$(MAKEINDEX) $*
 	$(PDFLATEX) $*
@@ -1559,21 +1554,19 @@ clean:
 	-rm -f preamble.inc date.inc messages.inc
 	-rm -f *.4tc *.4ct *.css *.lg *.tmp *.xref
 	-rm -rf $(DOCS)
-	-rm -f $(TOC) $(LOG) $(DVI) $(PDF) $(AUX) $(OUT) $(PS) $(HTML) *.i* $(LOT) $(TXT)
-	-rm -f $(notdir $(wildcard styles/*))
+	-rm -f $(CHK) $(TOC) $(LOG) $(DVI) $(PDF) $(AUX) $(OUT) $(PS) $(HTML) *.i* $(LOT) $(TXT)
+	-rm -f $(notdir $(wildcard styles/*.sty))
 distclean: clean cleanexamples
 	-rm -f *.tar.gz *.zip
 date.inc:
 	@echo \\date\{`date +'%B %Y'`\} > date.inc
-preamble.inc:
-	cp -f preamble.$(PREAMBLETYPE) preamble.inc
 ../compiler/msg2inc$(EXEEXT):
 	$(MAKE) -C ../compiler msg2inc
 messages.inc: ../compiler/msg2inc$(EXEEXT) ../compiler/msg/errore.msg
 	../compiler/msg2inc -TE ../compiler/msg/errore.msg messages.inc
 syntax.sty: styles/syntax.sty
-	cp $(wildcard styles/*.*) .
-INCLUDES=date.inc preamble.inc syntax.sty
+	cp $(wildcard styles/*.sty) .
+INCLUDES=date.inc syntax.sty
 SYSTEMUNITDIR=$(OS_SOURCE)
 ifeq ($(findstring bsd,$(OS_SOURCE)),)
 override SYSTEMUNITDIR=bsd
@@ -1676,6 +1669,16 @@ else
 include Makefile.4ht
 endif  # USEL2H
 endif  # USEHEVEA
+rtl.chk: $(RTLXML)
+	$(FPDOC) $(RTLOPTS) --format=html --output=rtl
+	touch rtl.chk
+user.chk: $(INCLUDES) user.tex messages.inc
+prog.chk: $(INCLUDES) prog.tex
+onechap.chk: $(INCLUDES) onechap.tex
+ref.chk: $(INCLUDES) ref.tex
+fpdoc.chk: $(INCLUDES) fpdoc.tex
+chart.chk: $(INCLUDES) chart.tex
+html: $(INCLUDES) $(CHK)
 endif  # INSTALLDEBUG
 hevea:
 	$(MAKE) html USEHEVEA=1
@@ -1683,12 +1686,6 @@ l2h:
 	$(MAKE) html USEL2H=1
 4ht:
 	$(MAKE) html USETEX4HT=1
-fcl: fcl/index.html
-fcl/index.html: classes.xml
-	$(FPDOC) $(FCLOPTS) --format=html --output=fcl
-rtl: rtl/index.html
-rtl/index.html: $(RTLXML)
-	$(FPDOC) $(RTLOPTS) --format=html --output=rtl
 GTKPDF=$(addsuffix .pdf,$(addprefix gtk, 1 2 3 4 5))
 gtk: $(GTKPDF)
 gtk1.pdf: gtk1.tex
@@ -1728,16 +1725,18 @@ pdftar:
 	$(MAKE) zipinstall ZIPTARGET=pdfinstall UNIXHier=1 USETAR=y FULLZIPNAME=fpcdoc
 pdfzip:
 	$(MAKE) zipinstall ZIPTARGET=pdfinstall UNIXHier= USEZIP=y FULLZIPNAME=doc-pdf
-dvidist:
-	$(MAKE) zipinstall ZIPTARGET=dviinstall FULLZIPNAME=doc-dvi
-txtdist:
-	$(MAKE) zipinstall ZIPTARGET=txtinstall FULLZIPNAME=doc-txt
+dvizip:
+	$(MAKE) zipinstall ZIPTARGET=dviinstall UNIXHier= USEZIP=y FULLZIPNAME=doc-dvi
+txtzip:
+	$(MAKE) zipinstall ZIPTARGET=txtinstall UNIXHier= USEZIP=y FULLZIPNAME=doc-txt
 htmltar:
 	$(MAKE) zipinstall ZIPTARGET=htmlinstall UNIXHier=1 USETAR=y FULLZIPNAME=fpcdochtml
 htmlzip:
 	$(MAKE) zipinstall ZIPTARGET=htmlinstall UNIXHier= USEZIP=y FULLZIPNAME=doc-html
 psdist: pszip pstar
 pdfdist: pdfzip pdftar
+txtdist: txtzip
+dvidist: dvizip
 htmldist: htmlzip htmltar
 alldist: dvidist psdist txtdist pdfdist htmldist
 examples:

docs/Makefile.4ht

@@ -1,33 +1,19 @@
 #
 # Make latex using tex4ht
 #
-HTFONTS=/usr/share/texmf/tex/generic/tex4ht/ht-fonts/
-.PHONY: preamble3 preamble4 $(HTML)
-
-preamble3:
-	cp preamble.ts3 preamble.inc		
 
-preamble4:
-	cp preamble.ts4 preamble.inc		
-
-%.html: %.tex 
-	rm -f $(basename $<).aux $(basename $<).idx 
-	rm -f $(basename $<).toc $(basename $<).ind
+HTFONTS=/usr/share/texmf/tex/generic/tex4ht/ht-fonts/
+TEXEXTS=.4ct .aux .dvi .xref .4tc .idx .log .tmp .lg .idv
+	
+%.chk: %.tex
+	rm -rf $(basename $<)
+	rm -f $(addprefix $(basename $<),$(TEXEXTS))
+	cp -f preamble.ts4 preamble.inc
 	$(LATEX) $<
 	$(LATEX) $<
 	$(LATEX) $<
-	tex4ht $< -i$(HTFONTS)
 	install -d $(basename $<) -m755
-	t4ht $< -d$(basename $<)/ -m644
-	rm $(basename $<)*.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: $(INCLUDES) $(HTML)
+	for ext in $(TEXEXTS); do [ -f $(basename $<)$$ext ] && mv $(basename $<)$$ext $(basename $<); done || true
+	cd $(basename $<) && tex4ht $< -i$(HTFONTS) && t4ht $< -m644
+	rm -f $(addprefix $(basename $<)/$(basename $<),$(TEXEXTS))
+	touch $@

docs/Makefile.fpc

@@ -37,16 +37,8 @@ ifndef DOCS
 DOCS = user rtl ref prog fpdoc chart
 endif
 
-# Can be 'report','book', 'html', 'hevea', 'ts3' 'ts4'
-ifdef USEHEVEA
-PREAMBLETYPE = hevea
-else
-ifdef USEL2H
-PREAMBLETYPE = html
-else
+# Can be 'report','book' for pdf/ps, html use their own preamble file
 PREAMBLETYPE = report
-endif
-endif
 
 # Locate FPDoc
 ifndef CROSSCOMPILE
@@ -132,7 +124,6 @@ export TMP=/tmp
 
 
 PS = $(addsuffix .ps, $(DOCS))
-HTML = $(addsuffix .html, $(DOCS))
 DVI = $(addsuffix .dvi, $(DOCS))
 TXT = $(addsuffix .txt, $(DOCS))
 PDF = $(addsuffix .pdf, $(DOCS))
@@ -141,6 +132,9 @@ AUX = $(addsuffix .aux, $(DOCS))
 LOG = $(addsuffix .log, $(DOCS))
 LOT = $(addsuffix .lot, $(DOCS))
 OUT = $(addsuffix .out, $(DOCS))
+# Html files are build in a directory
+HTML = $(DOCS)
+CHK = $(addsuffix .chk, $(DOCS))
 
 
 #####################################################################
@@ -160,6 +154,7 @@ OUT = $(addsuffix .out, $(DOCS))
 
 .tex.dvi:
         -rm $*.aux $*.idx  $*.ilg  $*.ind  $*.log  $*.out  $*.toc $*.tmp $*.xref $*.4ht
+        cp -f preamble.$(PREAMBLETYPE) preamble.inc
         $(LATEX) $*
         -$(MAKEINDEX) $*
         $(LATEX) $*
@@ -171,6 +166,7 @@ OUT = $(addsuffix .out, $(DOCS))
 
 .tex.pdf:
         -rm $*.aux $*.idx  $*.ilg  $*.ind  $*.log  $*.out  $*.toc $*.tmp $*.xref $*.4ht
+        cp -f preamble.$(PREAMBLETYPE) preamble.inc
         $(PDFLATEX) $*
         -$(MAKEINDEX) $*
         $(PDFLATEX) $*
@@ -212,9 +208,9 @@ clean:
         -rm -f preamble.inc date.inc messages.inc
         -rm -f *.4tc *.4ct *.css *.lg *.tmp *.xref
         -rm -rf $(DOCS)
-        -rm -f $(TOC) $(LOG) $(DVI) $(PDF) $(AUX) $(OUT) $(PS) $(HTML) *.i* $(LOT) $(TXT)
+        -rm -f $(CHK) $(TOC) $(LOG) $(DVI) $(PDF) $(AUX) $(OUT) $(PS) $(HTML) *.i* $(LOT) $(TXT)
 # Styles
-        -rm -f $(notdir $(wildcard styles/*))
+        -rm -f $(notdir $(wildcard styles/*.sty))
 
 distclean: clean cleanexamples
         -rm -f *.tar.gz *.zip
@@ -226,9 +222,6 @@ distclean: clean cleanexamples
 date.inc:
         @echo \\date\{`date +'%B %Y'`\} > date.inc
 
-preamble.inc:
-        cp -f preamble.$(PREAMBLETYPE) preamble.inc
-
 ../compiler/msg2inc$(EXEEXT):
         $(MAKE) -C ../compiler msg2inc
 
@@ -237,10 +230,12 @@ messages.inc: ../compiler/msg2inc$(EXEEXT) ../compiler/msg/errore.msg
 
 # Local copy of the required styles
 syntax.sty: styles/syntax.sty
-        cp $(wildcard styles/*.*) .
+        cp $(wildcard styles/*.sty) .
 
-# Default includes needed for all docs
-INCLUDES=date.inc preamble.inc syntax.sty
+# Default includes needed for all docs, don't include preamble.inc
+# because that is overwritten everytime with a new value and therefor
+# always more recent
+INCLUDES=date.inc syntax.sty
 
 
 #####################################################################
@@ -394,6 +389,24 @@ else
 include Makefile.4ht
 endif  # USEL2H
 endif  # USEHEVEA
+
+#fcl.chk: classes.xml
+#        $(FPDOC) $(FCLOPTS) --format=html --output=fcl
+#        touch fcl.chk
+
+rtl.chk: $(RTLXML)
+        $(FPDOC) $(RTLOPTS) --format=html --output=rtl
+        touch rtl.chk
+
+user.chk: $(INCLUDES) user.tex messages.inc
+prog.chk: $(INCLUDES) prog.tex
+onechap.chk: $(INCLUDES) onechap.tex
+ref.chk: $(INCLUDES) ref.tex
+fpdoc.chk: $(INCLUDES) fpdoc.tex
+chart.chk: $(INCLUDES) chart.tex
+
+html: $(INCLUDES) $(CHK)
+
 endif  # INSTALLDEBUG
 #######################################################################
 # Targets to force using a specific tool.
@@ -404,15 +417,6 @@ l2h:
 4ht:
         $(MAKE) html USETEX4HT=1
 
-fcl: fcl/index.html
-
-fcl/index.html: classes.xml
-        $(FPDOC) $(FCLOPTS) --format=html --output=fcl
-
-rtl: rtl/index.html
-
-rtl/index.html: $(RTLXML)
-        $(FPDOC) $(RTLOPTS) --format=html --output=rtl
 
 #####################################################################
 # GTK Articles
@@ -485,11 +489,11 @@ pdftar:
 pdfzip:
         $(MAKE) zipinstall ZIPTARGET=pdfinstall UNIXHier= USEZIP=y FULLZIPNAME=doc-pdf
 
-dvidist:
-        $(MAKE) zipinstall ZIPTARGET=dviinstall FULLZIPNAME=doc-dvi
+dvizip:
+        $(MAKE) zipinstall ZIPTARGET=dviinstall UNIXHier= USEZIP=y FULLZIPNAME=doc-dvi
 
-txtdist:
-        $(MAKE) zipinstall ZIPTARGET=txtinstall FULLZIPNAME=doc-txt
+txtzip:
+        $(MAKE) zipinstall ZIPTARGET=txtinstall UNIXHier= USEZIP=y FULLZIPNAME=doc-txt
 
 htmltar:
         $(MAKE) zipinstall ZIPTARGET=htmlinstall UNIXHier=1 USETAR=y FULLZIPNAME=fpcdochtml
@@ -501,6 +505,10 @@ psdist: pszip pstar
 
 pdfdist: pdfzip pdftar
 
+txtdist: txtzip
+
+dvidist: dvizip
+
 htmldist: htmlzip htmltar
 
 alldist: dvidist psdist txtdist pdfdist htmldist
@@ -566,7 +574,10 @@ execute:
 
 #
 # $Log$
-# Revision 1.9  2005-02-18 23:04:15  michael
+# Revision 1.10  2005-02-19 22:24:47  peter
+#   * updated html target
+#
+# Revision 1.9  2005/02/18 23:04:15  michael
 # + Fixed psdist target zip names
 #
 # Revision 1.8  2005/02/14 17:53:11  peter

docs/Makefile.hev

@@ -2,14 +2,14 @@
 # Create HTML using hevea tex 2 html conversion
 #
 
-%.html: %.tex fpc-hevea.tex
+%.chk: %.tex fpc-hevea.tex
+	cp -f preamble.hev preamble.inc
 	$(HEVEA) $(HEVEAOPTS) $<
+	touch $(basename $<).chk
 
-user: $(INCLUDES) user.html
-units: $(INCLUDES) units.html
-prog: $(INCLUDES) prog.html
-onechap: $(INCLUDES) onechap.html
-ref: $(INCLUDES) ref.html
-fpdoc: $(INCLUDES) fpdoc.html
+user.chk: $(INCLUDES) user.tex messages.inc
+prog.chk: $(INCLUDES) prog.tex
+onechap.chk: $(INCLUDES) onechap.tex
+ref.chk: $(INCLUDES) ref.tex
+fpdoc.chk: $(INCLUDES) fpdoc.tex
 
-html: $(INCLUDES) $(addsuffix .html,$(HTML))

docs/Makefile.l2h

@@ -3,14 +3,8 @@
 # Create HTML using Latex2HTML
 #
 #
-htex: htex.chk
-htex.chk: $(wildcard *.tex) includes
-	./tex2htex
-	touch htex.chk
-
-user: user.chk
-user.chk: htex.chk includes
-	cp -f preamble.html preamble.inc
+user.chk: $(INCLUDES) messages.inc 
+	cp -f preamble.l2h preamble.inc
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 2 -link 2\
 	-t "User's guide for Free Pascal" user.htex
 	-sed -f foot.sed <user/footnode.html >user/footnote.html
@@ -21,9 +15,8 @@ ifndef DEBUG
 endif
 	touch user.chk
 
-units: units.chk
-units.chk: unitex.chk htex.chk includes
-	cp -f preamble.html preamble.inc
+units.chk: unitex.chk $(INCLUDES)
+	cp -f preamble.l2h preamble.inc
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 3 -link 2\
 	-t "Unit reference for Free Pascal" units.htex
 	-sed -f foot.sed <units/footnode.html >units/footnote.html
@@ -34,9 +27,8 @@ ifndef DEBUG
 endif
 	touch units.chk
 
-ref: ref.chk
-ref.chk: refex.chk htex.chk includes
-	cp -f preamble.html preamble.inc
+ref.chk: refex.chk $(INCLUDES)
+	cp -f preamble.l2h preamble.inc
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 4 -link 2\
 	-t "Free Pascal reference guide" ref.htex
 	-sed -f foot.sed <ref/footnode.html >ref/footnote.html
@@ -47,9 +39,8 @@ ifndef DEBUG
 endif
 	touch ref.chk	
 
-prog: prog.chk
-prog.chk: progex.chk htex.chk includes
-	cp -f preamble.html preamble.inc
+prog.chk: progex.chk $(INCLUDES)
+	cp -f preamble.l2h preamble.inc
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 2 -link 2\
 	-t "Free Pascal programmers guide" prog.htex
 	-sed -f foot.sed <prog/footnode.html >prog/footnote.html
@@ -62,7 +53,7 @@ endif
 
 internal: internal.chk
 internal.chk: htex.chk
-	cp -f preamble.html preamble.inc
+	cp -f preamble.l2h preamble.inc
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 4 -link 2\
 	-t "Free Pascal Compiler Documentation" internal.htex
 	-sed -f foot.sed <internal/footnode.html >internal/footnote.html
@@ -73,9 +64,8 @@ ifndef DEBUG
 endif
 	touch internal.chk	
 
-onechap: onechap.chk
-onechap.chk: unitex.chk htex.chk includes
-	cp -f preamble.html preamble.inc
+onechap.chk: unitex.chk $(INCLUDES)
+	cp -f preamble.l2h preamble.inc
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 4 -link 2\
 	-t "Free Pascal reference guide" onechap.htex
 	-sed -f foot.sed <onechap/footnode.html >onechap/footnote.html
@@ -86,9 +76,8 @@ ifndef DEBUG
 endif
 	touch onechap.chk	
 
-fpdoc: fpdoc.chk
-fpdoc.chk: htex.chk includes
-	cp -f preamble.html preamble.inc
+fpdoc.chk: $(INCLUDES)
+	cp -f preamble.l2h preamble.inc
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 2 -link 2\
 	-t "Free Pascal documentation tool manual" fpdoc.htex
 	-sed -f foot.sed <fpdoc/footnode.html >fpdoc/footnote.html
@@ -99,9 +88,8 @@ ifndef DEBUG
 endif
 	touch fpdoc.chk
 
-chart: chart.chk
-chart.chk: htex.chk includes
-	cp -f preamble.html preamble.inc
+chart.chk: $(INCLUDES)
+	cp -f preamble.l2h preamble.inc
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 2 -link 2\
 	-t "Free Pascal documentation tool manual" chart.htex
 	-sed -f foot.sed <chart/footnode.html >chart/footnote.html
@@ -111,6 +99,3 @@ ifndef DEBUG
 	-rm -f chart/images.* chart/*.log chart/WARNINGS
 endif
 	touch chart.chk
-
-html: $(HTML)
-

docs/preamble.hev

@@ -0,0 +1,6 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Preamble for HTML output
+%
+\usepackage{html}
+\usepackage{htmllist}
+\input{fpc-hevea.tex}

docs/preamble.ts3

@@ -1,11 +0,0 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Preamble for report output
-%
-\documentclass[a4paper]{report}
-\usepackage[html,3,png,sections+]{tex4ht}
-%
-% FPC package
-\usepackage{fpc}
-%
-% End.
-%