From: rich <rich>
Date: Wed, 15 Oct 2003 09:49:52 +0000 (+0000)
Subject: Renamed the .cma/.cmxa libraries as perl4caml to avoid conflicting
X-Git-Url: http://git.annexia.org/?p=perl4caml.git;a=commitdiff_plain;h=918648a5563d9ae8e4079fdf7d364387b02b1b34

Renamed the .cma/.cmxa libraries as perl4caml to avoid conflicting
with the real libperl when linking.
---

diff --git a/Makefile b/Makefile
index e02a6d6..661564c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Interface to Perl from OCaml.
 # Copyright (C) 2003 Merjis Ltd.
-# $Id: Makefile,v 1.8 2003-10-15 08:55:23 rich Exp $
+# $Id: Makefile,v 1.9 2003-10-15 09:49:52 rich Exp $
 
 include Makefile.config
 
@@ -35,33 +35,33 @@ WRAPPERS := \
 	wrappers/pl_HTTP_Response.cmo \
 	wrappers/pl_LWP_UserAgent.cmo
 
-all:	perl.cma perl.cmxa perl_init.cmo perl_init.cmx all-examples
+all:	perl4caml.cma perl4caml.cmxa perl_init.cmo perl_init.cmx 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
 
 examples/test: examples/test.cmo
-	$(OCAMLC) $(OCAMLCFLAGS) perl.cma perl_init.cmo $^ -o $@
+	$(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma perl_init.cmo $^ -o $@
 
 #examples/test.opt: examples/test.cmx
-#	$(OCAMLOPT) $(OCAMLOPTFLAGS) perl.cmxa perl_init.cmx $^ -o $@
+#	$(OCAMLOPT) $(OCAMLOPTFLAGS) perl4caml.cmxa perl_init.cmx $^ -o $@
 
 examples/loadpage: examples/loadpage.cmo
-	$(OCAMLC) $(OCAMLCFLAGS) perl.cma perl_init.cmo $^ -o $@
+	$(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma perl_init.cmo $^ -o $@
 
 #examples/loadpage.opt: examples/loadpage.cmx
-#	$(OCAMLOPT) $(OCAMLOPTFLAGS) perl.cmxa perl_init.cmx $^ -o $@
+#	$(OCAMLOPT) $(OCAMLOPTFLAGS) perl4caml.cmxa perl_init.cmx $^ -o $@
 
 examples/google: examples/google.cmo
-	$(OCAMLC) $(OCAMLCFLAGS) perl.cma perl_init.cmo $^ -o $@
+	$(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma perl_init.cmo $^ -o $@
 
 #examples/google.opt: examples/google.cmx
-#	$(OCAMLOPT) $(OCAMLOPTFLAGS) perl.cmxa perl_init.cmx $^ -o $@
+#	$(OCAMLOPT) $(OCAMLOPTFLAGS) perl4caml.cmxa perl_init.cmx $^ -o $@
 
 %.cmi: %.mli
 	$(OCAMLC) $(OCAMLCFLAGS) -c $<
@@ -100,10 +100,10 @@ depend:	.depend
 install:
 	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 \
-	  perl_init.cmo perl_init.cmx perl.a libperl.a \
+	install -c -m 0644 perl.cmi perl.mli perl4caml.cma perl4caml.cmxa \
+	  perl_init.cmo perl_init.cmx perl4caml.a libperl4caml.a \
 	  $(WRAPPERS:.cmo=.ml) $(WRAPPERS:.cmo=.cmi) $(OCAMLLIBDIR)/perl
-	install -c -m 0644 dllperl.so $(OCAMLLIBDIR)/stublibs
+	install -c -m 0644 dllperl4caml.so $(OCAMLLIBDIR)/stublibs
 
 # Distribution.
 
diff --git a/Makefile.config b/Makefile.config
index 00c2abd..ec3c5d7 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -1,5 +1,5 @@
 # perl4caml configuration -*- Makefile -*-
-# $Id: Makefile.config,v 1.6 2003-10-15 08:55:23 rich Exp $
+# $Id: Makefile.config,v 1.7 2003-10-15 09:49:52 rich Exp $
 
 # PERLINCDIR
 # Directory containing the Perl include files, eg. <EXTERN.h>.
@@ -15,4 +15,4 @@ OCAMLLIBDIR := $(shell ocamlc -where)
 # PACKAGE and VERSION
 
 PACKAGE := perl4caml
-VERSION := 0.3.1
+VERSION := 0.3.2