[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, fixes/system-ocamlsexp, updated. upstream/0.1.6.deb+a-9-g584c077

[Eugeniy Meshcheryakov]

The following commit has been merged in the fixes/system-ocamlsexp branch:
commit 584c077a4291a2bdd51c5308795cce456583cd95
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Thu Apr 16 20:47:08 2009 +0200

    Make it work with Debian's ocamlsexp

diff --git a/Makefile b/Makefile
index e1b883e..60f8f69 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ SEXPSYSCMA=bigarray.cma nums.cma
 
 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 @@ LIBS=commons/commons.cma \
      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
 
@@ -124,13 +124,11 @@ world: all opt
 
 subdirs:
 	$(MAKE) -C commons 
-	$(MAKE) -C ocamlsexp
 	$(MAKE) -C commons sexp
 	+for D in $(MAKESUBDIRS); do $(MAKE) $$D || exit 1 ; done
 
 subdirs.opt:
 	$(MAKE) all.opt -C commons 
-	$(MAKE) -C ocamlsexp all.opt
 	$(MAKE) -C commons sexp.opt
 	+for D in $(MAKESUBDIRS); do $(MAKE) $$D.opt || exit 1 ; done
 

-- 
Debian packaging for coccinelle