[project @ 2004-06-05 21:55:51 by panne]

"make dvi ps html" in $(TOP) builds *all* documentation now

diff --git a/ghc/docs/Makefile b/ghc/docs/Makefile
index d11e3ad..31081db 100644 (file)
--- a/ghc/docs/Makefile
+++ b/ghc/docs/Makefile
@@ -1,7 +1,7 @@
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = users_guide
+SUBDIRS = users_guide ext-core storage-mgt
 
 PAGES = index.html
 

diff --git a/ghc/docs/ext-core/Makefile b/ghc/docs/ext-core/Makefile
index af60181..b5814d0 100644 (file)
--- a/ghc/docs/ext-core/Makefile
+++ b/ghc/docs/ext-core/Makefile
@@ -1,30 +1,34 @@
-#      General makefile for Latex stuff\r
-\r
-ps: core.ps\r
-\r
-core.dvi:      core.tex prims.tex\r
-               latex core.tex\r
-               latex core.tex\r
-\r
-../../compiler/prelude/primops.txt: ../../compiler/prelude/primops.txt.pp\r
-               (cd ../../compiler/prelude; gcc -E -I../../includes -traditional -x c primops.txt.pp | /bin/sed -e '/^#/d' > primops.txt)\r
-\r
-prims.tex:     ../../compiler/prelude/primops.txt\r
-               ../../utils/genprimopcode/genprimopcode --make-latex-doc < ../../compiler/prelude/primops.txt > prims.tex\r
-\r
-\r
-######## General rules\r
-.SUFFIXES:\r
-.PRECIOUS: %.tex %.ps %.bbl\r
-\r
-\r
-%.ps: %.dvi\r
-       dvips -f < $< > $@\r
-\r
-clean:\r
-       rm -f *.aux *.log\r
-\r
-nuke: clean\r
-       rm -f *.dvi *.ps *.bbl *.blg\r
-\r
-# End of file\r
+#      General makefile for Latex stuff
+
+dvi: core.dvi
+ps: core.ps
+html:
+
+core.dvi:      core.tex prims.tex
+               latex core.tex
+               latex core.tex
+
+../../compiler/prelude/primops.txt: ../../compiler/prelude/primops.txt.pp
+               (cd ../../compiler/prelude; gcc -E -I../../includes -traditional -x c primops.txt.pp | /bin/sed -e '/^#/d' > primops.txt)
+
+prims.tex:     ../../compiler/prelude/primops.txt
+               ../../utils/genprimopcode/genprimopcode --make-latex-doc < ../../compiler/prelude/primops.txt > prims.tex
+
+
+######## General rules
+.SUFFIXES:
+.PRECIOUS: %.tex %.ps %.bbl
+
+
+%.ps: %.dvi
+       dvips -f < $< > $@
+
+clean:
+       $(RM) *.aux *.log
+
+distclean: clean
+       $(RM) prims.tex *.dvi *.ps *.bbl *.blg *.gz
+
+maintainer-clean: distclean
+
+# End of file

diff --git a/ghc/docs/storage-mgt/Makefile b/ghc/docs/storage-mgt/Makefile
index ee543f3..9dc1c01 100644 (file)
--- a/ghc/docs/storage-mgt/Makefile
+++ b/ghc/docs/storage-mgt/Makefile
@@ -1,26 +1,29 @@
-#      General makefile for Latex stuff\r
-\r
-ps: sm.ps rp.ps ldv.ps\r
-\r
-\r
-######## General rules\r
-.SUFFIXES:\r
-.PRECIOUS: %.tex %.ps %.bbl\r
-\r
-#%.dvi: %.tex $(addsuffix .tex, $(basename $(wildcard *.verb *.fig))) $(wildcard *.bib)\r
-%.dvi: %.tex $(addsuffix .tex, $(basename $(wildcard *.verb))) $(wildcard *.bib)\r
-       latex $<\r
-       @if grep -s "\citation" $*.aux; then bibtex $*; fi\r
-       latex $<\r
-       latex $<\r
-\r
-%.ps: %.dvi\r
-       dvips -f < $< > $@\r
-\r
-clean:\r
-       rm -f *.aux *.log\r
-\r
-nuke: clean\r
-       rm -f *.dvi *.ps *.bbl *.blg\r
-\r
-# End of file\r
+#      General makefile for Latex stuff
+
+dvi: sm.dvi rp.dvi ldv.dvi
+ps: sm.ps rp.ps ldv.ps
+html:
+
+######## General rules
+.SUFFIXES:
+.PRECIOUS: %.tex %.ps %.bbl
+
+#%.dvi: %.tex $(addsuffix .tex, $(basename $(wildcard *.verb *.fig))) $(wildcard *.bib)
+%.dvi: %.tex $(addsuffix .tex, $(basename $(wildcard *.verb))) $(wildcard *.bib)
+       latex $<
+       @if grep -s "\citation" $*.aux; then bibtex $*; fi
+       latex $<
+       latex $<
+
+%.ps: %.dvi
+       dvips -f < $< > $@
+
+clean:
+       $(RM) *.aux *.log
+
+distclean: clean
+       $(RM) *.dvi *.ps *.bbl *.blg *.gz
+
+maintainer-clean: distclean
+
+# End of file

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 66c18c1..71aa514 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -145,9 +145,9 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 #
 # Build the libs first if we're bootstrapping from .hc files.
 ifeq "$(BootingFromHc)" "YES"
-AllProjects = glafp-utils happy alex haddock libraries hslibs ghc greencard hdirect hood nofib
+AllProjects = glafp-utils happy alex haddock libraries hslibs ghc greencard hdirect hood nofib docs
 else
-AllProjects = glafp-utils happy alex haddock ghc libraries hslibs greencard hdirect hood nofib
+AllProjects = glafp-utils happy alex haddock ghc libraries hslibs greencard hdirect hood nofib docs
 endif
 
 #