git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3748 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Daniel de Rauglaudre 2001-09-10 09:56:14 +00:00
parent 77bd56b44e
commit 275e5d1dca
7 changed files with 14 additions and 17 deletions

View File

@ -13,7 +13,7 @@ all: boot/camlp4$(EXE)
opt:
cd lib; $(MAKE) opt
bullshit:
optp4:
set -e; for i in $(OPTDIRS); do cd $$i; $(MAKE) opt; cd ..; done
boot/camlp4$(EXE):

View File

@ -10,7 +10,7 @@ LINKFLAGS=$(INCLUDES)
INTERFACES=-I $(OLIBDIR) Arg Array Buffer Callback Char Digest Filename Format Gc Genlex Hashtbl Lazy Lexing List Map Marshal Obj Oo Parsing Pervasives Printexc Printf Queue Random Set Sort Stack Stream String Sys Weak -I ../boot Extfun Fstream Gramext Grammar Plexer Stdpp Token -I $(OTOP)/utils Config Warnings -I $(OTOP)/parsing Asttypes Location Longident Parsetree -I . Ast2pt MLast Pcaml Quotation Spretty
CAMLP4_INTF=$(OTOP)/utils/config.cmi $(OTOP)/utils/warnings.cmi $(OTOP)/parsing/asttypes.cmi $(OTOP)/parsing/location.cmi $(OTOP)/parsing/longident.cmi $(OTOP)/parsing/parsetree.cmi ast2pt.cmi mLast.cmi pcaml.cmi spretty.cmi quotation.cmi
CAMLP4_OBJS=../boot/stdpp.cmo ../boot/token.cmo ../boot/plexer.cmo ../boot/gramext.cmo ../boot/grammar.cmo ../boot/extfun.cmo ../boot/fstream.cmo $(OTOP)/utils/config.cmo quotation.cmo ast2pt.cmo spretty.cmo reloc.cmo pcaml.cmo argl.cmo crc.cmo
CAMLP4_XOBJS=../lib/stdpp.cmx ../lib/token.cmx ../lib/plexer.cmx ../lib/gramext.cmx ../lib/grammar.cmx config.cmx quotation.cmx ast2pt.cmx spretty.cmx reloc.cmx pcaml.cmx argl.cmx
CAMLP4_XOBJS=../lib/stdpp.cmx ../lib/token.cmx ../lib/plexer.cmx ../lib/gramext.cmx ../lib/grammar.cmx ../lib/extfun.cmx ../lib/fstream.cmx $(OTOP)/utils/config.cmx quotation.cmx ast2pt.cmx spretty.cmx reloc.cmx pcaml.cmx argl.cmx
OBJS=../odyl/odyl.cma camlp4.cma
CAMLP4M=
@ -18,9 +18,8 @@ CAMLP4=camlp4$(EXE)
CAMLP4OPT=phony
all: $(CAMLP4)
opt: $(CAMLP4OPT)
$(CAMLP4OPT): $(OBJS:.cma=.cmxa) ../odyl/odyl.cmx
opt: $(OBJS:.cma=.cmxa)
optp4: $(CAMLP4OPT)
$(CAMLP4): $(OBJS) ../odyl/odyl.cmo
$(OCAMLC) $(OBJS) $(CAMLP4M) ../odyl/odyl.cmo -linkall -o $(CAMLP4)
@ -40,7 +39,7 @@ crc.cmo: $(CAMLP4_INTF)
$(OCAMLC) $(OCAMLCFLAGS) -c crc.ml
clean::
rm -f *.cm* *.pp[io] *.o *.bak .*.bak *.out *.opt phony
rm -f *.cm* *.pp[io] *.o *.bak .*.bak *.out *.opt
rm -f $(CAMLP4) crc.ml
depend:

View File

@ -21,7 +21,7 @@ camlp4o$(EXE): ../camlp4/camlp4$(EXE) $(CAMLP4OM)
camlp4o.opt: $(CAMLP4OMX)
rm -f camlp4o.opt
cd ../camlp4; $(MAKE) opt CAMLP4OPT=../etc/camlp4o.opt CAMLP4M="-I ../etc $(CAMLP4OMX)"
cd ../camlp4; $(MAKE) optp4 CAMLP4OPT=../etc/camlp4o.opt CAMLP4M="-I ../etc $(CAMLP4OMX)"
mkcamlp4.sh: mkcamlp4.sh.tpl
sed -e "s'OLIBDIR'$(OLIBDIR)'g" -e "s'LIBDIR'$(LIBDIR)'g" mkcamlp4.sh.tpl > mkcamlp4.sh

View File

@ -20,7 +20,7 @@ camlp4r$(EXE): ../camlp4/camlp4$(EXE) $(CAMLP4RM)
camlp4r.opt: $(CAMLP4RMX)
rm -f camlp4r.opt
cd ../camlp4; $(MAKE) opt OTOP=$(OTOP) CAMLP4OPT=../meta/camlp4r.opt CAMLP4M="-I ../meta $(CAMLP4RMX)"
cd ../camlp4; $(MAKE) optp4 OTOP=$(OTOP) CAMLP4OPT=../meta/camlp4r.opt CAMLP4M="-I ../meta $(CAMLP4RMX)"
clean::
rm -f *.cm* *.pp[io] *.o *.bak .*.bak $(COUT) $(COPT)

View File

@ -23,10 +23,10 @@ odyl.cma: $(OBJS)
odyl.cmxa: $(OBJS:.cmo=.cmx)
$(OCAMLOPT) $(LINKFLAGS) $(OBJS:.cmo=.cmx) -a -o odyl.cmxa
odyl.cmx: odyl.ml
../boot/camlp4r -nolib -I ../boot pa_ifdef.cmo -DOPT -o odyl.ppo odyl.ml
$(OCAMLOPT) -c -impl odyl.ppo
rm -f odyl.ppo
odyl_main.cmx: odyl_main.ml
$(CAMLP4_COMM) -nolib -DOPT -o odyl_main.ppo odyl_main.ml
$(OCAMLOPT) -c -impl odyl_main.ppo
rm -f odyl_main.ppo
odyl_config.cmo:
echo "let standard_library =" > odyl_config.ml

View File

@ -52,7 +52,7 @@ exception Error of string and string;
value nolib = ref False;
value initialized = ref False;
value path = ref [];
value path = ref ([] : list string);
value loadfile file =
ifdef OPT then

View File

@ -1,4 +1,2 @@
camlp4_top.cmo: ../camlp4/ast2pt.cmo ../camlp4/mLast.cmi \
../camlp4/pcaml.cmi
camlp4_top.cmx: ../camlp4/ast2pt.cmx ../camlp4/mLast.cmi \
../camlp4/pcaml.cmx
camlp4_top.cmo: ../camlp4/ast2pt.cmo ../camlp4/mLast.cmi ../camlp4/pcaml.cmi
camlp4_top.cmx: ../camlp4/ast2pt.cmx ../camlp4/mLast.cmi ../camlp4/pcaml.cmx