add support for META files and place files in ivy sub directory

5 files changed, 174 insertions, 26 deletions

diff --git a/META.ivy b/META.ivy
new file mode 100644
index 0000000..4a6c4a4
--- /dev/null
+++ b/META.ivy
@@ -0,0 +1,4 @@
+version="1.1-15"
+directory="+ivy"
+archive(byte)="ivy.cma"
+archive(native)="ivy.cmxa"
diff --git a/Makefile b/Makefile
index 0b80ce0..27aa45b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@ DEBUG  = n
 OCAMLC = ocamlc
 OCAMLMLI = ocamlc
 OCAMLOPT = ocamlopt -unsafe
-OCAMLDEP=ocamldep
+OCAMLDEP = ocamldep
+OCAMLMKLIB = ocamlmklib
 
 ifeq ($(DEBUG),y)
 OCAMLFLAGS = -g
@@ -26,6 +27,7 @@ ifeq ($(LBITS),64)
   FPIC=-fPIC
 endif
 
+OUTDIR = ivy
 
 
 IVY = ivy.ml ivyLoop.ml
@@ -53,8 +55,9 @@ ifeq ("$(UNAME)","Darwin")
   LIBRARYS = -L/opt/local/lib
 endif
 
-LIBS = ivy-ocaml.cma ivy-ocaml.cmxa glibivy-ocaml.cma glibivy-ocaml.cmxa
-# tkivy-ocaml.cma tkivy-ocaml.cmxa
+LIBS = ivy.cma ivy.cmxa glibivy.cma glibivy.cmxa
+# tkivy.cma tkivy.cmxa
+METAFILE = META.ivy
 
 all : $(LIBS)
 
@@ -64,37 +67,45 @@ deb :
 	cp debian/changelog.$(DISTRO) debian/changelog
 	dpkg-buildpackage -rfakeroot
 
-ivy : ivy-ocaml.cma ivy-ocaml.cmxa
-glibivy : glibivy-ocaml.cma glibivy-ocaml.cmxa
-tkivy : tkivy-ocaml.cma tkivy-ocaml.cmxa
+ivy : ivy.cma ivy.cmxa
+glibivy : glibivy.cma glibivy.cmxa
+tkivy : tkivy.cma tkivy.cmxa
 
-INST_FILES = $(IVYCMI) $(IVYMLI) glibIvy.cmi $(LIBS) libivy-ocaml.a libglibivy-ocaml.a dllivy-ocaml.so dllglibivy-ocaml.so ivy-ocaml.a glibivy-ocaml.a
-# tkIvy.cmi  libtkivy-ocaml.a  dlltkivy-ocaml.so tkivy-ocaml.a
+INST_FILES = $(IVYCMI) $(IVYMLI) glibIvy.cmi $(LIBS) libivy.a libglibivy.a ivy.a glibivy.a
+# tkIvy.cmi  libtkivy.a  dlltkivy.so tkivy.a
+STUBLIBS = dllivy.so dllglibivy.so
 
 install : $(LIBS)
+	mkdir -p $(DESTDIR)/`ocamlc -where`/$(OUTDIR)
+	cp $(INST_FILES) $(DESTDIR)/`ocamlc -where`/$(OUTDIR)
+	mkdir -p $(DESTDIR)/`ocamlc -where`/stublibs
+	cp $(STUBLIBS) $(DESTDIR)/`ocamlc -where`/stublibs
+	mkdir -p $(DESTDIR)/`ocamlc -where`/METAS
+	cp $(METAFILE) $(DESTDIR)/`ocamlc -where`/METAS
 	mkdir -p $(DESTDIR)/`ocamlc -where`
-	cp $(INST_FILES) $(DESTDIR)/`ocamlc -where`
+	$(foreach file,$(INST_FILES), cd $(DESTDIR)/`ocamlc -where`; ln -s ivy/$(file) $(subst .cm,-ocaml.cm,$(file));)
 
 desinstall :
-	cd `ocamlc -where`; rm -f $(INST_FILES)
+	cd `ocamlc -where`; rm -f $(INST_FILES); rm -f METAS/$(METAFILE)
 
-ivy-ocaml.cma : $(IVYCMO) civy.o civyloop.o
-	ocamlmklib -o ivy-ocaml $^ $(LIBRARYS)  -livy
+ivy.cma : $(IVYCMO) civy.o civyloop.o
+	$(OCAMLMKLIB) -o ivy $^ $(LIBRARYS)  -livy
 
-ivy-ocaml.cmxa : $(IVYCMX) civy.o civyloop.o
-	ocamlmklib -o ivy-ocaml $^ $(LIBRARYS)  -livy
+ivy.cmxa : $(IVYCMX) civy.o civyloop.o
+	$(OCAMLMKLIB) -o ivy $^ $(LIBRARYS)  -livy
 
-glibivy-ocaml.cma : $(GLIBIVYCMO) civy.o cglibivy.o
-	ocamlmklib -o glibivy-ocaml $^ $(LIBRARYS) -lglibivy  `pkg-config --libs glib-2.0` -lpcre
+glibivy.cma : $(GLIBIVYCMO) civy.o cglibivy.o
+	$(OCAMLMKLIB) -o glibivy $^ $(LIBRARYS) -lglibivy  `pkg-config --libs glib-2.0` -lpcre
 
-glibivy-ocaml.cmxa : $(GLIBIVYCMX) civy.o cglibivy.o
-	ocamlmklib -o glibivy-ocaml $^ $(LIBRARYS) -lglibivy `pkg-config --libs glib-2.0` -lpcre
+glibivy.cmxa : $(GLIBIVYCMX) civy.o cglibivy.o
+	$(OCAMLMKLIB) -o glibivy $^ $(LIBRARYS) -lglibivy `pkg-config --libs glib-2.0` -lpcre
 
-tkivy-ocaml.cma : $(TKIVYCMO) civy.o ctkivy.o
-	ocamlmklib -o tkivy-ocaml $^ $(LIBRARYS) -livy -ltclivy
+tkivy.cma : $(TKIVYCMO) civy.o ctkivy.o
+	$(OCAMLMKLIB) -o tkivy $^ $(LIBRARYS) -livy -ltclivy
+
+tkivy.cmxa : $(TKIVYCMX) civy.o ctkivy.o
+	$(OCAMLMKLIB) -o tkivy $^ $(LIBRARYS) -livy -ltclivy
 
-tkivy-ocaml.cmxa : $(TKIVYCMX) civy.o ctkivy.o
-	ocamlmklib -o tkivy-ocaml $^ $(LIBRARYS) -livy -ltclivy
 
 .SUFFIXES:
 .SUFFIXES: .ml .mli .mly .mll .cmi .cmo .cmx .c .o .out .opt
@@ -102,7 +113,6 @@ tkivy-ocaml.cmxa : $(TKIVYCMX) civy.o ctkivy.o
 .ml.cmo :
 	$(OCAMLC) $(OCAMLFLAGS) $(INCLUDES) -c $<
 .c.o :
-    
 	$(CC) -Wall -c $(FPIC) -I /opt/local/include/  $(OCAMLINC) $(GLIBINC) $<
 .mli.cmi :
 	$(OCAMLMLI) $(OCAMLFLAGS) -c $<
@@ -113,9 +123,9 @@ tkivy-ocaml.cmxa : $(TKIVYCMX) civy.o ctkivy.o
 .mll.ml :
 	ocamllex $<
 .cmo.out :
-	$(OCAMLC) -custom -o $@ unix.cma -I . ivy-ocaml.cma $< -cclib -livy
+	$(OCAMLC) -custom -o $@ unix.cma -I . ivy.cma $< -cclib -livy
 .cmx.opt :
-	$(OCAMLOPT) -o $@ unix.cmxa -I . ivy-ocaml.cmxa $< -cclib -livy
+	$(OCAMLOPT) -o $@ unix.cmxa -I . ivy.cmxa $< -cclib -livy
 
 clean:
 	\rm -fr *.cm* *.o *.a .depend *~ *.out *.opt .depend *.so *-stamp debian/ivy-ocaml debian/files debian/ivy-ocaml.debhelper.log debian/ivy-ocaml.substvars debian/*~
diff --git a/debian/changelog.3.12.0 b/debian/changelog.3.12.0
new file mode 100644
index 0000000..3e88924
--- /dev/null
+++ b/debian/changelog.3.12.0
@@ -0,0 +1,62 @@
+ivy-ocaml (1.1-13) unstable; urgency=low
+
+  * Update for ocaml 1.12.0
+
+ -- Gautier Hattenberger <gautier.hattenberger@enac.fr>  Tue, 18 Oct 2011 17:53:31 +0100
+
+ivy-ocaml (1.1-12) unstable; urgency=low
+
+  * Support for ivy-c_3.11.8
+
+ -- Gautier Hattenberger <gautier.hattenberger@enac.fr>  Wed, 02 Feb 2011 17:49:31 +0100
+
+ivy-ocaml (1.1-11) unstable; urgency=low
+
+  * Support of ivy-c_3.11.6, OSX and Linux 64bit
+
+ -- Gautier Hattenberger <gautier.hattenberger@enac.fr>  Wed, 1 Dec 2010 10:43:29 +0100
+
+ivy-ocaml (1.1-10) unstable; urgency=low
+
+  * Updated for ocaml 3.11.2
+
+ -- Pascal Brisset (Hecto) <pascal.brisset@enac.fr>  Thu, 25 Feb 2010 09:58:29 +0100
+
+ivy-ocaml (1.1-7) unstable; urgency=low
+
+  * Updated for ocaml 3.10.2
+
+ -- Pascal Brisset (Hecto) <pascal.brisset@enac.fr>  Fri, 23 May 2008 23:18:00 +0200
+
+ivy-ocaml (1.1-6) unstable; urgency=low
+
+  * Updated for ocaml 3.10.1
+
+ -- Pascal Brisset (Hecto) <pascal.brisset@enac.fr>  Mon, 25 Feb 2008 10:31:49 +0100
+
+ivy-ocaml (1.1-5) unstable; urgency=low
+
+  * Updated for ocaml 3.10
+
+ -- Pascal Brisset (Hecto) <pascal.brisset@enac.fr>  Tue, 04 Sep 2007 20:41:49 +0200
+
+ivy-ocaml (1.1-4) unstable; urgency=low
+
+  * Updated for ocaml 3.09.2-6
+
+ -- Antoine Drouin (Poine) <poine@recherche.enac.fr>  Fri,  04 Aug 2006 13:40:54 +0200
+
+ivy-ocaml (1.1-3) unstable; urgency=low
+
+  * Updated for ivy 3.8
+
+ -- Antoine Drouin (Poine) <poine@recherche.enac.fr>  Fri,  28 Jul 2006 13:40:54 +0200
+
+ivy-ocaml (1.0-2) unstable; urgency=low
+
+  * Updated for ocaml 3.09
+
+  * Initial Release.
+
+ -- Pascal Brisset (Hecto) <pascal.brisset@enac.fr>  Thu,  7 Oct 2004 13:40:54 +0200
+
diff --git a/debian/changelog.3.12.1 b/debian/changelog.3.12.1
new file mode 100644
index 0000000..382bbab
--- /dev/null
+++ b/debian/changelog.3.12.1
@@ -0,0 +1,72 @@
+ivy-ocaml (1.1-15) unstable; urgency=low
+
+  * Add META file for ocamlfind support
+  * Move installed files in ivy subdirectory
+  * Remove -ocaml suffix
+  * Symbolic link for backward compatibility
+  * Update for ocaml 3.12.1
+
+ -- Gautier Hattenberger <gautier.hattenberger@enac.fr>  Thu, 21 Feb 2013 09:53:31 +0100
+
+ivy-ocaml (1.1-13) unstable; urgency=low
+
+  * Update for ocaml 1.12.0
+
+ -- Gautier Hattenberger <gautier.hattenberger@enac.fr>  Tue, 18 Oct 2011 17:53:31 +0100
+
+ivy-ocaml (1.1-12) unstable; urgency=low
+
+  * Support for ivy-c_3.11.8
+
+ -- Gautier Hattenberger <gautier.hattenberger@enac.fr>  Wed, 02 Feb 2011 17:49:31 +0100
+
+ivy-ocaml (1.1-11) unstable; urgency=low
+
+  * Support of ivy-c_3.11.6, OSX and Linux 64bit
+
+ -- Gautier Hattenberger <gautier.hattenberger@enac.fr>  Wed, 1 Dec 2010 10:43:29 +0100
+
+ivy-ocaml (1.1-10) unstable; urgency=low
+
+  * Updated for ocaml 3.11.2
+
+ -- Pascal Brisset (Hecto) <pascal.brisset@enac.fr>  Thu, 25 Feb 2010 09:58:29 +0100
+
+ivy-ocaml (1.1-7) unstable; urgency=low
+
+  * Updated for ocaml 3.10.2
+
+ -- Pascal Brisset (Hecto) <pascal.brisset@enac.fr>  Fri, 23 May 2008 23:18:00 +0200
+
+ivy-ocaml (1.1-6) unstable; urgency=low
+
+  * Updated for ocaml 3.10.1
+
+ -- Pascal Brisset (Hecto) <pascal.brisset@enac.fr>  Mon, 25 Feb 2008 10:31:49 +0100
+
+ivy-ocaml (1.1-5) unstable; urgency=low
+
+  * Updated for ocaml 3.10
+
+ -- Pascal Brisset (Hecto) <pascal.brisset@enac.fr>  Tue, 04 Sep 2007 20:41:49 +0200
+
+ivy-ocaml (1.1-4) unstable; urgency=low
+
+  * Updated for ocaml 3.09.2-6
+
+ -- Antoine Drouin (Poine) <poine@recherche.enac.fr>  Fri,  04 Aug 2006 13:40:54 +0200
+
+ivy-ocaml (1.1-3) unstable; urgency=low
+
+  * Updated for ivy 3.8
+
+ -- Antoine Drouin (Poine) <poine@recherche.enac.fr>  Fri,  28 Jul 2006 13:40:54 +0200
+
+ivy-ocaml (1.0-2) unstable; urgency=low
+
+  * Updated for ocaml 3.09
+
+  * Initial Release.
+
+ -- Pascal Brisset (Hecto) <pascal.brisset@enac.fr>  Thu,  7 Oct 2004 13:40:54 +0200
+
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5