diff options
| author | fcolin | 2011-02-08 16:38:55 +0000 |
|---|---|---|
| committer | fcolin | 2011-02-08 16:38:55 +0000 |
| commit | 1762b1c59c186f54a756c7b72bea7fd8c5115fda (patch) | |
| tree | 8d7dd74ff9ae13370718700a30db602a80643d58 /src/Makefile | |
| parent | a897bb17e74ff73b9ee19ace0ef62466030ab6e6 (diff) | |
| download | ivy-c-1762b1c59c186f54a756c7b72bea7fd8c5115fda.zip ivy-c-1762b1c59c186f54a756c7b72bea7fd8c5115fda.tar.gz ivy-c-1762b1c59c186f54a756c7b72bea7fd8c5115fda.tar.bz2 ivy-c-1762b1c59c186f54a756c7b72bea7fd8c5115fda.tar.xz | |
change Filter API
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index 54ecbcf..b9acb58 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,7 +17,7 @@ # change this in version.h too !!!! MAJOR=3 -MINOR=11 +MINOR=12 PERHAPS64 := $(shell getconf LONG_BIT | perl -ne "print /64/ ? '64' : '';") LIB = /lib$(PERHAPS64) @@ -41,6 +41,7 @@ export XTINC = -I$(X11_PREFIX)/include XTLIB = -L$(X11_PREFIX)$(LIB) -lXt -lX11 -lSM -lICE +HAVE_GLIB = $(shell pkg-config --exists glib-2.0 && echo 'yes') GLIBINC = `pkg-config --cflags glib-2.0` GLIBLIB = `pkg-config --libs glib-2.0` GLUTINC = -I/usr/include -I. @@ -121,9 +122,17 @@ XTOBJ = ivyxtloop.o ivysocket.o ivy.o ivybuffer.o ivyfifo.o ivybind.o intervalRe GLIBOBJ = ivyglibloop.o ivysocket.o ivy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o param.o GLUTOBJ = ivyglutloop.o ivysocket.o ivy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o param.o TCLOBJ = ivytcl.o timer.o ivysocket.o givy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o param.o - # WINDOWS add ivyloop.o if TCL_CHANNEL_INTEGRATION is not set -TARGETLIBS=libivy.so.$(MAJOR).$(MINOR) libgivy.so.$(MAJOR).$(MINOR) libxtivy.so.$(MAJOR).$(MINOR) libglibivy.so.$(MAJOR).$(MINOR) libtclivy.so.$(MAJOR).$(MINOR) + +TARGETLIBS=libivy.so.$(MAJOR).$(MINOR) libgivy.so.$(MAJOR).$(MINOR) libxtivy.so.$(MAJOR).$(MINOR) libtclivy.so.$(MAJOR).$(MINOR) +STATICTARGETLIBS=libivy.a libgivy.a libxtivy.a libtclivy.a + +ifeq ($(HAVE_GLIB),yes) + TARGETLIBS += libglibivy.so.$(MAJOR).$(MINOR) + STATICTARGETLIBS += libglibivy.a +endif + + # not yet need Modified Glut ivyglutprobe .c.o: @@ -136,7 +145,7 @@ libomp: libivy_omp.a libivy_omp.so.$(MAJOR).$(MINOR) omp: libomp @(cd $(TOOLS_DIR) && $(MAKE) omp) -static-libs: libivy.a libgivy.a libxtivy.a libglibivy.a libtclivy.a +static-libs: $(STATICTARGETLIBS) # not yet need Modified Glut libglutivy.a shared-libs: $(TARGETLIBS) |