diff options
| -rw-r--r-- | camlp4/camlp4/Makefile | 4 | ||||
| -rw-r--r-- | camlp4/compile/Makefile | 2 | ||||
| -rwxr-xr-x | camlp4/compile/compile.sh | 3 | ||||
| -rwxr-xr-x | camlp4/config/configure_batch | 2 | ||||
| -rw-r--r-- | camlp4/etc/Makefile | 2 | ||||
| -rw-r--r-- | camlp4/lib/Makefile | 8 | ||||
| -rw-r--r-- | camlp4/meta/Makefile | 4 | ||||
| -rw-r--r-- | camlp4/odyl/Makefile | 4 |
8 files changed, 14 insertions, 15 deletions
diff --git a/camlp4/camlp4/Makefile b/camlp4/camlp4/Makefile index 182eb2605b..31ffc05057 100644 --- a/camlp4/camlp4/Makefile +++ b/camlp4/camlp4/Makefile @@ -37,7 +37,7 @@ camlp4.cmxa: $(CAMLP4_XOBJS) $(OCAMLOPT) $(LINKFLAGS) $(CAMLP4_XOBJS) -a -o camlp4.cmxa clean:: - rm -f *.cm* *.pp[io] *.o *.a *.bak .*.bak *.out *.opt + rm -f *.cm* *.pp[io] *.$(O) *.$(A) *.bak .*.bak *.out *.opt rm -f $(CAMLP4) depend: @@ -64,7 +64,7 @@ install: cp mLast.cmi quotation.cmi ast2pt.cmi pcaml.cmi spretty.cmi "$(LIBDIR)/camlp4/." cp camlp4.cma $(LIBDIR)/camlp4/. if [ -f camlp4.cmxa ]; \ - then cp camlp4.cmxa camlp4.a $(LIBDIR)/camlp4/.; \ + then cp camlp4.cmxa camlp4.$(A) $(LIBDIR)/camlp4/.; \ else : ; \ fi diff --git a/camlp4/compile/Makefile b/camlp4/compile/Makefile index 1519026963..277652b1c9 100644 --- a/camlp4/compile/Makefile +++ b/camlp4/compile/Makefile @@ -29,7 +29,7 @@ $D_fast.ml: compile.cmo $(SRC) OTOP=$(OTOP) EXE=$(EXE) ./compile.sh $(COMP_OPT) $(SRC) > $D_fast.ml install: - if test -f camlp4o.fast.opt; then cp camlp4o.fast.opt $(BINDIR)/camlp4o.opt; fi + if test -f camlp4o.fast.opt; then cp camlp4o.fast.opt $(BINDIR)/camlp4o.opt$(EXE); fi clean:: rm -f *.cm* *.pp[io] *.o *.bak .*.bak *.out *.opt diff --git a/camlp4/compile/compile.sh b/camlp4/compile/compile.sh index 780fea0c29..1e86d6f7eb 100755 --- a/camlp4/compile/compile.sh +++ b/camlp4/compile/compile.sh @@ -22,5 +22,6 @@ $OTOP/boot/ocamlrun$EXE $OTOP/boot/ocamlc -I $OTOP/boot -c tmp.mli $OTOP/boot/ocamlrun$EXE ../meta/camlp4r$EXE -I ../meta pa_extend.cmo q_MLast.cmo -meta_action tmp.ml -o tmp.ppo $OTOP/boot/ocamlrun$EXE $OTOP/boot/ocamlc -I $OTOP/boot -I ../lib -I ../camlp4 -c -impl tmp.ppo rm tmp.ppo -$OTOP/boot/ocamlrun$EXE ../camlp4/camlp4$EXE ./compile.cmo ./tmp.cmo ../etc/pr_r.cmo ../etc/pr_rp.cmo $ARGS -sep "\n\n" -impl /dev/null +> tmp.null +$OTOP/boot/ocamlrun$EXE ../camlp4/camlp4$EXE ./compile.cmo ./tmp.cmo ../etc/pr_r.cmo ../etc/pr_rp.cmo $ARGS -sep "\n\n" -impl tmp.null rm tmp.* diff --git a/camlp4/config/configure_batch b/camlp4/config/configure_batch index 29753041fd..49b3dafca5 100755 --- a/camlp4/config/configure_batch +++ b/camlp4/config/configure_batch @@ -66,6 +66,8 @@ for i in utils parsing otherlibs/dynlink; do done echo "EXE=$EXE" >> Makefile.cnf +echo "O=o" >> Makefile.cnf +echo "A=a" >> Makefile.cnf echo "OPT=" >> Makefile.cnf echo "OTOP=$ocaml_top" >> Makefile.cnf diff --git a/camlp4/etc/Makefile b/camlp4/etc/Makefile index cae5582f51..fc44f7e419 100644 --- a/camlp4/etc/Makefile +++ b/camlp4/etc/Makefile @@ -83,7 +83,7 @@ install: cp $(INTF) "$(LIBDIR)/camlp4/." cp lib.sml "$(LIBDIR)/camlp4/." cp camlp4o$(EXE) camlp4sch$(EXE) "$(BINDIR)/." - if test -f camlp4o.opt; then cp camlp4o.opt "$(BINDIR)/."; cp $(OBJSX) $(OBJSX:.cmx=.o) "$(LIBDIR)/camlp4/."; fi + if test -f camlp4o.opt; then cp camlp4o.opt "$(BINDIR)/camlp4o.opt$(EXE)"; cp $(OBJSX) $(OBJSX:.cmx=.o) "$(LIBDIR)/camlp4/."; fi cp mkcamlp4.sh "$(BINDIR)/mkcamlp4" chmod a+x "$(BINDIR)/mkcamlp4" diff --git a/camlp4/lib/Makefile b/camlp4/lib/Makefile index 1a8bc6604e..ece72d1519 100644 --- a/camlp4/lib/Makefile +++ b/camlp4/lib/Makefile @@ -18,7 +18,7 @@ $(TARGET:.cma=.cmxa): $(OBJS:.cmo=.cmx) $(OCAMLOPT) $(OBJS:.cmo=.cmx) -a -o $(TARGET:.cma=.cmxa) clean:: - rm -f *.cm[ioax] *.cmxa *.pp[io] *.o *.a *.bak .*.bak $(TARGET) + rm -f *.cm[ioax] *.cmxa *.pp[io] *.$(O) *.$(A) *.bak .*.bak $(TARGET) depend: cp .depend .depend.bak @@ -43,10 +43,6 @@ install: installopt: cp $(TARGET:.cma=.cmxa) *.cmx "$(LIBDIR)/camlp4/." - if test -f $(TARGET:.cma=.lib); then \ - cp $(TARGET:.cma=.lib) "$(LIBDIR)/camlp4/."; \ - else \ - tar cf - $(TARGET:.cma=.a) | (cd "$(LIBDIR)/camlp4/."; tar xf -); \ - fi + tar cf - $(TARGET:.cma=.$(A)) | (cd "$(LIBDIR)/camlp4/."; tar xf -) include .depend diff --git a/camlp4/meta/Makefile b/camlp4/meta/Makefile index 2b86349e46..fc0ebcd670 100644 --- a/camlp4/meta/Makefile +++ b/camlp4/meta/Makefile @@ -48,8 +48,8 @@ install: cp pa_macro.cmi pa_extend.cmi "$(LIBDIR)/camlp4/." cp camlp4r$(EXE) "$(BINDIR)/." if test -f camlp4r.opt; then \ - cp camlp4r.opt "$(BINDIR)/." ;\ - for target in $(OBJSX) $(OBJSX:.cmx=.o) ; do \ + cp camlp4r.opt "$(BINDIR)/camlp4r.opt$(EXE)" ;\ + for target in $(OBJSX) $(OBJSX:.cmx=.$(O)) ; do \ if test -f $$target; then \ cp $$target "$(LIBDIR)/camlp4/."; \ fi; \ diff --git a/camlp4/odyl/Makefile b/camlp4/odyl/Makefile index d2563a3298..73dc854e6f 100644 --- a/camlp4/odyl/Makefile +++ b/camlp4/odyl/Makefile @@ -37,7 +37,7 @@ odyl_config.ml: | sed -e 's|\\|/|g' > odyl_config.ml clean:: - rm -f *.cm* *.pp[io] *.o *.bak .*.bak *.out *.opt *.a + rm -f *.cm* *.pp[io] *.$(O) *.bak .*.bak *.out *.opt *.$(A) rm -f odyl_config.ml odyl$(EXE) depend: @@ -56,6 +56,6 @@ compare: install: -$(MKDIR) "$(LIBDIR)/camlp4" "$(BINDIR)" cp odyl.cmo odyl.cma odyl_main.cmi $(LIBDIR)/camlp4/. - if test -f odyl.cmxa; then cp odyl.cmxa odyl.a $(LIBDIR)/camlp4/.; fi + if test -f odyl.cmxa; then cp odyl.cmxa odyl.$(A) $(LIBDIR)/camlp4/.; fi include .depend |