Fix compiler flags so it compiles OK on all architectures.

[perl4caml.git] / Makefile

diff --git a/Makefile b/Makefile
index e10f8ed..a92c178 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Interface to Perl from OCaml.
 # Copyright (C) 2003 Merjis Ltd.
-# $Id: Makefile,v 1.16 2003-11-08 11:35:22 rich Exp $
+# $Id: Makefile,v 1.28 2004-12-11 15:40:08 rich Exp $
 
 include Makefile.config
 
@@ -16,21 +16,21 @@ OCAMLOPTINCS := $(OCAMLCINCS)
 OCAMLCFLAGS := -w s -g $(OCAMLCINCS)
 OCAMLOPTFLAGS := -w s $(OCAMLOPTINCS)
 
+PERLCFLAGS := $(shell perl -e 'use Config; print $$Config{ccflags};')
+
 CC := gcc
-CFLAGS := -Wall -Wno-unused -I$(PERLINCDIR)
+CFLAGS := -fPIC -Wall -Wno-unused -I$(PERLINCDIR) $(PERLCFLAGS) $(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:
-# `perl -MExtUtils::Embed -e ldopts'
-DYNALOADER_HACK := /usr/lib/perl/5.8.1/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 \
@@ -40,10 +40,16 @@ WRAPPERS := \
        wrappers/pl_HTML_Parser.cmo \
        wrappers/pl_HTML_TreeBuilder.cmo \
        wrappers/pl_URI.cmo \
+       wrappers/pl_HTTP_Cookies.cmo \
+       wrappers/pl_HTTP_Headers.cmo \
        wrappers/pl_HTTP_Message.cmo \
        wrappers/pl_HTTP_Request.cmo \
+       wrappers/pl_HTTP_Request_Common.cmo \
        wrappers/pl_HTTP_Response.cmo \
-       wrappers/pl_LWP_UserAgent.cmo
+       wrappers/pl_HTML_Form.cmo \
+       wrappers/pl_LWP_UserAgent.cmo \
+       wrappers/pl_Template.cmo \
+       wrappers/pl_WWW_Mechanize.cmo
 
 all:   perl4caml.cma perl4caml.cmxa META all-examples html
 
@@ -54,7 +60,8 @@ 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 $@
@@ -77,6 +84,13 @@ examples/google.opt: examples/google.cmx
        $(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 $<
 
@@ -95,10 +109,11 @@ META:      META.in Makefile.config
 
 # 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 META 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.
@@ -129,6 +144,7 @@ install:
 # Distribution.
 
 dist:
+       $(MAKE) check-manifest
        rm -rf $(PACKAGE)-$(VERSION)
        mkdir $(PACKAGE)-$(VERSION)
        tar -cf - -T MANIFEST | tar -C $(PACKAGE)-$(VERSION) -xf -
@@ -137,23 +153,37 @@ dist:
        ls -l $(PACKAGE)-$(VERSION).tar.gz
 
 check-manifest:
-       @for d in `find -type d -name CVS`; \
+       @for d in `find -type d -name CVS | grep -v '^\./debian/'`; \
        do \
        b=`dirname $$d`/; \
        awk -F/ '$$1 != "D" {print $$2}' $$d/Entries | \
        sed -e "s|^|$$b|" -e "s|^\./||"; \
        done | sort > .check-manifest; \
        sort MANIFEST > .orig-manifest; \
-       diff -u .orig-manifest .check-manifest; \
-       rm -f .orig-manifest .check-manifest
+       diff -u .orig-manifest .check-manifest; rv=$$?; \
+       rm -f .orig-manifest .check-manifest; \
+       exit $$rv
 
 # Debian packages.
 
 dpkg:
-       @if [ `cvs -q update | wc -l` ]; then \
+       @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.