X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile;h=6f42213b9509a39f4959e3cc27e7cdee90498586;hb=92ee36459463e0a040d32f5eac0ec38bb28be8f4;hp=fb966ad9a739562bbf380ad3787d26e16604e325;hpb=794a2980d030c6d353df6b3f2e4a7aad9f37d539;p=perl4caml.git

diff --git a/Makefile b/Makefile
index fb966ad..6f42213 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Interface to Perl from OCaml.
 # Copyright (C) 2003 Merjis Ltd.
-# $Id: Makefile,v 1.18 2003-11-08 11:52:03 rich Exp $
+# $Id: Makefile,v 1.23 2004-11-25 21:24:51 rich Exp $
 
 include Makefile.config
 
@@ -17,7 +17,7 @@ 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)
 
@@ -26,11 +26,14 @@ 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
+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 \
@@ -40,10 +43,15 @@ 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_LWP_UserAgent.cmo \
+	wrappers/pl_Template.cmo \
+	wrappers/pl_WWW_Mechanize.cmo
 
 all:	perl4caml.cma perl4caml.cmxa META all-examples html
 
@@ -54,7 +62,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 +86,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 +111,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.
@@ -137,15 +154,16 @@ 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.