diff options
| -rw-r--r-- | src/Makefile.mingw | 36 | ||||
| -rw-r--r-- | src/Makefile.win32 | 21 | ||||
| -rw-r--r-- | tools/Makefile.mingw | 59 | ||||
| -rw-r--r-- | tools/Makefile.win32 | 54 |
4 files changed, 141 insertions, 29 deletions
diff --git a/src/Makefile.mingw b/src/Makefile.mingw index 3bac78f..6dd2168 100644 --- a/src/Makefile.mingw +++ b/src/Makefile.mingw @@ -17,7 +17,7 @@ MAJOR=3 -MINOR=9 +MINOR=11 RM=del #RM=rm -f XTINC = @@ -29,23 +29,24 @@ GLUTLIB = -L. TCLINCL = -I/usr/include/tcl8.4 TCLLIB = -ltcl84 +TOOLS_DIR = ../tools CC=gcc CFLAGS = -g # IVY full debug #CFLAGS = -g -DDEBUG -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 -GTKOBJ = ivygtkloop.o ivysocket.o ivy.o -GLUTOBJ = ivyglutloop.o ivysocket.o ivy.o -TCLOBJ = ivytcl.o ivyloop.o timer.o ivysocket.o givy.o -TARGETS = ivyprobe +OBJ = ivyloop.o timer.o ivysocket.o ivy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o +GOBJ = ivyloop.o timer.o ivysocket.o givy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o +XTOBJ = ivyxtloop.o ivysocket.o ivy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o +GLIBOBJ = ivyglibloop.o ivysocket.o ivy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o +GLUTOBJ = ivyglutloop.o ivysocket.o ivy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o +TCLOBJ = ivytcl.o timer.o ivysocket.o givy.o ivybuffer.o ivyfifo.o ivybind.o intervalRegexp.o + # not yiet ivygtkprobe ivyxtprobe need Modified Glut ivyglutprobe .c.o: $(CC) $(CFLAGS) -c $*.c -all: static-libs commands shared-libs +all: static-libs shared-libs static-libs: libivy.a libgivy.a libtclivy.a # not yiet libxtivy.a libgtkivy.a need Modified Glut libglutivy.a @@ -53,8 +54,6 @@ static-libs: libivy.a libgivy.a libtclivy.a shared-libs: libivy.so.$(MAJOR).$(MINOR) libgivy.so.$(MAJOR).$(MINOR) libtclivy.so.$(MAJOR).$(MINOR) # not yiet libxtivy.so.$(MAJOR).$(MINOR) libgtkivy.so.$(MAJOR).$(MINOR) need Modified Glut libglutivy.so.$(MAJOR).$(MINOR) -commands: $(TARGETS) - ivytcl.o: ivytcl.c $(CC) -DGNU_REGEXP -c $(CFLAGS) $(TCLINCL) -o ivytcl.o ivytcl.c @@ -135,7 +134,8 @@ libtclivy.so.$(MAJOR).$(MINOR): $(TCLOBJ) $(TCLOBJ) $(TCLLIB) -lwsock32 -lregex clean: - -$(RM) $(TARGETS) *.o *.a *.so *.so.* *~ + -$(RM) *.o *.a *.so *.so.* *~ + @(cd $(TOOLS_DIR) && $(MAKE) -f Makefile.mingw clean) installlibs: static-libs shared-libs test -d $(PREFIX)/usr/lib || mkdirhier $(PREFIX)/usr/lib @@ -168,13 +168,9 @@ installliblinks: installlibs ln -s /usr/X11R6/lib/libtclivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/lib/libtclivy.so ln -s /usr/X11R6/lib/libtclivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/lib/libtclivy.so.$(MAJOR) -installbins: commands - test -d $(PREFIX)/usr/bin || mkdirhier $(PREFIX)/usr/bin - test -d $(PREFIX)/usr/X11R6/bin || mkdirhier $(PREFIX)/usr/X11R6/bin - install -m755 ivyprobe $(PREFIX)/usr/bin - install -m755 ivyxtprobe $(PREFIX)/usr/X11R6/bin - install -m755 ivygtkprobe $(PREFIX)/usr/X11R6/bin -# install -m755 ivyglutprobe $(PREFIX)/usr/X11R6/bin + +installbins: + @(cd $(TOOLS_DIR) && $(MAKE) -f Makefile.mingw install) installdocs: test -d $(PREFIX)/usr/doc/ivy-c || mkdirhier $(PREFIX)/usr/doc/ivy-c @@ -187,6 +183,8 @@ installdocs: done install: installlibs installbins installliblinks installdocs +tools: static-libs libomp + @(cd $(TOOLS_DIR) && $(MAKE) -f Makefile.mingw) rpm:: /usr/bin/rpmize diff --git a/src/Makefile.win32 b/src/Makefile.win32 index 8bcdb97..73f9fca 100644 --- a/src/Makefile.win32 +++ b/src/Makefile.win32 @@ -17,7 +17,7 @@ # change this in version.h too !!!! MAJOR=3 -MINOR=9 +MINOR=11 PCREINC = -I "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4\\" PCRELIB = Debug\pcre.lib @@ -41,6 +41,7 @@ CFLAGS = /W3 /DWIN32 /D_CRT_SECURE_NO_DEPRECATE /nologo #LIBTOOL=ar q # linux and solaris #LIBTOOL=libtool -static -o LIBTOOL=lib /nologo /out: +TOOLS_DIR = ../tools #REGEXP = -DGNU_REGEXP -DREGCOMP_OPT=$(REGCOMP_OPT) # deprecated ! REGEXP= /DUSE_PCRE_REGEX /DPCRE_OPT=$(PCRE_OPT) @@ -48,23 +49,21 @@ REGEXP= /DUSE_PCRE_REGEX /DPCRE_OPT=$(PCRE_OPT) # see below CHANNEL = -DTCL_CHANNEL_INTEGRATION -OBJ = intervalRegexp.obj ivyloop.obj timer.obj ivysocket.obj ivy.obj ivybuffer.obj ivybind.obj getopt.obj +OBJ = intervalRegexp.obj ivyloop.obj timer.obj ivysocket.obj ivy.obj \ + ivybuffer.obj ivyfifo.obj ivybind.obj getopt.obj # WINDOWS add ivyloop.obj if TCL_CHANNEL_INTEGRATION is not set -TARGETS = ivyprobe.exe ivyperf.exe TARGETLIBS=libivy.dll .c.obj: $(CC) $(CFLAGS) /c $*.c -all: static-libs commands shared-libs +all: static-libs shared-libs tools static-libs: libivy.lib shared-libs: $(TARGETLIBS) -commands: $(TARGETS) - ivybind.obj: ivybind.c $(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivybind.c @@ -74,7 +73,7 @@ ivyprobe.exe: ivyprobe.obj libivy.lib ivyprobe.obj : ivyprobe.c $(CC) $(CFLAGS) $(REGEXP) $(PCREINC) /c ivyprobe.c - + ivyperf.exe: ivyperf.obj libivy.lib $(CC) $(CFLAGS) /Fe$@ ivyperf.obj libivy.lib wsock32.lib $(PCRELIB) @@ -86,8 +85,10 @@ libivy.lib: $(OBJ) libivy.dll: $(OBJ) $(CC) /dll /out: $@ $(OBJ) $(PCRELIB) -clean: - -del /f $(TARGETS) $(TARGETLIBS) *.obj *.lib *.dll *~ - +tools: static-libs + @(cd $(TOOLS_DIR) && $(MAKE) -f Makefile.win32) +clean: + -del /f $(TARGETLIBS) *.obj *.lib *.dll *~ + @(cd $(TOOLS_DIR) && $(MAKE) -f Makefile.win32 clean) diff --git a/tools/Makefile.mingw b/tools/Makefile.mingw new file mode 100644 index 0000000..8fd66a7 --- /dev/null +++ b/tools/Makefile.mingw @@ -0,0 +1,59 @@ +# +# Ivy, C interface +# +# Copyright (C) 1997-2002 +# Centre d'Études de la Navigation Aérienne +# +# Makefile +# +# Authors: François-Régis Colin <fcolin@cena.fr> +# Stéphane Chatty <chatty@cena.fr> +# +# $Id: Makefile.mingw 3061 2007-02-13 08:35:08Z fourdan $ +# +# Please refer to file version.h for the +# copyright notice regarding this software +# + + +RM=del +#RM=rm -f +XTINC = +XTLIB = +GTKINC = `gtk-config --cflags` +GTKLIB = `gtk-config --libs` +GLUTINC = -I/usr/include -I. +GLUTLIB = -L. +TCLINCL = -I/usr/include/tcl8.4 +TCLLIB = -ltcl84 +EXTRALIB= -L../src +EXTRAINC=-I../src + + +CC=gcc +CFLAGS = -g +# IVY full debug +#CFLAGS = -g -DDEBUG +TARGETS = ivyprobe +# not yiet ivygtkprobe ivyxtprobe need Modified Glut ivyglutprobe + +.c.o: + $(CC) $(CFLAGS) $(EXTRAINC) -c $*.c + +all: $(TARGETS) + +ivyprobe: ivyprobe.o ../src/libivy.a + (CC) $(CFLAGS) $(EXTRAINC) -o $@ ivyprobe.o -L. -livy $(PCRELIB) $(EXTRALIB) + +clean: + -$(RM) $(TARGETS) *.o *.a *.so *.so.* *~ + +install: installbins + +installbins: commands + test -d $(PREFIX)/usr/bin || mkdirhier $(PREFIX)/usr/bin + test -d $(PREFIX)/usr/X11R6/bin || mkdirhier $(PREFIX)/usr/X11R6/bin + install -m755 ivyprobe $(PREFIX)/usr/bin +# install -m755 ivyglutprobe $(PREFIX)/usr/X11R6/bin + + diff --git a/tools/Makefile.win32 b/tools/Makefile.win32 new file mode 100644 index 0000000..d1df4f7 --- /dev/null +++ b/tools/Makefile.win32 @@ -0,0 +1,54 @@ +PCREINC = -I "C:\Documents and Settings\fcolin\My Documents\Visual Studio 2005\Projects\pcre-6.4\\" +PCRELIB = Debug\pcre.lib +EXTRALIB= -L../src +EXTRAINC=-I../src + +#PCREINC = -I "C:\Program Files\GnuWin32\include" #`pcre-config --cflags` +#PCRELIB = "C:\Program Files\GnuWin32\lib\libpcre.lib" #`pcre-config --libs` + +PCRE_OPT = PCRE_CASELESS +REGCOMP_OPT = REG_ICASE + +# PCRE_OPT = 0 +# REGCOMP_OPT = REG_EXTENDED + + +#PCREOBJ = `pcre-config --prefix`/lib/libpcre.a +PCREOBJ = + +#CC=gcc +#CFLAGS = -g -Wall +CFLAGS = /W3 /DWIN32 /D_CRT_SECURE_NO_DEPRECATE /nologo +#LIBTOOL=ar q # linux and solaris +#LIBTOOL=libtool -static -o +LIBTOOL=lib /nologo /out: + +#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.obj in the ivytcl target, +# see below +CHANNEL = -DTCL_CHANNEL_INTEGRATION + +# WINDOWS add ivyloop.obj if TCL_CHANNEL_INTEGRATION is not set +TARGETS = ivyprobe.exe ivyperf.exe + +.c.obj: + $(CC) $(CFLAGS) /c $*.c + +all: commands + +commands: $(TARGETS) + +ivyprobe.exe: ivyprobe.obj libivy.lib + $(CC) $(CFLAGS) $(EXTRAINC) /Fe$@ ivyprobe.obj libivy.lib wsock32.lib $(PCRELIB) $(EXTRALIB) + +ivyprobe.obj : ivyprobe.c + $(CC) $(CFLAGS) $(REGEXP) $(PCREINC) $(EXTRAINC) /c ivyprobe.c + +ivyperf.exe: ivyperf.obj libivy.lib + $(CC) $(CFLAGS) /Fe$@ ivyperf.obj libivy.lib wsock32.lib $(PCRELIB) $(EXTRALIB) + + +clean: + -del /f $(TARGETS) *.obj *.lib *.dll *~ + |