diff -Nru ocamlmakefile-6.30.0/Changelog ocamlmakefile-6.33.0/Changelog --- ocamlmakefile-6.30.0/Changelog 2011-03-23 16:31:37.000000000 +0000 +++ ocamlmakefile-6.33.0/Changelog 2011-11-13 14:53:56.000000000 +0000 @@ -1,3 +1,11 @@ +2011-11-13: Added extra dependency to improve parallel builds. + + Thanks to Edward Schwartz for the patch! + +2011-11-12: Replaced obsolete suffix rules and improved link flags in gtk. + +2011-11-09: Fixed linking order to conform to stricter Linux linker rules. + 2011-03-23: Improved handling of packed byte-code libraries. Thanks to Christophe Troestler diff -Nru ocamlmakefile-6.30.0/debian/changelog ocamlmakefile-6.33.0/debian/changelog --- ocamlmakefile-6.30.0/debian/changelog 2011-03-28 19:08:14.000000000 +0000 +++ ocamlmakefile-6.33.0/debian/changelog 2011-12-27 08:56:12.000000000 +0000 @@ -1,3 +1,18 @@ +ocamlmakefile (6.33.0-1) unstable; urgency=low + + [ Ralf Treinen ] + * New upstream version. + * debian/rules: renamed target "buildstamp" to "build-stamp", added + targets build-{arch,indep}. + * debian/control: + - do not start short description on an article + - standards version 3.9.2 (no change) + + [ Stefano Zacchiroli ] + * remove myself from Uploaders + + -- Ralf Treinen Tue, 27 Dec 2011 09:45:53 +0100 + ocamlmakefile (6.30.0-1) unstable; urgency=low * New upstream release diff -Nru ocamlmakefile-6.30.0/debian/control ocamlmakefile-6.33.0/debian/control --- ocamlmakefile-6.30.0/debian/control 2011-03-28 19:08:14.000000000 +0000 +++ ocamlmakefile-6.33.0/debian/control 2011-12-27 08:56:12.000000000 +0000 @@ -4,10 +4,9 @@ Maintainer: Debian OCaml Maintainers Uploaders: Ralf Treinen , Remi Vanicat , - Samuel Mimram , - Stefano Zacchiroli + Samuel Mimram Build-Depends: debhelper (>= 7.0) -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlmakefile.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlmakefile.git Homepage: http://www.ocaml.info/home/ocaml_sources.html#ocaml-make @@ -18,7 +17,7 @@ Conflicts: ocaml-tools (<= 2007.02.04-2) Replaces: ocaml-tools Recommends: ocaml-nox -Description: a general makefile for the Objective Caml programming language +Description: general makefile for the Objective Caml programming language OCamlMakefile is a general makefile which allows a programmer to create quickly customized makefiles for a project written in the Objective Caml programming language. Typically, a customized makefile diff -Nru ocamlmakefile-6.30.0/debian/rules ocamlmakefile-6.33.0/debian/rules --- ocamlmakefile-6.30.0/debian/rules 2011-03-28 19:08:14.000000000 +0000 +++ ocamlmakefile-6.33.0/debian/rules 2011-12-27 08:56:12.000000000 +0000 @@ -9,15 +9,18 @@ # shared dir where files are to be installed export SHDIR=debian/ocamlmakefile/usr/share/ocamlmakefile -build: buildstamp -buildstamp: +build: build-arch build-indep +build-arch: build-stamp +build-indep: build-stamp + +build-stamp: dh_testdir clean: dh_testdir dh_testroot dh_clean - -rm buildstamp + -rm build-stamp install: dh_testdir diff -Nru ocamlmakefile-6.30.0/gtk/Makefile ocamlmakefile-6.33.0/gtk/Makefile --- ocamlmakefile-6.30.0/gtk/Makefile 2011-03-23 16:31:37.000000000 +0000 +++ ocamlmakefile-6.33.0/gtk/Makefile 2011-11-13 14:53:56.000000000 +0000 @@ -5,7 +5,4 @@ PACKS = lablgtk2 THREADS = yes -OCAMLBLDFLAGS = lablgtk.cma gtkInit.cmo gtkThread.cmo -OCAMLNLDFLAGS = lablgtk.cmxa gtkInit.cmx gtkThread.cmx - include $(OCAMLMAKEFILE) diff -Nru ocamlmakefile-6.30.0/.hg_archival.txt ocamlmakefile-6.33.0/.hg_archival.txt --- ocamlmakefile-6.30.0/.hg_archival.txt 2011-03-23 16:31:37.000000000 +0000 +++ ocamlmakefile-6.33.0/.hg_archival.txt 2011-11-13 14:53:56.000000000 +0000 @@ -1,2 +1,4 @@ repo: f87ac121bbde1d9223794b7761108c981438916b -node: c6b1a16a3b756a5f1418ea4b0e5d54f60fe5507f +node: 2796b0cde4746d203a2371f4477e95992d8f73d4 +branch: default +tag: release-6.33.0 diff -Nru ocamlmakefile-6.30.0/.hgtags ocamlmakefile-6.33.0/.hgtags --- ocamlmakefile-6.30.0/.hgtags 2011-03-23 16:31:37.000000000 +0000 +++ ocamlmakefile-6.33.0/.hgtags 2011-11-13 14:53:56.000000000 +0000 @@ -6,3 +6,6 @@ 1ddf64905091f5785fdc6d1f87af4334e3478035 release-6.29.1 c9ea7e7369d72a54a4131e0d6195d88ff6de8b8d release-6.29.2 c3363e1d73f569ec9d0a1452265830d461b5261c release-6.29.3 +c6b1a16a3b756a5f1418ea4b0e5d54f60fe5507f release-6.30.0 +d51a3b9d06f2abfff2cfe3a3f36da7883ebaae1f release-6.31.0 +3bd3299c4ed13c20daed7420c8c3d821c48150a4 release-6.32.0 diff -Nru ocamlmakefile-6.30.0/OCamlMakefile ocamlmakefile-6.33.0/OCamlMakefile --- ocamlmakefile-6.30.0/OCamlMakefile 2011-03-23 16:31:37.000000000 +0000 +++ ocamlmakefile-6.33.0/OCamlMakefile 2011-11-13 14:53:56.000000000 +0000 @@ -944,7 +944,7 @@ $(REAL_RESULT): $(REAL_IMPL_INTF) $(OBJ_LINK) $(EXTRADEPS) $(RESULTDEPS) $(REAL_OCAMLFIND) $(REAL_OCAMLC) \ $(OCAML_FIND_PACKAGES) $(OCAML_FIND_LINKPKG) \ - $(ALL_LDFLAGS) $(OBJS_LIBS) -o $@$(EXE) \ + $(OBJS_LIBS) $(ALL_LDFLAGS) -o $@$(EXE) \ $(REAL_IMPL) nolink: $(REAL_IMPL_INTF) $(OBJ_LINK) @@ -958,7 +958,7 @@ %$(TOPSUFFIX): $(REAL_IMPL_INTF) $(OBJ_LINK) $(EXTRADEPS) $(REAL_OCAMLFIND) $(OCAMLMKTOP) \ $(OCAML_FIND_PACKAGES) $(OCAML_FIND_LINKPKG) \ - $(ALL_LDFLAGS) $(OBJS_LIBS) -o $@$(EXE) \ + $(OBJS_LIBS) $(ALL_LDFLAGS) -o $@$(EXE) \ $(REAL_IMPL) .SUFFIXES: .mli .ml .cmi .cmo .cmx .cma .cmxa .$(EXT_OBJ) \ @@ -1003,10 +1003,10 @@ ifndef LIB_PACK_NAME $(RESULT).cma: $(REAL_IMPL_INTF) $(MAKEDLL) $(EXTRADEPS) $(RESULTDEPS) - $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(ALL_LDFLAGS) $(OBJS_LIBS) -o $@ $(REAL_IMPL) + $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(OBJS_LIBS) $(ALL_LDFLAGS) -o $@ $(REAL_IMPL) $(RESULT).cmxa $(RESULT).$(EXT_LIB): $(REAL_IMPL_INTF) $(EXTRADEPS) $(RESULTDEPS) - $(REAL_OCAMLFIND) $(OCAMLOPT) -a $(ALL_LDFLAGS) $(OBJS_LIBS) -o $@ $(REAL_IMPL) + $(REAL_OCAMLFIND) $(OCAMLOPT) -a $(OBJS_LIBS) $(ALL_LDFLAGS) -o $@ $(REAL_IMPL) else # Packing a bytecode library LIB_PACK_NAME_MLI = $(wildcard $(LIB_PACK_NAME).mli) @@ -1028,10 +1028,10 @@ endif $(RESULT).cma: $(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmo $(MAKEDLL) $(EXTRADEPS) $(RESULTDEPS) - $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(ALL_LDFLAGS) $(OBJS_LIBS) -o $@ $(LIB_PACK_NAME).cmo + $(REAL_OCAMLFIND) $(REAL_OCAMLC) -a $(OBJS_LIBS) $(ALL_LDFLAGS) -o $@ $(LIB_PACK_NAME).cmo $(RESULT).cmxa $(RESULT).$(EXT_LIB): $(LIB_PACK_NAME).cmi $(LIB_PACK_NAME).cmx $(EXTRADEPS) $(RESULTDEPS) - $(REAL_OCAMLFIND) $(OCAMLOPT) -a $(filter-out -custom, $(ALL_LDFLAGS)) $(OBJS_LIBS) -o $@ $(LIB_PACK_NAME).cmx + $(REAL_OCAMLFIND) $(OCAMLOPT) -a $(OBJS_LIBS) $(filter-out -custom, $(ALL_LDFLAGS)) -o $@ $(LIB_PACK_NAME).cmx endif $(RES_CLIB): $(OBJ_LINK) @@ -1045,7 +1045,7 @@ endif endif -.mli.cmi: $(EXTRADEPS) +%.cmi: %.mli $(EXTRADEPS) $(QUIET)pp=`sed -n -e '/^#/d' -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $<`; \ if [ -z "$$pp" ]; then \ $(ECHO) $(REAL_OCAMLFIND) $(INTF_OCAMLC) $(OCAML_FIND_PACKAGES) \ @@ -1063,7 +1063,9 @@ $(OCAMLFLAGS) $(INCFLAGS) $<; \ fi -.ml.cmi .ml.$(EXT_OBJ) .ml.cmx .ml.cmo: $(EXTRADEPS) +%.cmi: %$(IMPL_SUF); + +%.cmi %.cmo %.cmx %.$(EXT_OBJ): %.ml $(EXTRADEPS) $(QUIET)pp=`sed -n -e '/^#/d' -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $<`; \ if [ -z "$$pp" ]; then \ $(ECHO) $(REAL_OCAMLFIND) $(REAL_OCAMLC) $(OCAML_FIND_PACKAGES) \ @@ -1119,17 +1121,17 @@ $(CAMLIDLFLAGS) $< $(QUIET)if [ $(NOIDLHEADER) ]; then touch $*.h; fi -.c.$(EXT_OBJ): +%.$(EXT_OBJ): %.c $(OCAMLC) -c -cc "$(CC)" -ccopt "$(CFLAGS) \ $(CPPFLAGS) $(CPPFLAGS_WIN32) \ $(CFLAGS_WIN32) $(CINCFLAGS) $(CFLAG_O)$@ " $< -.m.$(EXT_OBJ): +%.$(EXT_OBJ): %.m $(CC) -c $(CFLAGS) $(CINCFLAGS) $(CPPFLAGS) \ -I'$(OCAMLLIBPATH)' \ $< $(CFLAG_O)$@ -.$(EXT_CXX).$(EXT_OBJ): +%.$(EXT_OBJ): %.$(EXT_CXX) $(CXX) -c $(CXXFLAGS) $(CINCFLAGS) $(CPPFLAGS) \ -I'$(OCAMLLIBPATH)' \ $< $(CFLAG_O)$@