[Pkg-ocaml-maint-commits] r3724 - in /trunk/packages/ocaml-sha/trunk/debian: META Makefile libsha-ocaml-dev.docs libsha-ocaml-dev.install.in libsha-ocaml.install.in rules

[ecc-guest at users.alioth.debian.org]

Author: ecc-guest
Date: Wed Apr 25 01:00:17 2007
New Revision: 3724

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3724
Log:
use OCaml cdbs class

Added:
    trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml-dev.docs
    trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml-dev.install.in
    trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml.install.in
Removed:
    trunk/packages/ocaml-sha/trunk/debian/META
Modified:
    trunk/packages/ocaml-sha/trunk/debian/Makefile
    trunk/packages/ocaml-sha/trunk/debian/rules

Modified: trunk/packages/ocaml-sha/trunk/debian/Makefile
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha/trunk/debian/Makefile?rev=3724&op=diff
==============================================================================
--- trunk/packages/ocaml-sha/trunk/debian/Makefile (original)
+++ trunk/packages/ocaml-sha/trunk/debian/Makefile Wed Apr 25 01:00:17 2007
@@ -1,11 +1,12 @@
 OCAMLMAKEFILE = /usr/share/ocaml-tools/OCamlMakefile
+
+RESULT = sha
 
 SOURCES = sha.ml $(foreach n,1 256 512,sha$(n).mli sha$(n).ml sha$(n)_stubs.c)
 CFLAGS = -Wall -O3 -funroll-loops
-RESULT = sha
+OCAMLDOCFLAGS = -keep-code
+NO_CUSTOM = yes
 
 all: byte-code-library
 
-install: libinstall
-
 include $(OCAMLMAKEFILE)

Added: trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml-dev.docs
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml-dev.docs?rev=3724&op=file
==============================================================================
--- trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml-dev.docs (added)
+++ trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml-dev.docs Wed Apr 25 01:00:17 2007
@@ -1,0 +1,1 @@
+doc/sha/html

Added: trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml-dev.install.in?rev=3724&op=file
==============================================================================
--- trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml-dev.install.in (added)
+++ trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml-dev.install.in Wed Apr 25 01:00:17 2007
@@ -1,0 +1,1 @@
+{META,*.mli,*.cmi,*.cm*a,*.a}	@OCamlStdlibDir@/sha

Added: trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml.install.in?rev=3724&op=file
==============================================================================
--- trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml.install.in (added)
+++ trunk/packages/ocaml-sha/trunk/debian/libsha-ocaml.install.in Wed Apr 25 01:00:17 2007
@@ -1,0 +1,1 @@
+dllsha_stubs.so		@OCamlStdlibDir@/stublibs

Modified: trunk/packages/ocaml-sha/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sha/trunk/debian/rules?rev=3724&op=diff
==============================================================================
--- trunk/packages/ocaml-sha/trunk/debian/rules (original)
+++ trunk/packages/ocaml-sha/trunk/debian/rules Wed Apr 25 01:00:17 2007
@@ -1,45 +1,23 @@
 #!/usr/bin/make -f
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/class/ocaml.mk
 
-NATIVECODE = $(shell [ -x /usr/bin/ocamlopt ] && echo yes)
-
-DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -f debian/Makefile
+DEB_MAKE_MAKEFILE = debian/Makefile
 DEB_MAKE_BUILD_TARGET = htdoc byte-code-library
-ifeq ($(NATIVECODE),yes)
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
     DEB_MAKE_BUILD_TARGET += native-code-library
 endif
-DEB_MAKE_INSTALL_TARGET = install
 
-OCAMLLIBDIR = $(shell ocamlc -where)
-DESTDIR=$(CURDIR)/debian/libsha-ocaml-dev/$(OCAMLLIBDIR)
-STUBDIR=$(CURDIR)/debian/libsha-ocaml/$(OCAMLLIBDIR)/stublibs
+META:
+	echo 'name="sha"' > META
+	echo 'description="SHA cryptographic hash functions"' >> META
+	echo 'version="'$(DEB_NOEPOCH_VERSION)'"' >> META
+	echo 'archive(byte)="sha.cma"' >> META
+	echo 'archive(native)="sha.cmxa"' >> META
 
-export OCAMLDOCFLAGS = -keep-code
-export OCAMLFIND_INSTFLAGS = -destdir $(DESTDIR) -ldconf ignore
-export NO_CUSTOM = yes
-
-LIBINSTALL_FILES = $(foreach n,1 256 512,sha$(n).mli sha$(n).cmi) \
-		   sha.cma libsha_stubs.a dllsha_stubs.so
-ifeq ($(NATIVECODE),yes)
-    LIBINSTALL_FILES += sha.cmxa sha.a
-endif
-export LIBINSTALL_FILES
-
-DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(shell ocamlc -version)"
-
-DEB_INSTALL_DOCS_libsha-ocaml-dev += doc/sha/html
-
-common-install-prehook-impl::
-	mkdir -p $(DESTDIR)
-	cp debian/META META
+build/libsha-ocaml-dev:: META
 
 clean::
-	$(DEB_MAKE_INVOKE) clean-doc
-	rm -f META
-
-# move runtime stub libs to the non-dev package
-
-common-install-impl::
-	mkdir -p $(STUBDIR)
-	mv $(DESTDIR)/sha/dll*_stubs.so $(STUBDIR)
+	rm -fr doc META