From a0d67f8bfdad7bea3ddf508cbbce9b806544b99c Mon Sep 17 00:00:00 2001 From: chatty Date: Tue, 25 Jun 2002 10:14:02 +0000 Subject: Modified Makefile to allow for compatibity between install patterns of Tcl In ivy.c, restored DEFAULT_DOMAIN to original value (not a string) --- src/Makefile | 9 ++++----- src/ivy.c | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 5d3dded..96a5cb8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,7 +17,7 @@ MAJOR=3 -MINOR=2 +MINOR=4 XTINC = -I/usr/X11R6/include XTLIB = -L/usr/X11R6/lib @@ -27,9 +27,8 @@ GTKLIB = `gtk-config --libs` #GTKLIB = -L/usr/lib -L/usr/X11R6/lib GLUTINC = -I/usr/include -I. GLUTLIB = -L. -TCLVERSION = 8.2 -TCLINC = -I/usr/include/tcl$(TCLVERSION) - +TCLINC = -I/usr/include/ +TCLLIB = -ltcl CC=gcc CFLAGS = -g @@ -132,7 +131,7 @@ libglutivy.so.$(MAJOR).$(MINOR): $(GTKOBJ) libtclivy.so.$(MAJOR).$(MINOR): $(TCLOBJ) $(CC) -shared -Wl,-soname,libtclivy.so.$(MAJOR) -o $@ \ - $(TCLOBJ) $(TCLLIB) -ltcl$(TCLVERSION) -lc + $(TCLOBJ) $(TCLLIB) -lc clean: -rm -f $(TARGETS) *.o *.a *.so *.so.* *~ diff --git a/src/ivy.c b/src/ivy.c index a9510dc..870e6fc 100644 --- a/src/ivy.c +++ b/src/ivy.c @@ -39,7 +39,7 @@ #define ARG_START "\002" #define ARG_END "\003" -#define DEFAULT_DOMAIN "127.255.255.255" +#define DEFAULT_DOMAIN 127.255.255.255 /* stringification et concatenation du domaine et du port en 2 temps : * Obligatoire puisque la substitution de domain, et de bus n'est pas -- cgit v1.1