From d8c270dcecc20b8084cb0463490ef68c8f88518f Mon Sep 17 00:00:00 2001 From: fcolin Date: Tue, 18 Apr 2006 11:54:14 +0000 Subject: retour au protocol V3 --- src/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index b3f6cd1..778da73 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,7 +17,7 @@ # change this in version.h too !!!! MAJOR=3 -MINOR=7 +MINOR=8 XTINC = -I/usr/X11R6/include XTLIB = -L/usr/X11R6/lib -lXt -lX11 -lSM -lICE @@ -68,12 +68,14 @@ REGEXP= -DUSE_PCRE_REGEX -DPCRE_OPT=$(PCRE_OPT) CHANNEL = -DTCL_CHANNEL_INTEGRATION CFLAGS = -g -Wall + OBJ = ivyloop.o timer.o ivysocket.o ivy.o GOBJ = ivyloop.o timer.o ivysocket.o givy.o XTOBJ = ivyxtloop.o ivysocket.o ivy.o GLIBOBJ = ivyglibloop.o ivysocket.o ivy.o GLUTOBJ = ivyglutloop.o ivysocket.o ivy.o TCLOBJ = ivytcl.o timer.o ivysocket.o givy.o + # WINDOWS add ivyloop.o if TCL_CHANNEL_INTEGRATION is not set TARGETS = ivyprobe ivyperf ivyglibprobe ivyxtprobe TARGETLIBS=libivy.so.$(MAJOR).$(MINOR) libgivy.so.$(MAJOR).$(MINOR) libxtivy.so.$(MAJOR).$(MINOR) libglibivy.so.$(MAJOR).$(MINOR) libtclivy.so.$(MAJOR).$(MINOR) @@ -99,7 +101,7 @@ ivy.o: ivy.c $(CC) -c $(CFLAGS) $(REGEXP) $(PCREINC) ivy.c givy.o: ivy.c - $(CC) -c $(CFLAGS) -DGNU_REGEXP -DREGCOMP_OPT=$(REGCOMP_OPT) -o givy.o ivy.c + $(CC) -c $(CFLAGS) $(REGEXP) -DREGCOMP_OPT=$(REGCOMP_OPT) -o givy.o ivy.c ivyglutloop.o: ivyglutloop.c ivyglutloop.h $(CC) -c $(CFLAGS) $(GLUTINC) ivyglutloop.c -- cgit v1.1 From 6bf117656574521545694a1a4e5169755077631e Mon Sep 17 00:00:00 2001 From: fcolin Date: Wed, 19 Apr 2006 08:28:14 +0000 Subject: correction de probleme potentiel en multithread ( Ada rejeu ) ajout d'un warning en cas de client bloquant si la varaiable d'env IVY_DEBUG_SEND est positionne --- src/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 778da73..fdd3e28 100644 --- a/src/Makefile +++ b/src/Makefile @@ -69,12 +69,12 @@ CHANNEL = -DTCL_CHANNEL_INTEGRATION CFLAGS = -g -Wall -OBJ = ivyloop.o timer.o ivysocket.o ivy.o -GOBJ = ivyloop.o timer.o ivysocket.o givy.o -XTOBJ = ivyxtloop.o ivysocket.o ivy.o -GLIBOBJ = ivyglibloop.o ivysocket.o ivy.o -GLUTOBJ = ivyglutloop.o ivysocket.o ivy.o -TCLOBJ = ivytcl.o timer.o ivysocket.o givy.o +OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o +GOBJ = ivyloop.o timer.o ivysocket.o givy.o ivybuffer.o +XTOBJ = ivyxtloop.o ivysocket.o ivy.o ivybuffer.o +GLIBOBJ = ivyglibloop.o ivysocket.o ivy.o ivybuffer.o +GLUTOBJ = ivyglutloop.o ivysocket.o ivy.o ivybuffer.o +TCLOBJ = ivytcl.o timer.o ivysocket.o givy.o ivybuffer.o # WINDOWS add ivyloop.o if TCL_CHANNEL_INTEGRATION is not set TARGETS = ivyprobe ivyperf ivyglibprobe ivyxtprobe -- cgit v1.1 From d20808b04feb328272a35ee2b03f4ae19db23fbe Mon Sep 17 00:00:00 2001 From: fcolin Date: Thu, 20 Apr 2006 15:51:37 +0000 Subject: cleanup DEBUG code --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index fdd3e28..31d1367 100644 --- a/src/Makefile +++ b/src/Makefile @@ -101,7 +101,7 @@ ivy.o: ivy.c $(CC) -c $(CFLAGS) $(REGEXP) $(PCREINC) ivy.c givy.o: ivy.c - $(CC) -c $(CFLAGS) $(REGEXP) -DREGCOMP_OPT=$(REGCOMP_OPT) -o givy.o ivy.c + $(CC) -c $(CFLAGS) $(REGEXP) $(PCREINC) -DDEBUG -o givy.o ivy.c ivyglutloop.o: ivyglutloop.c ivyglutloop.h $(CC) -c $(CFLAGS) $(GLUTINC) ivyglutloop.c -- cgit v1.1 From 8b42932b4ec978040acf341e69cd7b037721b24f Mon Sep 17 00:00:00 2001 From: fcolin Date: Fri, 21 Apr 2006 12:49:19 +0000 Subject: separation regexp en module ( bug arg num edbute a 1 ) --- src/Makefile | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 31d1367..7fd28a3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -69,12 +69,12 @@ CHANNEL = -DTCL_CHANNEL_INTEGRATION CFLAGS = -g -Wall -OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o -GOBJ = ivyloop.o timer.o ivysocket.o givy.o ivybuffer.o -XTOBJ = ivyxtloop.o ivysocket.o ivy.o ivybuffer.o -GLIBOBJ = ivyglibloop.o ivysocket.o ivy.o ivybuffer.o -GLUTOBJ = ivyglutloop.o ivysocket.o ivy.o ivybuffer.o -TCLOBJ = ivytcl.o timer.o ivysocket.o givy.o ivybuffer.o +OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o ivybind.o +GOBJ = ivyloop.o timer.o ivysocket.o givy.o ivybuffer.o ivybind.o +XTOBJ = ivyxtloop.o ivysocket.o ivy.o ivybuffer.o ivybind.o +GLIBOBJ = ivyglibloop.o ivysocket.o ivy.o ivybuffer.o ivybind.o +GLUTOBJ = ivyglutloop.o ivysocket.o ivy.o ivybuffer.o ivybind.o +TCLOBJ = ivytcl.o timer.o ivysocket.o givy.o ivybuffer.o ivybind.o # WINDOWS add ivyloop.o if TCL_CHANNEL_INTEGRATION is not set TARGETS = ivyprobe ivyperf ivyglibprobe ivyxtprobe @@ -94,14 +94,15 @@ shared-libs: $(TARGETLIBS) commands: $(TARGETS) +ivybind.o: ivybind.c + $(CC) -c $(CFLAGS) $(REGEXP) $(PCREINC) ivybind.c + + ivytcl.o: ivytcl.c $(CC) -c $(CFLAGS) $(TCLINCL) $(CHANNEL) ivytcl.c -ivy.o: ivy.c - $(CC) -c $(CFLAGS) $(REGEXP) $(PCREINC) ivy.c - givy.o: ivy.c - $(CC) -c $(CFLAGS) $(REGEXP) $(PCREINC) -DDEBUG -o givy.o ivy.c + $(CC) -c $(CFLAGS) -DDEBUG -o givy.o ivy.c ivyglutloop.o: ivyglutloop.c ivyglutloop.h $(CC) -c $(CFLAGS) $(GLUTINC) ivyglutloop.c @@ -118,9 +119,6 @@ ivyprobe.o : ivyprobe.c ivyperf: ivyperf.o libivy.a $(CC) $(CFLAGS) -o $@ ivyperf.o -L. -livy $(PCRELIB) $(EXTRALIB) -ivyperf.o : ivyperf.c - $(CC) $(CFLAGS) $(REGEXP) -c ivyperf.c -o $@ - ivyxtprobe.o : ivyprobe.c $(CC) $(CFLAGS) $(REGEXP) -DXTMAINLOOP -c ivyprobe.c -o $@ $(XTINC) -- cgit v1.1 From 093ebcd2ef5341a346c3d9cfcf4865007584b1ee Mon Sep 17 00:00:00 2001 From: bustico Date: Thu, 11 May 2006 16:06:12 +0000 Subject: adaptation pour linux 64 bits --- src/Makefile | 74 ++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 30 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 7fd28a3..c44eafa 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,8 +19,19 @@ MAJOR=3 MINOR=8 +PERHAPS64 := $(shell uname -m | perl -ne "print /64/ ? '64' : '';") +LIB = lib$(PERHAPS64) +ifeq ($(PERHAPS64), "64") + FPIC= +else + FPIC=-fPIC +endif + +INSTALL_BINDIR=$(PREFIX)/usr/local/bin +INSTALL_LIBDIR=$(PREFIX)/usr/local/$(LIB) + XTINC = -I/usr/X11R6/include -XTLIB = -L/usr/X11R6/lib -lXt -lX11 -lSM -lICE +XTLIB = -L/usr/X11R6/$(LIB) -lXt -lX11 -lSM -lICE GLIBINC = `pkg-config --cflags glib-2.0` GLIBLIB = `pkg-config --libs glib-2.0` GLUTINC = -I/usr/include -I. @@ -30,6 +41,9 @@ GLUTLIB = -L. -lglut -lGLU -lGL -lX11 -lXmu #TCLVERS = `perl -e '@_=sort map (m|/usr/lib/libtcl(\d\.\d)\.so|, glob ("/usr/lib/libtcl*")); print pop @_'` TCLVERS:= $(shell perl -e '@_=sort map (m|/usr/lib/libtcl(\d\.\d)\.so|, glob ("/usr/lib/libtcl*")); print pop @_') ifndef TCLVERS +TCLVERS:= $(shell perl -e '@_=sort map (m|/usr/lib64/libtcl(\d\.\d)\.so|, glob ("/usr/lib64/libtcl*")); print pop @_') +endif +ifndef TCLVERS TCLVERS=8.3 endif @@ -66,7 +80,7 @@ REGEXP= -DUSE_PCRE_REGEX -DPCRE_OPT=$(PCRE_OPT) # on activeTCL , set #define CHANNEL to null, and add ivyloop.o in the ivytcl target, # see below CHANNEL = -DTCL_CHANNEL_INTEGRATION -CFLAGS = -g -Wall +CFLAGS = -g -Wall $(FPIC) OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o ivybind.o @@ -115,7 +129,7 @@ ivyprobe: ivyprobe.o libivy.a ivyprobe.o : ivyprobe.c $(CC) $(CFLAGS) $(REGEXP) -c ivyprobe.c -o $@ - + ivyperf: ivyperf.o libivy.a $(CC) $(CFLAGS) -o $@ ivyperf.o -L. -livy $(PCRELIB) $(EXTRALIB) @@ -196,39 +210,39 @@ clean: -rm -f $(TARGETS) $(TARGETLIBS) *.o *.a *.so *.so.* *~ installlibs: static-libs shared-libs - test -d $(PREFIX)/usr/lib || mkdirhier $(PREFIX)/usr/lib - test -d $(PREFIX)/usr/X11R6/lib || mkdirhier $(PREFIX)/usr/X11R6/lib - test -d $(PREFIX)/usr/include || mkdirhier $(PREFIX)/usr/include - install -m644 libivy.a $(PREFIX)/usr/lib - install -m644 libgivy.a $(PREFIX)/usr/lib - install -m644 libxtivy.a $(PREFIX)/usr/X11R6/lib - install -m644 libtclivy.a $(PREFIX)/usr/lib - install -m644 libglibivy.a $(PREFIX)/usr/lib - - install -m644 libivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib - install -m644 libgivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib - install -m644 libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/lib - install -m644 libtclivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib - install -m644 libglibivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib - - install -m644 *.h $(PREFIX)/usr/include + test -d $(INSTALL_LIBDIR) || mkdirhier $(INSTALL_LIBDIR) + test -d $(PREFIX)/usr/X11R6/$(LIB) || mkdirhier $(PREFIX)/usr/X11R6/$(LIB) + test -d $(PREFIX)/usr/local/include || mkdirhier $(PREFIX)/usr/local/include + install -m644 libivy.a $(INSTALL_LIBDIR) + install -m644 libgivy.a $(INSTALL_LIBDIR) + install -m644 libxtivy.a $(PREFIX)/usr/X11R6/$(LIB) + install -m644 libtclivy.a $(INSTALL_LIBDIR) + install -m644 libglibivy.a $(INSTALL_LIBDIR) + + install -m644 libivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR) + install -m644 libgivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR) + install -m644 libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/$(LIB) + install -m644 libtclivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR) + install -m644 libglibivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR) + + install -m644 *.h $(PREFIX)/usr/local/include installliblinks: installlibs - ln -fs /usr/lib/libivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libivy.so - ln -fs /usr/lib/libivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libivy.so.$(MAJOR) - ln -fs /usr/lib/libgivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libgivy.so - ln -fs /usr/lib/libgivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libgivy.so.$(MAJOR) - ln -fs /usr/X11R6/lib/libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/lib/libxtivy.so - ln -fs /usr/X11R6/lib/libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/lib/libxtivy.so.$(MAJOR) - ln -fs /usr/lib/libtclivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libtclivy.so - ln -fs /usr/lib/libtclivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/lib/libtclivy.so.$(MAJOR) + ln -fs $(INSTALL_LIBDIR)/libivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libivy.so + ln -fs $(INSTALL_LIBDIR)/libivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libivy.so.$(MAJOR) + ln -fs $(INSTALL_LIBDIR)/libgivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libgivy.so + ln -fs $(INSTALL_LIBDIR)/libgivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libgivy.so.$(MAJOR) + ln -fs /usr/X11R6/$(LIB)/libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/$(LIB)/libxtivy.so + ln -fs /usr/X11R6/$(LIB)/libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/$(LIB)/libxtivy.so.$(MAJOR) + ln -fs $(INSTALL_LIBDIR)/libtclivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libtclivy.so + ln -fs $(INSTALL_LIBDIR)/libtclivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libtclivy.so.$(MAJOR) installbins: commands - test -d $(PREFIX)/usr/bin || mkdirhier $(PREFIX)/usr/bin + test -d $(INSTALL_BINDIR) || mkdirhier $(INSTALL_BINDIR) test -d $(PREFIX)/usr/X11R6/bin || mkdirhier $(PREFIX)/usr/X11R6/bin - install -m755 ivyprobe $(PREFIX)/usr/bin + install -m755 ivyprobe $(INSTALL_BINDIR) #install -m755 ivyxtprobe $(PREFIX)/usr/X11R6/bin - #install -m755 ivyglibprobe $(PREFIX)/usr/bin + #install -m755 ivyglibprobe $(INSTALL_BINDIR) #install -m755 ivyglutprobe $(PREFIX)/usr/X11R6/bin installdocs: -- cgit v1.1 From e39e89e48f8d6afd91566ac5e039e99545045a86 Mon Sep 17 00:00:00 2001 From: fourdan Date: Thu, 18 May 2006 11:18:01 +0000 Subject: Rework the Makefile for cleaner installation, redo the debian packaging administration files for better lib/dev files splitting, move the Ivy header files to a new Ivy/ subdir to avoid conflicts with other existing system headers (beware, that *will* break existing code that needs to look in the the new path for headers inclusion) --- src/Makefile | 125 +++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 69 insertions(+), 56 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index c44eafa..3b1a796 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,11 +4,11 @@ # Copyright (C) 1997-2002 # Centre d'Études de la Navigation Aérienne # -# Makefile +# Makefile # # Authors: François-Régis Colin -# Stéphane Chatty -# Yannick Jestin +# Stéphane Chatty +# Yannick Jestin # # Please refer to file version.h for the # copyright notice regarding this software @@ -20,18 +20,18 @@ MAJOR=3 MINOR=8 PERHAPS64 := $(shell uname -m | perl -ne "print /64/ ? '64' : '';") -LIB = lib$(PERHAPS64) +LIB = /lib$(PERHAPS64) ifeq ($(PERHAPS64), "64") FPIC= else FPIC=-fPIC endif -INSTALL_BINDIR=$(PREFIX)/usr/local/bin -INSTALL_LIBDIR=$(PREFIX)/usr/local/$(LIB) +PREFIX = /usr +X11_PREFIX = /usr/X11R6 -XTINC = -I/usr/X11R6/include -XTLIB = -L/usr/X11R6/$(LIB) -lXt -lX11 -lSM -lICE +XTINC = -I$(X11_PREFIX)/include +XTLIB = -L$(X11_PREFIX)$(LIB) -lXt -lX11 -lSM -lICE GLIBINC = `pkg-config --cflags glib-2.0` GLIBLIB = `pkg-config --libs glib-2.0` GLUTINC = -I/usr/include -I. @@ -47,12 +47,12 @@ ifndef TCLVERS TCLVERS=8.3 endif -TCLINCL = -I/usr/include/tcl$(TCLVERS) +TCLINCL = -I/usr/include/tcl$(TCLVERS) TCLLIB = -ltcl$(TCLVERS) #TCLINCL = -I/usr/include/tcl8.4 #TCLLIB = -ltcl8.4 # use these if you want to use Aqua Tcl on macOSX -#TCLINC = -I/Library/Frameworks/Tcl.framework/Headers +#TCLINC = -I/Library/Frameworks/Tcl.framework/Headers #TCLLIB = -framework Tcl PCREINC = `pcre-config --cflags` PCRELIB = `pcre-config --libs` @@ -75,7 +75,7 @@ CC=gcc LIBTOOL=ar q # linux and solaris #LIBTOOL=libtool -static -o -#REGEXP = -DGNU_REGEXP -DREGCOMP_OPT=$(REGCOMP_OPT) # deprecated ! +#REGEXP = -DGNU_REGEXP -DREGCOMP_OPT=$(REGCOMP_OPT) # deprecated ! REGEXP= -DUSE_PCRE_REGEX -DPCRE_OPT=$(PCRE_OPT) # on activeTCL , set #define CHANNEL to null, and add ivyloop.o in the ivytcl target, # see below @@ -210,57 +210,70 @@ clean: -rm -f $(TARGETS) $(TARGETLIBS) *.o *.a *.so *.so.* *~ installlibs: static-libs shared-libs - test -d $(INSTALL_LIBDIR) || mkdirhier $(INSTALL_LIBDIR) - test -d $(PREFIX)/usr/X11R6/$(LIB) || mkdirhier $(PREFIX)/usr/X11R6/$(LIB) - test -d $(PREFIX)/usr/local/include || mkdirhier $(PREFIX)/usr/local/include - install -m644 libivy.a $(INSTALL_LIBDIR) - install -m644 libgivy.a $(INSTALL_LIBDIR) - install -m644 libxtivy.a $(PREFIX)/usr/X11R6/$(LIB) - install -m644 libtclivy.a $(INSTALL_LIBDIR) - install -m644 libglibivy.a $(INSTALL_LIBDIR) - - install -m644 libivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR) - install -m644 libgivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR) - install -m644 libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/$(LIB) - install -m644 libtclivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR) - install -m644 libglibivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR) - - install -m644 *.h $(PREFIX)/usr/local/include + test -d $(DESTDIR)$(PREFIX)$(LIB) || mkdirhier $(DESTDIR)$(PREFIX)$(LIB) + test -d $(DESTDIR)$(X11_PREFIX)$(LIB) || mkdirhier $(DESTDIR)$(X11_PREFIX)$(LIB) + + install -m644 libivy.a $(DESTDIR)$(PREFIX)$(LIB) + install -m644 libgivy.a $(DESTDIR)$(PREFIX)$(LIB) + install -m644 libxtivy.a $(DESTDIR)$(X11_PREFIX)$(LIB) + install -m644 libtclivy.a $(DESTDIR)$(PREFIX)$(LIB) + install -m644 libglibivy.a $(DESTDIR)$(PREFIX)$(LIB) + + install -m644 libivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB) + install -m644 libgivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB) + install -m644 libxtivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(X11_PREFIX)$(LIB) + install -m644 libtclivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB) + install -m644 libglibivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB) + + test -d $(DESTDIR)$(PREFIX)/include/Ivy || mkdirhier $(DESTDIR)$(PREFIX)/include/Ivy + install -m644 ivy.h $(DESTDIR)$(PREFIX)/include/Ivy/ + install -m644 ivybind.h $(DESTDIR)$(PREFIX)/include/Ivy/ + install -m644 ivybuffer.h $(DESTDIR)$(PREFIX)/include/Ivy/ + install -m644 ivychannel.h $(DESTDIR)$(PREFIX)/include/Ivy/ + install -m644 ivydebug.h $(DESTDIR)$(PREFIX)/include/Ivy/ + install -m644 ivyglibloop.h $(DESTDIR)$(PREFIX)/include/Ivy/ + install -m644 ivyglutloop.h* $(DESTDIR)$(PREFIX)/include/Ivy/ + install -m644 ivyloop.h $(DESTDIR)$(PREFIX)/include/Ivy/ + install -m644 ivysocket.h $(DESTDIR)$(PREFIX)/include/Ivy/ + install -m644 ivytcl.h* $(DESTDIR)$(PREFIX)/include/Ivy/ + install -m644 ivyxtloop.h $(DESTDIR)$(PREFIX)/include/Ivy/ + install -m644 list.h $(DESTDIR)$(PREFIX)/include/Ivy/ + install -m644 timer.h $(DESTDIR)$(PREFIX)/include/Ivy/ + install -m644 version.h $(DESTDIR)$(PREFIX)/include/Ivy/ installliblinks: installlibs - ln -fs $(INSTALL_LIBDIR)/libivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libivy.so - ln -fs $(INSTALL_LIBDIR)/libivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libivy.so.$(MAJOR) - ln -fs $(INSTALL_LIBDIR)/libgivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libgivy.so - ln -fs $(INSTALL_LIBDIR)/libgivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libgivy.so.$(MAJOR) - ln -fs /usr/X11R6/$(LIB)/libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/$(LIB)/libxtivy.so - ln -fs /usr/X11R6/$(LIB)/libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/$(LIB)/libxtivy.so.$(MAJOR) - ln -fs $(INSTALL_LIBDIR)/libtclivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libtclivy.so - ln -fs $(INSTALL_LIBDIR)/libtclivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libtclivy.so.$(MAJOR) + ln -fs $(PREFIX)$(LIB)/libivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB)/libivy.so + ln -fs $(PREFIX)$(LIB)/libivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB)/libivy.so.$(MAJOR) + ln -fs $(PREFIX)$(LIB)/libgivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB)/libgivy.so + ln -fs $(PREFIX)$(LIB)/libgivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB)/libgivy.so.$(MAJOR) + ln -fs $(X11_PREFIX)$(LIB)/libxtivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(X11_PREFIX)$(LIB)/libxtivy.so + ln -fs $(X11_PREFIX)$(LIB)/libxtivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(X11_PREFIX)$(LIB)/libxtivy.so.$(MAJOR) + ln -fs $(PREFIX)$(LIB)/libtclivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB)/libtclivy.so + ln -fs $(PREFIX)$(LIB)/libtclivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB)/libtclivy.so.$(MAJOR) installbins: commands - test -d $(INSTALL_BINDIR) || mkdirhier $(INSTALL_BINDIR) - test -d $(PREFIX)/usr/X11R6/bin || mkdirhier $(PREFIX)/usr/X11R6/bin - install -m755 ivyprobe $(INSTALL_BINDIR) - #install -m755 ivyxtprobe $(PREFIX)/usr/X11R6/bin - #install -m755 ivyglibprobe $(INSTALL_BINDIR) - #install -m755 ivyglutprobe $(PREFIX)/usr/X11R6/bin + test -d $(DESTDIR)$(PREFIX)/bin || mkdirhier $(DESTDIR)$(PREFIX)/bin + install -m755 ivyprobe $(DESTDIR)$(PREFIX)/bin + #install -m755 ivyxtprobe $(DESTDIR)$(PREFIX)/bin + #install -m755 ivyglibprobe $(DESTDIR)$(PREFIX)/bin + #install -m755 ivyglutprobe $(DESTDIR)$(PREFIX)/bin installdocs: - test -d $(PREFIX)/usr/share/doc/ivy-c || mkdirhier $(PREFIX)/usr/share/doc/ivy-c - for f in `find ../doc/*.html -type f -maxdepth 1`; do \ - install -m 644 $$f $(PREFIX)/usr/share/doc/ivy-c; \ - done - test -d $(PREFIX)/usr/man/man1 || mkdirhier $(PREFIX)/usr/man/man1 - for f in `find ../doc/*.1 -type f -maxdepth 1`; do \ - install -m 644 $$f $(PREFIX)/usr/man/man1; \ - done - test -d $(PREFIX)/usr/share/doc/ivy-c/examples || mkdirhier $(PREFIX)/usr/share/doc/ivy-c/examples - install -m 644 version.h $(PREFIX)/usr/share/doc/ivy-c/copyright - install -m 644 ../examples/motifButtonIvy.c $(PREFIX)/usr/share/doc/ivy-c/examples - install -m 644 ../examples/testUnbind.c $(PREFIX)/usr/share/doc/ivy-c/examples - install -m 766 ../examples/Test.tcl $(PREFIX)/usr/share/doc/ivy-c/examples - install -m 766 ../examples/button.tk $(PREFIX)/usr/share/doc/ivy-c/examples - install -m 766 ../examples/unBind.tcl $(PREFIX)/usr/share/doc/ivy-c/examples + test -d $(DESTDIR)$(PREFIX)/share/doc/ivy-c || mkdirhier $(DESTDIR)$(PREFIX)/share/doc/ivy-c + for f in `find ../doc/*.html -type f -maxdepth 1`; do \ + install -m 644 $$f $(DESTDIR)$(PREFIX)/share/doc/ivy-c; \ + done + test -d $(DESTDIR)$(PREFIX)/man/man1 || mkdirhier $(DESTDIR)$(PREFIX)/man/man1 + for f in `find ../doc/*.1 -type f -maxdepth 1`; do \ + install -m 644 $$f $(DESTDIR)$(PREFIX)/man/man1; \ + done + test -d $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples || mkdirhier $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples + install -m 644 version.h $(DESTDIR)$(PREFIX)/share/doc/ivy-c/copyright + install -m 644 ../examples/motifButtonIvy.c $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples + install -m 644 ../examples/testUnbind.c $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples + install -m 766 ../examples/Test.tcl $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples + install -m 766 ../examples/button.tk $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples + install -m 766 ../examples/unBind.tcl $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples install: installlibs installbins installliblinks installdocs -- cgit v1.1 From 7ba87263b60bbbc2f8f45215bdb3bcfa3ae20594 Mon Sep 17 00:00:00 2001 From: bustico Date: Thu, 1 Jun 2006 12:07:17 +0000 Subject: fix bug de filtrage --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 3b1a796..1a918f5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -27,7 +27,7 @@ else FPIC=-fPIC endif -PREFIX = /usr +PREFIX = /usr/local X11_PREFIX = /usr/X11R6 XTINC = -I$(X11_PREFIX)/include -- cgit v1.1 From 1f3c03814fc2939a234232229a7127cdc706c470 Mon Sep 17 00:00:00 2001 From: fourdan Date: Fri, 2 Jun 2006 07:41:56 +0000 Subject: Fix proper installation PATH, set PREFIX if not set. --- src/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 1a918f5..753f647 100644 --- a/src/Makefile +++ b/src/Makefile @@ -27,7 +27,10 @@ else FPIC=-fPIC endif -PREFIX = /usr/local +ifndef PREFIX + PREFIX=/usr/local +endif + X11_PREFIX = /usr/X11R6 XTINC = -I$(X11_PREFIX)/include @@ -225,6 +228,7 @@ installlibs: static-libs shared-libs install -m644 libtclivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB) install -m644 libglibivy.so.$(MAJOR).$(MINOR) $(DESTDIR)$(PREFIX)$(LIB) +includes: test -d $(DESTDIR)$(PREFIX)/include/Ivy || mkdirhier $(DESTDIR)$(PREFIX)/include/Ivy install -m644 ivy.h $(DESTDIR)$(PREFIX)/include/Ivy/ install -m644 ivybind.h $(DESTDIR)$(PREFIX)/include/Ivy/ @@ -275,7 +279,7 @@ installdocs: install -m 766 ../examples/button.tk $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples install -m 766 ../examples/unBind.tcl $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples -install: installlibs installbins installliblinks installdocs +install: installlibs installbins installliblinks installdocs includes rpm:: /usr/bin/rpmize -- cgit v1.1 From 67df43b17ea79da1cf761dce8a449e89e9dc3269 Mon Sep 17 00:00:00 2001 From: fourdan Date: Tue, 4 Jul 2006 14:35:08 +0000 Subject: Passage en version 3.9, mise a jour paquets Debian. --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 753f647..150ac41 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,7 +17,7 @@ # change this in version.h too !!!! MAJOR=3 -MINOR=8 +MINOR=9 PERHAPS64 := $(shell uname -m | perl -ne "print /64/ ? '64' : '';") LIB = /lib$(PERHAPS64) -- cgit v1.1 From 0efdf8c11e50d6aed89ed72760a72e68b701bf9d Mon Sep 17 00:00:00 2001 From: bustico Date: Wed, 20 Sep 2006 09:28:59 +0000 Subject: Ajout de la fonctionnalité pour capter des intervalles numériques de la forme A=((?I10#20)) l'api ne change pas. --- src/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 150ac41..f581609 100644 --- a/src/Makefile +++ b/src/Makefile @@ -86,12 +86,12 @@ CHANNEL = -DTCL_CHANNEL_INTEGRATION CFLAGS = -g -Wall $(FPIC) -OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o ivybind.o -GOBJ = ivyloop.o timer.o ivysocket.o givy.o ivybuffer.o ivybind.o -XTOBJ = ivyxtloop.o ivysocket.o ivy.o ivybuffer.o ivybind.o -GLIBOBJ = ivyglibloop.o ivysocket.o ivy.o ivybuffer.o ivybind.o -GLUTOBJ = ivyglutloop.o ivysocket.o ivy.o ivybuffer.o ivybind.o -TCLOBJ = ivytcl.o timer.o ivysocket.o givy.o ivybuffer.o ivybind.o +OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o ivybind.o intervalRegexp.o +GOBJ = ivyloop.o timer.o ivysocket.o givy.o ivybuffer.o ivybind.o intervalRegexp.o +XTOBJ = ivyxtloop.o ivysocket.o ivy.o ivybuffer.o ivybind.o intervalRegexp.o +GLIBOBJ = ivyglibloop.o ivysocket.o ivy.o ivybuffer.o ivybind.o intervalRegexp.o +GLUTOBJ = ivyglutloop.o ivysocket.o ivy.o ivybuffer.o ivybind.o intervalRegexp.o +TCLOBJ = ivytcl.o timer.o ivysocket.o givy.o ivybuffer.o ivybind.o intervalRegexp.o # WINDOWS add ivyloop.o if TCL_CHANNEL_INTEGRATION is not set TARGETS = ivyprobe ivyperf ivyglibprobe ivyxtprobe -- cgit v1.1 From f70181ffe0b37952384ff5e0ce0185541828014f Mon Sep 17 00:00:00 2001 From: fourdan Date: Fri, 12 Jan 2007 13:36:35 +0000 Subject: Update package for Debian Etch --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index f581609..26789d0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -31,7 +31,7 @@ ifndef PREFIX PREFIX=/usr/local endif -X11_PREFIX = /usr/X11R6 +X11_PREFIX = /usr XTINC = -I$(X11_PREFIX)/include XTLIB = -L$(X11_PREFIX)$(LIB) -lXt -lX11 -lSM -lICE -- cgit v1.1