diff options
| author | gautier.hattenberger | 2015-01-07 14:36:00 +0000 |
|---|---|---|
| committer | gautier.hattenberger | 2015-01-07 14:36:00 +0000 |
| commit | 63edf4eeb3b8063bf9541dbc611dde73abf4ca56 (patch) | |
| tree | f7dcea082b0ca673dab3caafa09f67334f3ff1b7 /Makefile | |
| parent | 5d51a16a065caa3cd74d7be4bc9a525d205d8746 (diff) | |
| download | ivy-ocaml-63edf4eeb3b8063bf9541dbc611dde73abf4ca56.zip ivy-ocaml-63edf4eeb3b8063bf9541dbc611dde73abf4ca56.tar.gz ivy-ocaml-63edf4eeb3b8063bf9541dbc611dde73abf4ca56.tar.bz2 ivy-ocaml-63edf4eeb3b8063bf9541dbc611dde73abf4ca56.tar.xz | |
fix ctkivy and add tk part to makefile again
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -36,6 +36,7 @@ OCAMLOPTFLAGS= CFLAGS+=-Wall OCAMLINC=-I `ocamlc -where` GLIBINC=`pkg-config --cflags glib-2.0` +TKINC=-I/usr/include/tcl # by default use fPIC on all systems FPIC ?= -fPIC @@ -70,7 +71,7 @@ TKIVYCMX= $(TKIVY:.ml=.cmx) IVYLIBS = ivy-ocaml.cma ivy-ocaml.cmxa GLIBIVYLIBS = glibivy-ocaml.cma glibivy-ocaml.cmxa -TKLIBS = tkivy.cma tkivy.cmxa +TKLIBS = tkivy-ocaml.cma tkivy-ocaml.cmxa IVYSTATIC = libivy-ocaml.a ivy-ocaml.a GLIBIVYSTATIC = libglibivy-ocaml.a glibivy-ocaml.a @@ -78,7 +79,7 @@ LIBS = ivy-ocaml.cma glibivy-ocaml.cma XLIBS = ivy-ocaml.cmxa glibivy-ocaml.cmxa -all : $(LIBS) $(XLIBS) +all : $(LIBS) $(XLIBS) $(TKLIBS) deb : dpkg-buildpackage -rfakeroot @@ -123,10 +124,10 @@ glibivy-ocaml.cmxa : $(GLIBIVYCMX) civy.o cglibivy.o $(OCAMLMKLIB) -o glibivy-ocaml $^ $(LIBRARYS) -lglibivy `pkg-config --libs glib-2.0` -lpcre tkivy-ocaml.cma : $(TKIVYCMO) civy.o ctkivy.o - $(OCAMLMKLIB) -o tkivy-ocaml $^ $(LIBRARYS) -livy -ltclivy + $(OCAMLMKLIB) -o tkivy-ocaml $^ $(LIBRARYS) -ltclivy tkivy-ocaml.cmxa : $(TKIVYCMX) civy.o ctkivy.o - $(OCAMLMKLIB) -o tkivy-ocaml $^ $(LIBRARYS) -livy -ltclivy + $(OCAMLMKLIB) -o tkivy-ocaml $^ $(LIBRARYS) -ltclivy .SUFFIXES: @@ -135,7 +136,7 @@ tkivy-ocaml.cmxa : $(TKIVYCMX) civy.o ctkivy.o .ml.cmo : $(OCAMLC) $(OCAMLFLAGS) $(INCLUDES) -c $< .c.o : - $(CC) -Wall -c $(FPIC) -I $(OSX_MACPORTS_PREFIX)/include/ $(OCAMLINC) $(GLIBINC) $< + $(CC) -Wall -c $(FPIC) -I $(OSX_MACPORTS_PREFIX)/include/ $(OCAMLINC) $(GLIBINC) $(TKINC) $< .mli.cmi : $(OCAMLMLI) $(OCAMLFLAGS) -c $< .ml.cmx : |