Modified the Makefile to work in the source tree.

From now, you can just `make userdocs' in doc, no need to use ugly scripts.

Also, `make progdocs' builds the programmer's documentation in HTML,
LaTeX version to come later.

diff --git a/doc/Makefile b/doc/Makefile
index 065323d055e98cc8a7c57e5901dee00d940d02fb..9346b7d77105fc62baf5115ee3afc5c4deab338c 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,10 +1,21 @@
 root-rel=../
 dir-name=doc
 
+ifneq ($(wildcard ../Rules),)
 include ../Rules
+else
+srcdir=$(shell cd $(root-rel) ; pwd)
+srcdir_abs=$(srcdir)
+endif
 
-progdocs:
-       mkdir -p prog
+# Force rebuilds
+.PHONY: prog.sgml bird.sgml
+
+docs: progdocs userdocs
+
+progdocs: prog.html
+
+prog.sgml:
        $(srcdir)/tools/progdoc $(srcdir_abs)
 
 %.html: %.sgml
@@ -13,16 +24,17 @@ progdocs:
 %.info: %.sgml
        sgml2info $<
 
-%.txt: %.sgml
-       sgml2txt $<
-
 %.dvi: %.sgml
        ./sgml2latex $<
 
 %.tex: %.sgml
        ./sgml2latex --output=tex $<
 
-userdocs: bird.html bird.dvi
+%.txt: %.sgml
+       ./sgml2txt $<
+
+userdocs: bird.html bird.dvi bird.txt
 
 clean:
-       rm *.html *.tex *.dvi *.log
+       rm -f *.html *.tex *.dvi *.log *.ps *.txt
+       rm -f prog.sgml