diff options
| author | gautier.hattenberger | 2015-01-15 12:59:12 +0000 |
|---|---|---|
| committer | gautier.hattenberger | 2015-01-15 12:59:12 +0000 |
| commit | 3d6012cf93174ce5324b26149c266a75b726fb5e (patch) | |
| tree | 20c543d3b5d794457a4934fa9220fa83f30f8419 | |
| parent | 19c6553ccc6e119360af818c60b8ef875dabd6f9 (diff) | |
| download | ivy-ocaml-3d6012cf93174ce5324b26149c266a75b726fb5e.zip ivy-ocaml-3d6012cf93174ce5324b26149c266a75b726fb5e.tar.gz ivy-ocaml-3d6012cf93174ce5324b26149c266a75b726fb5e.tar.bz2 ivy-ocaml-3d6012cf93174ce5324b26149c266a75b726fb5e.tar.xz | |
add tkivy findlib module and update version numbers to 1.3
| -rw-r--r-- | META.glibivy | 2 | ||||
| -rw-r--r-- | META.ivy | 2 | ||||
| -rw-r--r-- | META.tkivy | 4 | ||||
| -rw-r--r-- | Makefile | 11 |
4 files changed, 14 insertions, 5 deletions
diff --git a/META.glibivy b/META.glibivy index bc52aae..1ed7b74 100644 --- a/META.glibivy +++ b/META.glibivy @@ -1,4 +1,4 @@ -version="1.2" +version="1.3" description="bindings for the Ivy software bus with glib mainloop" archive(byte)="glibivy-ocaml.cma" archive(native)="glibivy-ocaml.cmxa" @@ -1,4 +1,4 @@ -version="1.2" +version="1.3" description="bindings for the Ivy software bus" archive(byte)="ivy-ocaml.cma" archive(native)="ivy-ocaml.cmxa" diff --git a/META.tkivy b/META.tkivy new file mode 100644 index 0000000..bb47e42 --- /dev/null +++ b/META.tkivy @@ -0,0 +1,4 @@ +version="1.3" +description="bindings for the Ivy software bus using Tcl/Tk" +archive(byte)="tkivy-ocaml.cma" +archive(native)="tkivy-ocaml.cmxa" @@ -96,6 +96,7 @@ TKLIBS = tkivy-ocaml.cma tkivy-ocaml.cmxa IVYSTATIC = libivy-ocaml.a ivy-ocaml.a GLIBIVYSTATIC = libglibivy-ocaml.a glibivy-ocaml.a +TKIVYSTATIC = libtkivy-ocaml.a tkivy-ocaml.a LIBS = ivy-ocaml.cma glibivy-ocaml.cma XLIBS = ivy-ocaml.cmxa glibivy-ocaml.cmxa @@ -109,15 +110,18 @@ ivy : $(IVYLIBS) glibivy : $(GLIBIVYLIBS) tkivy : $(TKLIBS) -IVY_ALL_LIBS = ivy-ocaml.cma ivy-ocaml.cmxa libivy-ocaml.a ivy-ocaml.a dllivy-ocaml.so -GLIBIVY_ALL_LIBS = glibivy-ocaml.cma glibivy-ocaml.cmxa libglibivy-ocaml.a glibivy-ocaml.a dllglibivy-ocaml.so +IVY_ALL_LIBS = $(IVYLIBS) $(IVYSTATIC) dllivy-ocaml.so +GLIBIVY_ALL_LIBS = $(GLIBIVYLIBS) $(GLIBIVYSTATIC) dllglibivy-ocaml.so +TKIVY_ALL_LIBS = $(TKIVYLIBS) $(TKIVYSTATIC) dlltkivy-ocaml.so IVY_INST_FILES = $(IVYMLI) $(IVYCMI) $(IVYCMX) $(IVY_ALL_LIBS) GLIBIVY_INST_FILES = $(GLIBIVYMLI) $(GLIBIVYCMI) $(GLIBIVYCMX) $(GLIBIVY_ALL_LIBS) +TKIVY_INST_FILES = $(TKIVYMLI) $(TKIVYCMI) $(TKIVYCMX) $(TKIVY_ALL_LIBS) -install : $(IVY_INST_FILES) $(GLIBIVY_INST_FILES) +install : $(IVY_INST_FILES) $(GLIBIVY_INST_FILES) $(TKIVY_INST_FILES) mv META.ivy META && ocamlfind install $(OCAMLFINDFLAGS) ivy META $(IVY_INST_FILES) && mv META META.ivy || (mv META META.ivy && exit 1) mv META.glibivy META && ocamlfind install $(OCAMLFINDFLAGS) glibivy META $(GLIBIVY_INST_FILES) && mv META META.glibivy || (mv META META.glibivy && exit 1) + mv META.tkivy META && ocamlfind install $(OCAMLFINDFLAGS) tkivy META $(TKIVY_INST_FILES) && mv META META.tkivy || (mv META META.tkivy && exit 1) ifeq ($(COMPAT_SYMLINK_CREATE), y) # make some symlinks for backwards compatibility @echo "Creating symlinks for backwards compatibility..." @@ -130,6 +134,7 @@ endif uninstall : ocamlfind remove ivy ocamlfind remove glibivy + ocamlfind remove tkivy # cd `ocamlc -where`; rm -f $(SYMLINKS) ivy-ocaml.cma : $(IVYCMO) civy.o civyloop.o |