From c9b09851c5d296005adb9278812b45a077cc53d0 Mon Sep 17 00:00:00 2001 From: Michel Mauny Date: Thu, 30 Oct 2003 09:52:55 +0000 Subject: Finished fixed opt.opt installation of CamlP4 git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5893 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02 --- camlp4/Makefile | 2 +- camlp4/camlp4/.depend | 2 -- camlp4/compile/.depend | 4 ++-- camlp4/compile/comp_trail.ml | 2 +- camlp4/etc/.depend | 16 ++++++++-------- camlp4/etc/Makefile | 10 +++++++++- camlp4/meta/Makefile | 2 +- camlp4/odyl/.depend | 4 ++-- camlp4/tools/apply.sh | 2 +- 9 files changed, 25 insertions(+), 19 deletions(-) diff --git a/camlp4/Makefile b/camlp4/Makefile index 0af8f37c46..f80090a0b4 100644 --- a/camlp4/Makefile +++ b/camlp4/Makefile @@ -4,7 +4,7 @@ include config/Makefile DIRS=odyl camlp4 meta etc top ocpp lib man FDIRS=odyl camlp4 meta lib -OPTDIRS= lib odyl camlp4 meta compile +OPTDIRS= lib odyl camlp4 meta etc compile SHELL=/bin/sh COLD_FILES=ocaml_src/camlp4/argl.ml ocaml_src/camlp4/ast2pt.ml ocaml_src/camlp4/ast2pt.mli ocaml_src/camlp4/mLast.mli ocaml_src/camlp4/pcaml.ml ocaml_src/camlp4/pcaml.mli ocaml_src/camlp4/quotation.ml ocaml_src/camlp4/quotation.mli ocaml_src/camlp4/reloc.ml ocaml_src/camlp4/reloc.mli ocaml_src/camlp4/spretty.ml ocaml_src/camlp4/spretty.mli ocaml_src/lib/extfun.ml ocaml_src/lib/extfun.mli ocaml_src/lib/fstream.ml ocaml_src/lib/fstream.mli ocaml_src/lib/gramext.ml ocaml_src/lib/gramext.mli ocaml_src/lib/grammar.ml ocaml_src/lib/grammar.mli ocaml_src/lib/plexer.ml ocaml_src/lib/plexer.mli ocaml_src/lib/stdpp.ml ocaml_src/lib/stdpp.mli ocaml_src/lib/token.ml ocaml_src/lib/token.mli ocaml_src/meta/pa_extend.ml ocaml_src/meta/pa_extend_m.ml ocaml_src/meta/pa_macro.ml ocaml_src/meta/pa_r.ml ocaml_src/meta/pa_rp.ml ocaml_src/meta/pr_dump.ml ocaml_src/meta/q_MLast.ml ocaml_src/odyl/odyl_main.ml ocaml_src/odyl/odyl_main.mli ocaml_src/odyl/odyl.ml diff --git a/camlp4/camlp4/.depend b/camlp4/camlp4/.depend index 00ddb5ad46..bf82065403 100644 --- a/camlp4/camlp4/.depend +++ b/camlp4/camlp4/.depend @@ -11,8 +11,6 @@ ast2pt.cmo: $(OTOP)/parsing/asttypes.cmi $(OTOP)/parsing/location.cmi \ ast2pt.cmx: $(OTOP)/parsing/asttypes.cmi $(OTOP)/parsing/location.cmx \ $(OTOP)/parsing/longident.cmx mLast.cmi $(OTOP)/parsing/parsetree.cmi \ ast2pt.cmi -crc.cmo: $(OTOP)/otherlibs/dynlink/dynlink.cmi -crc.cmx: $(OTOP)/otherlibs/dynlink/dynlink.cmx pcaml.cmo: ast2pt.cmi mLast.cmi quotation.cmi reloc.cmi spretty.cmi pcaml.cmi pcaml.cmx: ast2pt.cmx mLast.cmi quotation.cmx reloc.cmx spretty.cmx pcaml.cmi quotation.cmo: mLast.cmi quotation.cmi diff --git a/camlp4/compile/.depend b/camlp4/compile/.depend index 707bed8f44..5031b171af 100644 --- a/camlp4/compile/.depend +++ b/camlp4/compile/.depend @@ -1,4 +1,4 @@ compile.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi compile.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx -pa_o_fast.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi -pa_o_fast.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx +comp_trail.cmo: ../camlp4/pcaml.cmi +comp_trail.cmx: ../camlp4/pcaml.cmx diff --git a/camlp4/compile/comp_trail.ml b/camlp4/compile/comp_trail.ml index 74c34b15a4..75f40abbf4 100644 --- a/camlp4/compile/comp_trail.ml +++ b/camlp4/compile/comp_trail.ml @@ -1,4 +1,4 @@ - +(* camlp4r pa_extend.cmo *) (****************************************) value interf_p = diff --git a/camlp4/etc/.depend b/camlp4/etc/.depend index 6349726235..8191673978 100644 --- a/camlp4/etc/.depend +++ b/camlp4/etc/.depend @@ -15,8 +15,6 @@ pa_lisp.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pa_lisp.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx pa_lispr.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pa_lispr.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx -pa_o.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi -pa_o.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx pa_ocamllex.cmo: $(OTOP)/lex/compact.cmi $(OTOP)/lex/cset.cmi \ $(OTOP)/lex/lexgen.cmi ../camlp4/mLast.cmi ../camlp4/pcaml.cmi \ $(OTOP)/lex/syntax.cmi @@ -25,10 +23,14 @@ pa_ocamllex.cmx: $(OTOP)/lex/compact.cmx $(OTOP)/lex/cset.cmx \ $(OTOP)/lex/syntax.cmx pa_olabl.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pa_olabl.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx +pa_o.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi +pa_o.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx pa_oop.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pa_oop.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx pa_op.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pa_op.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx +parserify.cmo: ../camlp4/mLast.cmi parserify.cmi +parserify.cmx: ../camlp4/mLast.cmi parserify.cmi pa_ru.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pa_ru.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx pa_scheme.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi @@ -37,8 +39,6 @@ pa_schemer.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pa_schemer.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx pa_sml.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pa_sml.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx -parserify.cmo: ../camlp4/mLast.cmi parserify.cmi -parserify.cmx: ../camlp4/mLast.cmi parserify.cmi pr_depend.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pr_depend.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx pr_extend.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/spretty.cmi @@ -49,20 +49,20 @@ pr_null.cmo: ../camlp4/pcaml.cmi pr_null.cmx: ../camlp4/pcaml.cmx pr_o.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/spretty.cmi pr_o.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/spretty.cmx -pr_op.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/spretty.cmi -pr_op.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/spretty.cmx pr_op_main.cmo: ../camlp4/mLast.cmi parserify.cmi ../camlp4/pcaml.cmi \ ../camlp4/spretty.cmi pr_op_main.cmx: ../camlp4/mLast.cmi parserify.cmx ../camlp4/pcaml.cmx \ ../camlp4/spretty.cmx +pr_op.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/spretty.cmi +pr_op.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/spretty.cmx pr_r.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/spretty.cmi pr_r.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/spretty.cmx -pr_rp.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/spretty.cmi -pr_rp.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/spretty.cmx pr_rp_main.cmo: ../camlp4/mLast.cmi parserify.cmi ../camlp4/pcaml.cmi \ ../camlp4/spretty.cmi pr_rp_main.cmx: ../camlp4/mLast.cmi parserify.cmx ../camlp4/pcaml.cmx \ ../camlp4/spretty.cmx +pr_rp.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi ../camlp4/spretty.cmi +pr_rp.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx ../camlp4/spretty.cmx pr_scheme.cmo: ../camlp4/mLast.cmi ../camlp4/pcaml.cmi pr_scheme.cmx: ../camlp4/mLast.cmi ../camlp4/pcaml.cmx pr_schp_main.cmo: ../camlp4/mLast.cmi parserify.cmi ../camlp4/pcaml.cmi \ diff --git a/camlp4/etc/Makefile b/camlp4/etc/Makefile index fc44f7e419..070fa00b47 100644 --- a/camlp4/etc/Makefile +++ b/camlp4/etc/Makefile @@ -8,7 +8,6 @@ OBJS=q_phony.cmo pa_o.cmo pa_op.cmo pa_oop.cmo pa_ru.cmo pa_format.cmo pa_olabl. OBJSX=$(OBJS:.cmo=.cmx) INTF=pa_o.cmi CAMLP4OM=pa_o.cmo pa_op.cmo ../meta/pr_dump.cmo -#CAMLP4OMX=pa_o.cmx pa_op.cmx ../meta/pr_dump.cmx CAMLP4OMX=$(CAMLP4OM:.cmo=.cmx) CAMLP4SCHM=pa_scheme.cmo ../meta/pr_dump.cmo SHELL=/bin/sh @@ -27,6 +26,15 @@ pr_op.cmo: parserify.cmo pr_op_main.cmo pr_schemep.cmo: parserify.cmo pr_schp_main.cmo $(OCAMLC) parserify.cmo pr_schp_main.cmo -a -o $@ +pr_rp.cmx: parserify.cmx pr_rp_main.cmx + $(OCAMLOPT) parserify.cmx pr_rp_main.cmx -a -o $@ + +pr_op.cmx: parserify.cmx pr_op_main.cmx + $(OCAMLOPT) parserify.cmx pr_op_main.cmx -a -o $@ + +pr_schemep.cmx: parserify.cmx pr_schp_main.cmx + $(OCAMLOPT) parserify.cmx pr_schp_main.cmx -a -o $@ + camlp4o$(EXE): ../camlp4/camlp4$(EXE) $(CAMLP4OM) rm -f camlp4o$(EXE) cd ../camlp4; $(MAKE) CAMLP4=../etc/camlp4o$(EXE) CAMLP4M="-I ../etc $(CAMLP4OM)" diff --git a/camlp4/meta/Makefile b/camlp4/meta/Makefile index fc0ebcd670..ba1481bed7 100644 --- a/camlp4/meta/Makefile +++ b/camlp4/meta/Makefile @@ -10,7 +10,7 @@ CAMLP4RM=pa_r.cmo pa_rp.cmo pr_dump.cmo CAMLP4RMX=$(CAMLP4RM:.cmo=.cmx) SHELL=/bin/sh COUT=$(OBJS) camlp4r$(EXE) -COPT=camlp4r.opt +COPT=$(OBJSX) camlp4r.opt all: $(COUT) opt: $(COPT) diff --git a/camlp4/odyl/.depend b/camlp4/odyl/.depend index 7823dd01b0..b63c10b0b6 100644 --- a/camlp4/odyl/.depend +++ b/camlp4/odyl/.depend @@ -1,6 +1,6 @@ -odyl.cmo: odyl_config.cmo odyl_main.cmi -odyl.cmx: odyl_config.cmx odyl_main.cmx odyl_main.cmo: $(OTOP)/otherlibs/dynlink/dynlink.cmi odyl_config.cmo \ odyl_main.cmi odyl_main.cmx: odyl_config.cmx \ odyl_main.cmi +odyl.cmo: odyl_config.cmo odyl_main.cmi +odyl.cmx: odyl_config.cmx odyl_main.cmx diff --git a/camlp4/tools/apply.sh b/camlp4/tools/apply.sh index f208c1e4f7..b9b14e699f 100755 --- a/camlp4/tools/apply.sh +++ b/camlp4/tools/apply.sh @@ -11,7 +11,7 @@ while test "" != "$1"; do shift done -head -1 $FILE >/dev/null || exit 1 +head -1 $FILE >/dev/null 2>&1 || exit 1 set - `head -1 $FILE` if test "$2" = "camlp4r" -o "$2" = "camlp4"; then -- cgit v1.2.1