X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=d09c8dcd8ea02e9e86f25f38c3960e0ba2627315;hb=077066abddf833bc131eb49276f94d578cc48c9b;hp=1365ff1c5546c6599d278f8ecdb4e4a1703c4697;hpb=9e543055271a1ec799d56f507ab048c78d3d7a88;p=perl4caml.git

diff --git a/Makefile b/Makefile
index 1365ff1..d09c8dc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Interface to Perl from OCaml.
 # Copyright (C) 2003 Merjis Ltd.
-# $Id: Makefile,v 1.7 2003-10-14 16:05:21 rich Exp $
+# $Id: Makefile,v 1.10 2003-10-15 16:51:12 rich Exp $
 
 include Makefile.config
 
@@ -20,6 +20,11 @@ CFLAGS := -Wall -Wno-unused -I$(PERLINCDIR)
 
 LIBPERL := $(shell perl -MExtUtils::Embed -e ldopts)
 
+# 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
+
 WRAPPERS := \
 	wrappers/pl_Net_Google_Cache.cmo \
 	wrappers/pl_Net_Google_Response.cmo \
@@ -33,36 +38,36 @@ WRAPPERS := \
 	wrappers/pl_HTTP_Message.cmo \
 	wrappers/pl_HTTP_Request.cmo \
 	wrappers/pl_HTTP_Response.cmo \
-	wrappers/pl_LWP_UserAgent.cmo \
-	wrappers/pl_Net_Google.cmo
+	wrappers/pl_LWP_UserAgent.cmo
 
-all:	perl.cma perl.cmxa perl_init.cmo perl_init.cmx all-examples
+all:	perl4caml.cma perl4caml.cmxa all-examples
 
-perl.cma: perl.cmo perl_c.o $(WRAPPERS)
-	$(OCAMLMKLIB) -o perl $(LIBPERL) $^
+perl4caml.cma: perl.cmo perl_c.o $(WRAPPERS)
+	$(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^
 
-perl.cmxa: perl.cmx perl_c.o $(WRAPPERS:.cmo=.cmx)
-	$(OCAMLMKLIB) -o perl $(LIBPERL) $^
+perl4caml.cmxa: perl.cmx perl_c.o $(WRAPPERS:.cmo=.cmx)
+	$(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^
 
-all-examples: examples/test examples/loadpage examples/google
+all-examples: examples/test examples/loadpage examples/google \
+	examples/test.opt examples/loadpage.opt examples/google.opt
 
 examples/test: examples/test.cmo
-	$(OCAMLC) $(OCAMLCFLAGS) perl.cma perl_init.cmo $^ -o $@
+	$(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
 
-#examples/test.opt: examples/test.cmx
-#	$(OCAMLOPT) $(OCAMLOPTFLAGS) perl.cmxa perl_init.cmx $^ -o $@
+examples/test.opt: examples/test.cmx
+	$(OCAMLOPT) $(OCAMLOPTFLAGS) perl4caml.cmxa $(DYNALOADER_HACK) $^ -o $@
 
 examples/loadpage: examples/loadpage.cmo
-	$(OCAMLC) $(OCAMLCFLAGS) perl.cma perl_init.cmo $^ -o $@
+	$(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
 
-#examples/loadpage.opt: examples/loadpage.cmx
-#	$(OCAMLOPT) $(OCAMLOPTFLAGS) perl.cmxa perl_init.cmx $^ -o $@
+examples/loadpage.opt: examples/loadpage.cmx
+	$(OCAMLOPT) $(OCAMLOPTFLAGS) perl4caml.cmxa $(DYNALOADER_HACK) $^ -o $@
 
 examples/google: examples/google.cmo
-	$(OCAMLC) $(OCAMLCFLAGS) perl.cma perl_init.cmo $^ -o $@
+	$(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
 
-#examples/google.opt: examples/google.cmx
-#	$(OCAMLOPT) $(OCAMLOPTFLAGS) perl.cmxa perl_init.cmx $^ -o $@
+examples/google.opt: examples/google.cmx
+	$(OCAMLOPT) $(OCAMLOPTFLAGS) perl4caml.cmxa $(DYNALOADER_HACK) $^ -o $@
 
 %.cmi: %.mli
 	$(OCAMLC) $(OCAMLCFLAGS) -c $<
@@ -99,12 +104,13 @@ depend:	.depend
 # Install.
 
 install:
-	install -c -m 0755 -d $(OCAMLLIBDIR)
+	rm -rf $(OCAMLLIBDIR)/perl
+	install -c -m 0755 -d $(OCAMLLIBDIR)/perl
 	install -c -m 0755 -d $(OCAMLLIBDIR)/stublibs
-	install -c -m 0644 perl.cmi perl.mli perl.cma perl.cmxa $(OCAMLLIBDIR)
-	install -c -m 0644 perl_init.cmo perl_init.cmx $(OCAMLLIBDIR)
-	install -c -m 0644 perl.a libperl.a $(OCAMLLIBDIR)
-	install -c -m 0644 dllperl.so $(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
 
 # Distribution.