[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, fixes/system-ocamlsexp, updated. upstream/0.1.8.deb-17-gffd41f0
Eugeniy Meshcheryakov
eugen at debian.org
Thu Jun 11 23:16:10 UTC 2009
The following commit has been merged in the fixes/system-ocamlsexp branch:
commit ffd41f04a989cb566e3b46557d06bd58a3b01a02
Merge: a0bedcf512be138630a9bfe9f28ddd7d39bd2437 923c5eb221f158678d33ed28d48a775a76f758bd
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Fri Jun 12 01:04:45 2009 +0200
Merge commit 'refs/top-bases/fixes/system-ocamlsexp' into fixes/system-ocamlsexp
diff --combined Makefile
index cd974ce,49a2a35..d0f28a1
--- a/Makefile
+++ b/Makefile
@@@ -34,7 -34,7 +34,7 @@@ TARGET=spatc
SRC=flag_cocci.ml cocci.ml testing.ml test.ml main.ml
ifeq ($(FEATURE_PYTHON),1)
- PYCMA=pycaml.cma
+ PYCMA=-I $(shell ocamlfind query pycaml) pycaml.cma
PYDIR=
PYLIB=
# the following is essential for Coccinelle to compile under gentoo (wierd)
@@@ -50,7 -50,7 +50,7 @@@ SEXPSYSCMA=bigarray.cma nums.cm
SYSLIBS=str.cma unix.cma $(SEXPSYSCMA)
LIBS=commons/commons.cma \
- ocamlsexp/sexplib1.cma commons/commons_sexp.cma \
+ sexplib.cma commons/commons_sexp.cma \
globals/globals.cma \
ctl/ctl.cma \
parsing_cocci/cocci_parser.cma parsing_c/parsing_c.cma \
@@@ -58,10 -58,10 +58,10 @@@
extra/extra.cma $(PYCMA) python/coccipython.cma
#used for clean: and depend: and a little for rec & rec.opt
-MAKESUBDIRS=commons ocamlsexp \
+MAKESUBDIRS=commons \
globals $(PYDIR) ctl parsing_cocci parsing_c \
engine extra python
-INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
+INCLUDEDIRS=commons commons/ocamlextra \
globals $(PYDIR) ctl \
parsing_cocci parsing_c engine extra python
@@@ -93,8 -93,8 +93,8 @@@ OPTFLAGS
# but is now defined above in this file
#OPTLIBFLAGS=-cclib dllpycaml_stubs.so
-OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS) $(INCLUDES)
-OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES)
+OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS) $(INCLUDES) -I $(shell ocamlfind query sexplib)
+OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES) -I $(shell ocamlfind query sexplib)
OCAMLLEX=ocamllex #-ml # -ml for debugging lexer, but slightly slower
OCAMLYACC=ocamlyacc -v
OCAMLDEP=ocamldep $(INCLUDES)
@@@ -133,11 -133,13 +133,11 @@@ top: $(EXEC).to
subdirs:
$(MAKE) -C commons OCAMLCFLAGS="$(OCAMLCFLAGS)"
- $(MAKE) -C ocamlsexp OCAMLCFLAGS="$(OCAMLCFLAGS)"
$(MAKE) -C commons sexp OCAMLCFLAGS="$(OCAMLCFLAGS)"
+for D in $(MAKESUBDIRS); do $(MAKE) $$D || exit 1 ; done
subdirs.opt:
$(MAKE) -C commons all.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
- $(MAKE) -C ocamlsexp all.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
$(MAKE) -C commons sexp.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
+for D in $(MAKESUBDIRS); do $(MAKE) $$D.opt || exit 1 ; done
--
Debian packaging for coccinelle
More information about the Pkg-ocaml-maint-commits
mailing list