avoid depending on "make opt"; set correct dependency on VERSION

git-svn-id: http://caml.inria.fr/svn/ocamldoc/trunk@12141 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Damien Doligez 2012-02-09 18:05:03 +00:00
parent e13358f454
commit 7fd09ee1bb
2 changed files with 5 additions and 5 deletions

View File

@ -5,7 +5,7 @@ TEXINPUTS=.:..:../refman:../library:../cmds:../tutorials:../../styles:
TEXFONTS=../../styles: TEXFONTS=../../styles:
RELEASE=$$HOME/release/$${RELEASENAME} RELEASE=$$HOME/release/$${RELEASENAME}
SRC=../../release SRC=../../release
OCAMLDOC=$(SRC)/ocamldoc/ocamldoc.opt -hide Pervasives OCAMLDOC=$(SRC)/ocamldoc/ocamldoc -hide Pervasives
HEVEA=hevea HEVEA=hevea
HACHA=hacha HACHA=hacha
INFO=-fix -exec xxdate.exe -info -w 79 INFO=-fix -exec xxdate.exe -info -w 79
@ -117,8 +117,8 @@ release:
.etex.tex: .etex.tex:
../tools/texquote2 < $*.etex > $*.tex ../tools/texquote2 < $*.etex > $*.tex
version.tex: $(SRC)/stdlib/sys.ml version.tex: $(SRC)/VERSION
sed -n -e 's/^\([0-9]*\.[0-9]*\).*$$/\\def\\ocamlversion{\1}/p' $(SRC)/VERSION > version.tex sed -n -e '1s/^\([0-9]*\.[0-9]*\).*$$/\\def\\ocamlversion{\1}/p' $(SRC)/VERSION > version.tex
warnings.tex: $(SRC)/utils/warnings.ml $(SRC)/ocamlc warnings.tex: $(SRC)/utils/warnings.ml $(SRC)/ocamlc
$(SRC)/boot/ocamlrun $(SRC)/ocamlc -warn-help | sed -e 's/^ *\([0-9A-Z][0-9]*\)\(.*\)/\\item[\1] \2/' > warnings.tex $(SRC)/boot/ocamlrun $(SRC)/ocamlc -warn-help | sed -e 's/^ *\([0-9A-Z][0-9]*\)\(.*\)/\\item[\1] \2/' > warnings.tex

View File

@ -44,12 +44,12 @@ CSLDIR=../../../release
VPATH=.:$(CSLDIR)/stdlib:$(CSLDIR)/otherlibs/unix:$(CSLDIR)/otherlibs/str:$(CSLDIR)/otherlibs/num:$(CSLDIR)/otherlibs/graph:$(CSLDIR)/otherlibs/threads:$(CSLDIR)/otherlibs/dynlink:$(CSLDIR)/otherlibs/bigarray VPATH=.:$(CSLDIR)/stdlib:$(CSLDIR)/otherlibs/unix:$(CSLDIR)/otherlibs/str:$(CSLDIR)/otherlibs/num:$(CSLDIR)/otherlibs/graph:$(CSLDIR)/otherlibs/threads:$(CSLDIR)/otherlibs/dynlink:$(CSLDIR)/otherlibs/bigarray
all: libs all: libs
libs: $(FILES) libs: $(FILES)
$(INTF): $(MLIS) $(INTF): $(MLIS)
$(CSLDIR)/ocamldoc/ocamldoc.opt -latex -I $(CSLDIR)/stdlib \ $(CSLDIR)/ocamldoc/ocamldoc -latex -I $(CSLDIR)/stdlib \
-I $(CSLDIR)/otherlibs/bigarray \ -I $(CSLDIR)/otherlibs/bigarray \
-I $(CSLDIR)/otherlibs/dynlink \ -I $(CSLDIR)/otherlibs/dynlink \
-I $(CSLDIR)/otherlibs/graph \ -I $(CSLDIR)/otherlibs/graph \