[Pkg-ocaml-maint-commits] [SCM] bin-prot packaging branch, master, updated. debian/1.2.23-1

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 1e920ef813b4c215d45a69d8476362bfff270df9
Merge: 22e575b83541bf9d8583ec840a88945bde6ca922 5afef006fa70015c88761da0043a5739378474ca
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Thu Apr 22 21:29:57 2010 +0200

    Merge commit 'upstream/1.2.23'
    
    Conflicts:
    	lib/Makefile

diff --combined lib/Makefile
index 598de8a,5bcb328..0cca65f
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -24,7 -24,7 +24,7 @@@ ifeq ($(shell uname -m), x86_64
  endif
  
  ifeq ($(shell uname -s), Darwin)
-   export BIN_PROT_CPP = cc -E -no-cpp-precomp -x c
+   export BIN_PROT_CPP = cc -E -no-cpp-precomp -x c -w
  else
    export BIN_PROT_CPP = cpp
  endif
@@@ -34,7 -34,7 +34,7 @@@ INCDIRS = +camlp
  CFLAGS = \
    -pipe -g -fPIC -O2 -fomit-frame-pointer \
    -Wall -pedantic -Wextra -Wunused -Werror -Wno-long-long
- PACKS = type-conv bigarray
+ PACKS = bigarray type-conv
  RESULT = bin_prot
  
  TRASH = pa_bin_prot.cmi pa_bin_prot.cmo pa_bin_prot.annot
@@@ -44,11 -44,6 +44,11 @@@ all: 
  	byte-code-library native-code-library \
  	pa_bin_prot.cmi pa_bin_prot.cmo
  
 +byte: \
 +	pack-byte-code \
 +	byte-code-library \
 +	pa_bin_prot.cmi pa_bin_prot.cmo
 +
  LIBINSTALL_FILES = \
    common.mli nat0.mli read_c.mli read_ml.mli size.mli \
    unsafe_common.mli unsafe_read_c.mli unsafe_write_c.mli \

-- 
bin-prot packaging