Suppression de l'entrée devdoc dans le Makefile principal et modification en conséquence du Makefile dans dev/doc

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@8750 85f007b7-540e-0410-9357-904b9bb8a0f7

2 files changed, 18 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index a7b773347d..2ce9d466ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1257,7 +1257,7 @@ install-latex:
 # Literate programming (with ocamlweb)
 ###########################################################################
 
-.PHONY: doc devdoc
+.PHONY: doc
 
 doc: glob.dump
 	(cd doc; make all)
@@ -1265,18 +1265,6 @@ doc: glob.dump
 clean::
 	(cd doc; make clean)
 
-devdoc: dev/doc/coq.tex
-	$(MAKE) -C dev/doc coq.ps minicoq.dvi
-
-dev/doc/coq.tex:
-	ocamlweb -p "\usepackage{epsfig}" \
-	dev/doc/macros.tex dev/doc/intro.tex \
-	lib/{doc.tex,*.mli} kernel/{doc.tex,*.mli} library/{doc.tex,*.mli} \
-	pretyping/{doc.tex,*.mli} interp/{doc.tex,*.mli} \
-	parsing/{doc.tex,*.mli} proofs/{doc.tex,*.mli} \
-	tactics/{doc.tex,*.mli} toplevel/{doc.tex,*.mli} \
-	-o dev/doc/coq.tex
-
 clean::
 	rm -f doc/coq.tex
 
diff --git a/dev/doc/Makefile b/dev/doc/Makefile
index a0bef8976c..9649101738 100644
--- a/dev/doc/Makefile
+++ b/dev/doc/Makefile
@@ -1,7 +1,7 @@
 
 # Makefile for doc/
 
-all:: newparse 
+all:: newparse coq.ps minicop.ps
 #newsyntax.dvi minicoq.dvi
 
 
@@ -10,19 +10,19 @@ OBJS=lex.cmo ast.cmo parse.cmo syntax.cmo
 newparse: $(OBJS) syntax.mli lex.ml syntax.ml
 	ocamlc -o newparse $(OBJS)
 
-.ml.cmo:
+%.cmo: %.ml
 	ocamlc -c $<
 
-.mli.cmi:
+%.cmi: %.mli
 	ocamlc -c $<
 
-.mll.ml:
+%.ml: %.mll
 	ocamllex $<
 
-.mly.ml:
+%.ml: %.mly
 	ocamlyacc -v $<
 
-.mly.mli:
+%.mli: %.mly
 	ocamlyacc -v $<
 
 clean::
@@ -43,7 +43,14 @@ coq.dvi: coq.tex
 	latex coq
 
 coq.tex::
-	make -C .. doc/coq.tex
+	ocamlweb -p "\usepackage{epsfig}" \
+	macros.tex intro.tex \
+	../../lib/{doc.tex,*.mli} ../../kernel/{doc.tex,*.mli} ../../library/{doc.tex,*.mli} \
+	../../pretyping/{doc.tex,*.mli} ../../interp/{doc.tex,*.mli} \
+	../../parsing/{doc.tex,*.mli} ../../proofs/{doc.tex,*.mli} \
+	../../tactics/{doc.tex,*.mli} ../../toplevel/{doc.tex,*.mli} \
+	-o coq.tex
+
 
 depend:: kernel.dep.ps library.dep.ps pretyping.dep.ps parsing.dep.ps \
          proofs.dep.ps tactics.dep.ps toplevel.dep.ps interp.dep.ps
@@ -59,9 +66,10 @@ clean::
 
 .SUFFIXES: .tex .dvi .ps .cmo .cmi .mli .ml .mll .mly
 
-.tex.dvi:
+%.dvi: %.tex
 	latex $< && latex $<
 
-.dvi.ps:
+%.ps: %.dvi
 	dvips $< -o $@
 
+