diff -u -r ../main.orig/gfx/lib/glu/GNUmakefile ./gfx/lib/glu/GNUmakefile --- ../main.orig/gfx/lib/glu/GNUmakefile Mon Feb 7 18:36:41 2000 +++ ./gfx/lib/glu/GNUmakefile Mon Feb 7 18:36:54 2000 @@ -46,7 +46,7 @@ LLDLIBS = -lGL -lm ifeq ($(OS),Linux) # There should be a cleaner, version-independent way to do this -LLDLIBS += -L/usr/lib/gcc-lib/i386-redhat-linux/egcs-2.91.66 -lstdc++ +LLDLIBS += -L/usr/lib/gcc-lib/i386-suse-linux/2.95.2 -lstdc++ else LLDLIBS += -lc -lC endif diff -u -r ../main.orig/gfx/lib/glu/libnurbs/nurbtess/monoChain.cc ./gfx/lib/glu/libnurbs/nurbtess/monoChain.cc --- ../main.orig/gfx/lib/glu/libnurbs/nurbtess/monoChain.cc Mon Feb 7 18:36:41 2000 +++ ./gfx/lib/glu/libnurbs/nurbtess/monoChain.cc Mon Feb 7 18:36:54 2000 @@ -82,7 +82,7 @@ } //compare the heads of the two chains -static compChainHeadInY(monoChain* mc1, monoChain* mc2) +static Int compChainHeadInY(monoChain* mc1, monoChain* mc2) { return compV2InY(mc1->getHead()->head(), mc2->getHead()->head()); } diff -u -r ../main.orig/gfx/lib/opengl/GNUmakefile ./gfx/lib/opengl/GNUmakefile --- ../main.orig/gfx/lib/opengl/GNUmakefile Mon Feb 7 18:36:41 2000 +++ ./gfx/lib/opengl/GNUmakefile Mon Feb 7 18:36:54 2000 @@ -58,7 +58,7 @@ drivers/$(GLPRODUCT)/GNUmakefile \ $(NULL) -ECHO = /bin/echo +ECHO = /bin/echo -e ifeq ($(GLOS),"NONE") DIRS += $(GLOS) diff -u -r ../main.orig/gfx/samples/extensions/GNUmakefile ./gfx/samples/extensions/GNUmakefile --- ../main.orig/gfx/samples/extensions/GNUmakefile Mon Feb 7 18:36:42 2000 +++ ./gfx/samples/extensions/GNUmakefile Mon Feb 7 18:37:58 2000 @@ -50,7 +50,7 @@ varray.c \ $(NULL) -LLDLIBS = -lrgb -lglfont -lglut -lGLU -lGL -lXmu -lXt -lXext -lX11 -lm +LLDLIBS = -lrgb -lglfont -lglut -lGLU -lGL -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lm TARGETS = $(subst .c,,$(CFILES)) diff -u -r ../main.orig/gfx/samples/glx/GNUmakefile ./gfx/samples/glx/GNUmakefile --- ../main.orig/gfx/samples/glx/GNUmakefile Mon Feb 7 18:36:42 2000 +++ ./gfx/samples/glx/GNUmakefile Mon Feb 7 18:38:27 2000 @@ -45,7 +45,7 @@ tex3d.c \ $(NULL) -LLDLIBS = -lGLU -lGL -lXmu -lXext -lX11 -lm +LLDLIBS = -lGLU -lGL -L/usr/X11R6/lib -lXmu -lXext -lX11 -lm TARGETS = $(subst .c,,$(CFILES)) diff -u -r ../main.orig/gfx/samples/redbook_2ed/GNUmakefile ./gfx/samples/redbook_2ed/GNUmakefile --- ../main.orig/gfx/samples/redbook_2ed/GNUmakefile Mon Feb 7 18:36:42 2000 +++ ./gfx/samples/redbook_2ed/GNUmakefile Mon Feb 7 18:39:02 2000 @@ -96,7 +96,7 @@ wrap.c \ $(NULL) -LLDLIBS = -lglut -lGLU -lGL -lXmu -lXt -lXext -lX11 -lm +LLDLIBS = -lglut -lGLU -lGL -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lm TARGETS = $(subst .c,,$(CFILES)) diff -u -r ../main.orig/gfx/samples/samples/GNUmakefile ./gfx/samples/samples/GNUmakefile --- ../main.orig/gfx/samples/samples/GNUmakefile Mon Feb 7 18:36:42 2000 +++ ./gfx/samples/samples/GNUmakefile Mon Feb 7 18:39:19 2000 @@ -40,7 +40,7 @@ wave.c \ $(NULL) -LLDLIBS = -lrgb -lglut -lGLU -lGL -lXmu -lXt -lXext -lX11 -lm +LLDLIBS = -lrgb -lglut -lGLU -lGL -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lm TARGETS = $(subst .c,,$(CFILES)) diff -u -r ../main.orig/gfx/samples/xglinfo/GNUmakefile ./gfx/samples/xglinfo/GNUmakefile --- ../main.orig/gfx/samples/xglinfo/GNUmakefile Mon Feb 7 18:36:42 2000 +++ ./gfx/samples/xglinfo/GNUmakefile Mon Feb 7 18:39:55 2000 @@ -42,7 +42,7 @@ xglinfo.c \ $(NULL) -LLDLIBS = -lGLU -lGL -lXext -lXt -lX11 -lm +LLDLIBS = -lGLU -lGL -L/usr/X11R6/lib -lXext -lXt -lX11 -lm TARGETS = xglinfo