Patch by David Flynn

[perl4caml.git] / Makefile

diff --git a/Makefile b/Makefile
index 711cbce..1560e4e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Interface to Perl from OCaml.
 # Copyright (C) 2003 Merjis Ltd.
-# $Id: Makefile,v 1.11 2003-10-16 13:41:06 rich Exp $
+# $Id: Makefile,v 1.21 2004-11-03 14:15:16 rich Exp $
 
 include Makefile.config
 
@@ -17,18 +17,23 @@ OCAMLCFLAGS := -w s -g $(OCAMLCINCS)
 OCAMLOPTFLAGS := -w s $(OCAMLOPTINCS)
 
 CC := gcc
-CFLAGS := -Wall -Wno-unused -I$(PERLINCDIR)
+CFLAGS := -Wall -Wno-unused -I$(PERLINCDIR) $(EXTRA_CFLAGS)
 
 LIBPERL := $(shell perl -MExtUtils::Embed -e ldopts)
 
+SED := sed
+
 # XXX Hack required by ocamlopt, and sometimes ocamlc.
 # To work out what this should be, try:
-# `shell perl -MExtUtils::Embed -e ldopts'
-DYNALOADER_HACK := /usr/lib/perl/5.8.1/auto/DynaLoader/DynaLoader.a
+# `perl -MExtUtils::Embed -e ldopts'
+DYNALOADER_HACK := /usr/lib/perl/5.8/auto/DynaLoader/DynaLoader.a
 
 OCAMLDOCFLAGS := -html -stars -sort $(OCAMLCINCS)
 
 WRAPPERS := \
+       wrappers/pl_Date_Calc.cmo \
+       wrappers/pl_Date_Format.cmo \
+       wrappers/pl_Date_Parse.cmo \
        wrappers/pl_Net_Google_Cache.cmo \
        wrappers/pl_Net_Google_Response.cmo \
        wrappers/pl_Net_Google_Search.cmo \
@@ -41,9 +46,10 @@ WRAPPERS := \
        wrappers/pl_HTTP_Message.cmo \
        wrappers/pl_HTTP_Request.cmo \
        wrappers/pl_HTTP_Response.cmo \
-       wrappers/pl_LWP_UserAgent.cmo
+       wrappers/pl_LWP_UserAgent.cmo \
+       wrappers/pl_Template.cmo
 
-all:   perl4caml.cma perl4caml.cmxa all-examples html
+all:   perl4caml.cma perl4caml.cmxa META all-examples html
 
 perl4caml.cma: perl.cmo perl_c.o $(WRAPPERS)
        $(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^
@@ -52,25 +58,36 @@ perl4caml.cmxa: perl.cmx perl_c.o $(WRAPPERS:.cmo=.cmx)
        $(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^
 
 all-examples: examples/test examples/loadpage examples/google \
-       examples/test.opt examples/loadpage.opt examples/google.opt
+       examples/test.opt examples/loadpage.opt examples/google.opt \
+       examples/parsedate examples/parsedate.opt
 
 examples/test: examples/test.cmo
        $(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
 
 examples/test.opt: examples/test.cmx
-       $(OCAMLOPT) $(OCAMLOPTFLAGS) perl4caml.cmxa $(DYNALOADER_HACK) $^ -o $@
+       $(OCAMLOPT) $(OCAMLOPTFLAGS) -cclib -L. perl4caml.cmxa \
+       $(DYNALOADER_HACK) $^ -o $@
 
 examples/loadpage: examples/loadpage.cmo
        $(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
 
 examples/loadpage.opt: examples/loadpage.cmx
-       $(OCAMLOPT) $(OCAMLOPTFLAGS) perl4caml.cmxa $(DYNALOADER_HACK) $^ -o $@
+       $(OCAMLOPT) $(OCAMLOPTFLAGS) -cclib -L. perl4caml.cmxa \
+       $(DYNALOADER_HACK) $^ -o $@
 
 examples/google: examples/google.cmo
        $(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
 
 examples/google.opt: examples/google.cmx
-       $(OCAMLOPT) $(OCAMLOPTFLAGS) perl4caml.cmxa $(DYNALOADER_HACK) $^ -o $@
+       $(OCAMLOPT) $(OCAMLOPTFLAGS) -cclib -L. perl4caml.cmxa \
+       $(DYNALOADER_HACK) $^ -o $@
+
+examples/parsedate: examples/parsedate.cmo
+       $(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
+
+examples/parsedate.opt: examples/parsedate.cmx
+       $(OCAMLOPT) $(OCAMLOPTFLAGS) -cclib -L. perl4caml.cmxa \
+       $(DYNALOADER_HACK) $^ -o $@
 
 %.cmi: %.mli
        $(OCAMLC) $(OCAMLCFLAGS) -c $<
@@ -83,12 +100,18 @@ examples/google.opt: examples/google.cmx
 
 .SUFFIXES: .mli .ml .cmi .cmo .cmx
 
+META:  META.in Makefile.config
+       $(SED)  -e 's/@PACKAGE@/$(PACKAGE)/' \
+               -e 's/@VERSION@/$(VERSION)/' \
+               < $< > $@
+
 # Clean.
 
-JUNKFILES = core *~ *.bak *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so
+JUNKFILES = core *~ *.bak *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so *.opt
 
 clean:
-       rm -f examples/test examples/loadpage examples/google
+       rm -f META examples/test examples/loadpage examples/google \
+       examples/parsedate
        for d in . examples wrappers; do (cd $$d; rm -f $(JUNKFILES)); done
 
 # Build dependencies.
@@ -107,13 +130,14 @@ depend:   .depend
 # Install.
 
 install:
-       rm -rf $(OCAMLLIBDIR)/perl
-       install -c -m 0755 -d $(OCAMLLIBDIR)/perl
-       install -c -m 0755 -d $(OCAMLLIBDIR)/stublibs
+       rm -rf $(DESTDIR)$(OCAMLLIBDIR)/perl
+       install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/perl
+       install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/stublibs
        install -c -m 0644 perl.cmi perl.mli perl4caml.cma perl4caml.cmxa \
-         perl4caml.a libperl4caml.a \
-         $(WRAPPERS:.cmo=.ml) $(WRAPPERS:.cmo=.cmi) $(OCAMLLIBDIR)/perl
-       install -c -m 0644 dllperl4caml.so $(OCAMLLIBDIR)/stublibs
+         perl4caml.a libperl4caml.a META \
+         $(WRAPPERS:.cmo=.ml) $(WRAPPERS:.cmo=.cmi) \
+         $(DESTDIR)$(OCAMLLIBDIR)/perl
+       install -c -m 0644 dllperl4caml.so $(DESTDIR)$(OCAMLLIBDIR)/stublibs
 
 # Distribution.
 
@@ -136,6 +160,27 @@ check-manifest:
        diff -u .orig-manifest .check-manifest; \
        rm -f .orig-manifest .check-manifest
 
+# Debian packages.
+
+dpkg:
+       @if [ 0 != `cvs -q update | wc -l` ]; then \
+       echo Please commit all changes to CVS first.; \
+       exit 1; \
+       fi
+       $(MAKE) dist
+       rm -rf /tmp/dbuild
+       mkdir /tmp/dbuild
+       cp $(PACKAGE)-$(VERSION).tar.gz \
+         /tmp/dbuild/$(PACKAGE)_$(VERSION).orig.tar.gz
+       export CVSROOT=`cat CVS/Root`; \
+         cd /tmp/dbuild && \
+         cvs export \
+         -d $(PACKAGE)-$(VERSION) \
+         -D now merjis/test/perl4caml
+       cd /tmp/dbuild/$(PACKAGE)-$(VERSION) && dpkg-buildpackage -rfakeroot
+       rm -rf /tmp/dbuild/$(PACKAGE)-$(VERSION)
+       ls -l /tmp/dbuild
+
 # Documentation.
 
 html:  html/index.html
@@ -145,4 +190,4 @@ html/index.html: $(wildcard *.ml) $(wildcard *.mli) $(wildcard wrappers/*.ml)
        mkdir html
        -$(OCAMLDOC) $(OCAMLDOCFLAGS) -d html $^
 
-.PHONY: depend dist check-manifest html
\ No newline at end of file
+.PHONY: depend dist check-manifest html dpkg
\ No newline at end of file