[Pkg-ocaml-maint-commits] [SCM] ocaml-sha packaging branch, master, updated. debian/1.6-1-13-g1c5ab0c

Fri Feb 25 20:29:13 UTC 2011

The following commit has been merged in the master branch:
commit 24f13ccce8e2e9b926e59c4847fb9aeaf2ee5ad3
Author: Eric Cooper <ecc at cmu.edu>
Date:   Fri Feb 25 08:52:35 2011 -0500

    undo all changes to upstream source

diff --git a/Makefile b/Makefile
index 3b0afb5..3224c59 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-ccopts = $(CFLAGS) -Wall -O3 -funroll-loops -fPIC -DPIC
+CFLAGS = -Wall -O3 -funroll-loops -I/usr/include
 OCAMLC = ocamlc
 OCAMLOPT = ocamlopt
 OCAMLMKLIB = ocamlmklib
@@ -6,20 +6,18 @@ OCAMLMKLIB = ocamlmklib
 OCAMLOPTFLAGS =
 
 OCAML_TEST_INC = -I `ocamlfind query oUnit`
-OCAML_TEST_LIB = `ocamlfind query oUnit`/oUnit
+OCAML_TEST_LIB = `ocamlfind query oUnit`/oUnit.cmxa
 
 PROGRAMS = sha1sum sha256sum sha512sum
 
-allshabytes = shacommon.cmo $(foreach n, 1 256 512, sha$(n).lib.o sha$(n)_stubs.o sha$(n).cmo)
-allshaopts  = shacommon.cmx $(foreach n, 1 256 512, sha$(n).lib.o sha$(n)_stubs.o sha$(n).cmx)
+allshabytes = $(foreach n, 1 256 512, sha$(n).lib.o sha$(n)_stubs.o sha$(n).cmo)
+allshaopts  = $(foreach n, 1 256 512, sha$(n).lib.o sha$(n)_stubs.o sha$(n).cmx)
 
-all: all-byte all-opt
-all-byte: $(foreach n, 1 256 512, sha$(n).cma) sha.cma
-all-opt:  $(foreach n, 1 256 512, sha$(n).cmxa) sha.cmxa
+all: sha1.cmi sha1.cma sha1.cmxa sha256.cma sha256.cmxa sha512.cma sha512.cmxa sha.cma sha.cmxa
 
 bins: $(PROGRAMS)
 
-sha1sum: sha.cmxa shasum.cmx
+sha1sum: shacommon.cmx sha1.cmxa sha256.cmxa sha512.cmxa shasum.cmx
 	$(OCAMLOPT) $(OCAMLOPTFLAGS) -o $@ -cclib -L. $+
 
 sha256sum: sha1sum
@@ -28,53 +26,43 @@ sha256sum: sha1sum
 sha512sum: sha1sum
 	cp $< $@
 
-cmi_files = $(foreach n, 1 256 512, sha$(n).cmi)
-
-sha.cma: $(cmi_files) $(allshabytes)
+sha.cma: shacommon.cmo $(allshabytes)
 	$(OCAMLMKLIB) -o sha $(allshabytes)
 
-sha.cmxa: $(cmi_files) $(allshaopts)
+sha.cmxa: shacommon.cmo $(allshaopts)
 	$(OCAMLMKLIB) -o sha $(allshaopts)
 
 sha1.cma: shacommon.cmo sha1.cmi sha1.lib.o sha1_stubs.o sha1.cmo
-	$(OCAMLMKLIB) -o sha1 shacommon.cmo sha1.lib.o sha1_stubs.o sha1.cmo
+	$(OCAMLMKLIB) -o sha1 sha1.lib.o sha1_stubs.o sha1.cmo
 
 sha1.cmxa: shacommon.cmx sha1.cmi sha1.lib.o sha1_stubs.o sha1.cmx
-	$(OCAMLMKLIB) -o sha1 shacommon.cmx sha1.lib.o sha1_stubs.o sha1.cmx
+	$(OCAMLMKLIB) -o sha1 sha1.lib.o sha1_stubs.o sha1.cmx
 
 sha256.cma: shacommon.cmo sha256.cmi sha256.lib.o sha256_stubs.o sha256.cmo
-	$(OCAMLMKLIB) -o sha256 shacommon.cmo sha256.lib.o sha256_stubs.o sha256.cmo
+	$(OCAMLMKLIB) -o sha256 sha256.lib.o sha256_stubs.o sha256.cmo
 
 sha256.cmxa: shacommon.cmx sha256.cmi sha256.lib.o sha256_stubs.o sha256.cmx
-	$(OCAMLMKLIB) -o sha256 shacommon.cmx sha256.lib.o sha256_stubs.o sha256.cmx
+	$(OCAMLMKLIB) -o sha256 sha256.lib.o sha256_stubs.o sha256.cmx
 
 sha512.cma: shacommon.cmo sha512.cmi sha512.lib.o sha512_stubs.o sha512.cmo
-	$(OCAMLMKLIB) -o sha512 shacommon.cmo sha512.lib.o sha512_stubs.o sha512.cmo
+	$(OCAMLMKLIB) -o sha512 sha512.lib.o sha512_stubs.o sha512.cmo
 
 sha512.cmxa: shacommon.cmx sha512.cmi sha512.lib.o sha512_stubs.o sha512.cmx
-	$(OCAMLMKLIB) -o sha512 shacommon.cmx sha512.lib.o sha512_stubs.o sha512.cmx
+	$(OCAMLMKLIB) -o sha512 sha512.lib.o sha512_stubs.o sha512.cmx
 
 tests: sha.test
 	./sha.test
 
-sha.test: sha.cmxa sha.test.cmx
+sha.test: sha1.cmxa sha256.cmxa sha512.cmxa sha.test.cmx
 
 %.test:
-	$(OCAMLOPT) -o $@ -cclib -L. $(OCAML_BFLAGS) unix.cmxa $(OCAML_TEST_INC) $(OCAML_TEST_LIB).cmxa $+
-
-bytetests: sha.bytetest
-	./sha.bytetest
-
-sha.bytetest: sha.cma sha.test.cmo
-
-%.bytetest:
-	$(OCAMLC) -o $@ -cclib -L. $(OCAML_BFLAGS) unix.cma $(OCAML_TEST_INC) $(OCAML_TEST_LIB).cma $+
+	$(OCAMLOPT) -o $@ $(OCAML_BFLAGS) unix.cmxa $(OCAML_TEST_INC) $(OCAML_TEST_LIB) $+
 
 %.test.cmo: %.test.ml
-	$(OCAMLC) -c -o $@ -w x $(OCAML_BFLAGS) $(OCAML_TEST_INC) $<
+	$(OCAMLC) -c -o $@ $(OCAML_BFLAGS) -custom $(OCAML_TEST_INC) $<
 
 %.test.cmx: %.test.ml
-	$(OCAMLOPT) -c -o $@ -w x $(OCAML_BFLAGS) $(OCAML_TEST_INC) $<
+	$(OCAMLOPT) -c -o $@ $(OCAML_BFLAGS) $(OCAML_TEST_INC) $<
 
 %.cmo: %.ml
 	$(OCAMLC) -c -o $@ $<
@@ -86,7 +74,7 @@ sha.bytetest: sha.cma sha.test.cmo
 	$(OCAMLOPT) $(OCAMLOPTFLAGS) -c -o $@ $<
 
 %.o: %.c
-	$(OCAMLC) -ccopt "$(ccopts)" -c -o $@ $<
+	$(OCAMLC) -ccopt "$(CFLAGS)" -c -o $@ $<
 
 %.lib.o: %.o
 	mv $< $@
@@ -97,15 +85,10 @@ doc:
 	ocamldoc -html -d html *.mli
 
 clean:
-	rm -f *.o *.a *.so *.cmo *.cmi *.cma *.cmx *.cmxa sha.test sha.bytetest $(PROGRAMS)
-
-interfaces = $(cmi_files) $(cmi_files:.cmi=.mli)
-
-install: all
-	ocamlfind install sha META $(interfaces) *.cma *.cmxa *.a *.so
+	rm -f *.o *.a *.cmo *.cmi *.cma *.cmx *.cmxa sha.test $(PROGRAMS)
 
-install-byte: all-byte
-	ocamlfind install sha META $(interfaces) *.cma *.a *.so
+install: sha1.cma sha1.cmxa sha256.cma sha256.cmxa sha512.cma sha512.cmxa sha.cma sha.cmxa META
+	ocamlfind install sha META *.cmx sha1.cmi sha1.cma sha1.cmxa sha256.cmi sha256.cma sha256.cmxa sha512.cmi sha512.cma sha512.cmxa sha.cma sha.cmxa *.a *.so
 
 uninstall:
 	ocamlfind remove sha
diff --git a/sha.test.ml b/sha.test.ml
index 2a508a0..0442c01 100644
--- a/sha.test.ml
+++ b/sha.test.ml
@@ -42,15 +42,15 @@ let ex_strings_sha512 = [
 
 let ex_files_sha1 =
 	[ ("README",
-	"ebd97ba45cd1668d242d98522dc0004bb70df4a8") ]
+	"8da1775cea8540cf22a32765eadcb2239cc4d392") ]
 
 let ex_files_sha256 =
 	[ ("README",
-	"7f8213da9acc755d57f3650827176dcdf2f101ea486d5fa357e705d728480878") ]
+	"4eea769a1a5c7be83342923a240d68bc8170f170f4b6265a044261e0f7a88af0") ]
 
 let ex_files_sha512 =
 	[ ("README",
-	"da82cac10002a838aceedc7910b76735ec87b2dce08755680910b8ff287c0f48a1910989f8e3a94f9cb5a391e66d811d190bc3568135514229051c06c6e93f6e") ]
+	"ed93656a1581965acf5cb49e56bff52e56ae1e8a96f3ca7b305e2fbeeeea64adf90943611aea97b372243ea300eda6214d5552bcf5176fda161a6590f946262b") ]
 
 let ex_channels_sha1 =
 	[ ("sha.test.ml", "e13052afa4916d56994378f847f157596f9638a2") ]

-- 
ocaml-sha packaging

