[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. debian/1.3.2-1-11-g4f0dc9b

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 74b7aac9d2ad96e961ee861f6e45423f22768709
Merge: 54647b31189f51f51e7cd6a4f71ac5598c517c27 51b6e838eedbf16d442e21fa3d66f1841fd1e7fb
Author: Ralf Treinen <rt at free.fr>
Date:   Tue Mar 17 22:21:28 2009 +0100

    Merge commit 'upstream/1.4pre1'

diff --combined Makefile.config.in
index ef52c31,eb50bf0..607898c
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@@ -4,10 -4,11 +4,11 @@@ CMXS=	$(SOURCES:%.ml=%.cmx
  OBJS=	$(C_SOURCES:%.c=%.o)
  
  OCAMLC=		@OCAMLFIND@ ocamlc
+ OCAMLCP=	@OCAMLFIND@ ocamlcp
  OCAMLOPT=	@OCAMLFIND@ ocamlopt
  OCAMLMKLIB=	@OCAMLMKLIB@
 -CFLAGS=	@DEFS@ @CFLAGS@
 -CPPFLAGS=	@CPPFLAGS@
 +override CFLAGS=	@DEFS@ @CFLAGS@
 +override CPPFLAGS=	@CPPFLAGS@
  LDFLAGS=	@LDFLAGS@
  LIBS=	@LIBS@
  
@@@ -23,10 -24,18 +24,18 @@@ OCAML_LFLAGS+=	-linkpk
  endif
  
  %.cmo: %.ml
+ ifdef PROFILE
+ 	$(OCAMLCP) $(OCAML_CFLAGS) -o $@ -c $<
+ else
  	$(OCAMLC) $(OCAML_CFLAGS) -o $@ -c $<
+ endif
  
  %.cmi: %.mli
+ ifdef PROFILE
+ 	$(OCAMLCP) $(OCAML_CFLAGS) -o $@ -c $<
+ else
  	$(OCAMLC) $(OCAML_CFLAGS) -o $@ -c $<
+ endif
  
  %.cmx: %.ml
  	$(OCAMLOPT) $(OCAML_CFLAGS) -o $@ -c $<
@@@ -50,7 -59,6 +59,7 @@@ endi
  .PHONY: clean depend cmi-install
  clean:
  	@rm -f $(CMOS) $(CMIS) $(CMXS:.cmx=.o) $(CMXS) $(OBJS) $(NAME).a $(NAME).cma $(NAME).cmxa $(EXTRA_INSTALL) $(EXTRA_CLEAN) .depend
 +	@rm -f *.o *.a *.so *.mlid *.cmi
  	@touch .depend
  
  depend:
diff --combined Makefile.in
index 8bc4d7b,6b57645..79ac337
--- a/Makefile.in
+++ b/Makefile.in
@@@ -1,24 -1,14 +1,25 @@@
- DIRS=  util io napkin ocamlrpm ocamldeb conduit lifetime dosebase progress \
-        rapids satsolver packetology 
+ DIRS=  util io napkin progress ocamlrpm ocamldeb ocamlpkgsrc conduit lifetime \
+        dosebase rapids satsolver packetology
  CMAS=  util/util.cma ocamlrpm/ocamlrpm.cma ocamldeb/ocamldeb.cma \
-        conduit/conduit.cma io/io.cma lifetime/lifetime.cma napkin/napkin.cma \
-        dosebase/dosebase.cma progress/progress.cma rapids/rapids.cma \
- 			 satsolver/satsolver.cma packetology/packetology.cma 
+        ocamlpkgsrc/ocamlpkgsrc.cma conduit/conduit.cma io/io.cma \
+        lifetime/lifetime.cma napkin/napkin.cma dosebase/dosebase.cma \
+        progress/progress.cma rapids/rapids.cma satsolver/satsolver.cma \
+        packetology/packetology.cma
  CMXAS=	$(CMAS:%.cma=%.cmxa)
  ARCHIVES=	$(CMAS:%.cma=%.a)
 +DIRTS = \
 +	Makefile \
 +	Makefile.config \
 +	config.h \
 +	config.log \
 +	config.status \
 +	dql/Makefile \
 +	io/Makefile \
 +	ocamldeb/Makefile \
 +	META \
 +	$(NULL)
  
 -all: @BEST@
 +all: depend @BEST@
  
  bcl:
  	@for i in $(DIRS); do \
@@@ -30,13 -20,17 +31,18 @@@ ncl
  		$(MAKE) -C $$i ncl || exit; \
  	done
  
+ profile:
+ 	@for i in $(DIRS); do \
+ 		$(MAKE) PROFILE=yes -C $$i bcl || exit; \
+ 	done
+ 
  .PHONY: clean depend install
  
  clean:
  	@for i in $(DIRS); do \
  		$(MAKE) -C $$i clean; \
  	done
 +	rm -f $(DIRTS)
  
  depend:
  	@for i in $(DIRS); do \
@@@ -44,19 -38,13 +50,19 @@@
  		$(MAKE) -C $$i depend; \
  	done
  
 -install: @BEST@
 -	- at OCAMLFIND@ remove dose2
 +ifneq ($(DESTDIR),)
 +DESTDIR_FLAGS = -destdir $(DESTDIR)
 +$(DESTDIR):
 +	mkdir -p $(DESTDIR)
 +endif
 +
 +install: @BEST@ $(DESTDIR)
 +	- at OCAMLFIND@ remove $(DESTDIR_FLAGS) dose2
  ifeq (@OCAMLBEST@, byte)
 -	@OCAMLFIND@ install -patch-version -patch-archives @VERSION@ dose2 META $(CMAS)
 +	@OCAMLFIND@ install $(DESTDIR_FLAGS) -patch-version -patch-archives @VERSION@ dose2 META $(CMAS)
  else
 -	@OCAMLFIND@ install -patch-version @VERSION@ dose2 META $(CMAS) $(CMXAS) $(ARCHIVES)
 +	@OCAMLFIND@ install $(DESTDIR_FLAGS) -patch-version @VERSION@ dose2 META $(CMAS) $(CMXAS) $(ARCHIVES)
  endif	
  	@for i in $(DIRS); do \
 -		$(MAKE) -C $$i cmi-install extra-install; \
 +		$(MAKE) -C $$i cmi-install extra-install INSTALLDIR=$(DESTDIR)/dose2; \
  	done

-- 
dose2 packaging