Wrappers now automatically 'use' modules.

[perl4caml.git] / Makefile

diff --git a/Makefile b/Makefile
index 661564c..d09c8dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Interface to Perl from OCaml.
 # Copyright (C) 2003 Merjis Ltd.
-# $Id: Makefile,v 1.9 2003-10-15 09:49:52 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 \
@@ -35,7 +40,7 @@ WRAPPERS := \
        wrappers/pl_HTTP_Response.cmo \
        wrappers/pl_LWP_UserAgent.cmo
 
-all:   perl4caml.cma perl4caml.cmxa perl_init.cmo perl_init.cmx all-examples
+all:   perl4caml.cma perl4caml.cmxa all-examples
 
 perl4caml.cma: perl.cmo perl_c.o $(WRAPPERS)
        $(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^
@@ -43,25 +48,26 @@ perl4caml.cma: perl.cmo perl_c.o $(WRAPPERS)
 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) perl4caml.cma perl_init.cmo $^ -o $@
+       $(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
 
-#examples/test.opt: examples/test.cmx
-#      $(OCAMLOPT) $(OCAMLOPTFLAGS) perl4caml.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) perl4caml.cma perl_init.cmo $^ -o $@
+       $(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
 
-#examples/loadpage.opt: examples/loadpage.cmx
-#      $(OCAMLOPT) $(OCAMLOPTFLAGS) perl4caml.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) perl4caml.cma perl_init.cmo $^ -o $@
+       $(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
 
-#examples/google.opt: examples/google.cmx
-#      $(OCAMLOPT) $(OCAMLOPTFLAGS) perl4caml.cmxa perl_init.cmx $^ -o $@
+examples/google.opt: examples/google.cmx
+       $(OCAMLOPT) $(OCAMLOPTFLAGS) perl4caml.cmxa $(DYNALOADER_HACK) $^ -o $@
 
 %.cmi: %.mli
        $(OCAMLC) $(OCAMLCFLAGS) -c $<
@@ -98,10 +104,11 @@ depend:    .depend
 # Install.
 
 install:
+       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 perl4caml.cma perl4caml.cmxa \
-         perl_init.cmo perl_init.cmx perl4caml.a libperl4caml.a \
+         perl4caml.a libperl4caml.a \
          $(WRAPPERS:.cmo=.ml) $(WRAPPERS:.cmo=.cmi) $(OCAMLLIBDIR)/perl
        install -c -m 0644 dllperl4caml.so $(OCAMLLIBDIR)/stublibs