[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, fixes/system-ocamlsexp, updated. upstream/0.1.8.deb-21-g4d33edf

[Eugeniy Meshcheryakov]

The following commit has been merged in the fixes/system-ocamlsexp branch:
commit 4d33edf6fe48e9823b8041dada867a677412a639
Merge: ffd41f04a989cb566e3b46557d06bd58a3b01a02 70da999c4457d41a507527a46f70d0bcd25713f2
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Fri Jun 12 04:16:13 2009 +0200

    Merge commit 'refs/top-bases/fixes/system-ocamlsexp' into fixes/system-ocamlsexp
    
    Conflicts:
    	Makefile

diff --combined Makefile
index d0f28a1,ac2f8cb..e1e59cc
--- a/Makefile
+++ b/Makefile
@@@ -34,8 -34,8 +34,8 @@@ TARGET=spatc
  SRC=flag_cocci.ml cocci.ml testing.ml test.ml main.ml
  
  ifeq ($(FEATURE_PYTHON),1)
- PYCMA=-I $(shell ocamlfind query pycaml) pycaml.cma
- PYDIR=
+ PYCMA=pycaml.cma
+ PYDIR=$(shell ocamlfind query pycaml)
  PYLIB=
  # the following is essential for Coccinelle to compile under gentoo (wierd)
  OPTLIBFLAGS=
@@@ -48,20 -48,20 +48,20 @@@ endi
  
  SEXPSYSCMA=bigarray.cma nums.cma
  
- SYSLIBS=str.cma unix.cma $(SEXPSYSCMA)
+ SYSLIBS=str.cma unix.cma $(PYCMA) $(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 \
       engine/cocciengine.cma \
-      extra/extra.cma $(PYCMA) python/coccipython.cma
+      extra/extra.cma 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 \
+  globals 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