Index: progs/demos/Makefile
diff -Nau progs/demos/Makefile.orig progs/demos/Makefile
--- progs/demos/Makefile.orig	2005-05-19 17:41:06.000000000 +0200
+++ progs/demos/Makefile	2006-04-01 13:06:52.000000000 +0200
@@ -5,11 +5,11 @@
 
 INCDIR = $(TOP)/include
 
-OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
+OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(GLUT_LIB_DEPS)
 
-OSMESA16_LIBS = -L$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS)
+OSMESA16_LIBS = -L$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(GLUT_LIB_DEPS)
 
-OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
+OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(GLUT_LIB_DEPS)
 
 LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME)
 
@@ -71,7 +71,7 @@
 
 # make executable from .c file:
 .c: $(LIB_DEP) readtex.o
-	$(CC) -I$(INCDIR) $(CFLAGS) $< readtex.o $(APP_LIB_DEPS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< readtex.o -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 
 ##### TARGETS #####
@@ -101,14 +101,14 @@
 
 
 reflect: reflect.o showbuffer.o readtex.o
-	$(CC) -I$(INCDIR) $(CFLAGS) reflect.o showbuffer.o readtex.o $(APP_LIB_DEPS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) reflect.o showbuffer.o readtex.o $(OSMESA_LIBS) -o $@
 
 reflect.o: reflect.c showbuffer.h
 	$(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
 
 
 shadowtex: shadowtex.o showbuffer.o
-	$(CC) -I$(INCDIR) $(CFLAGS) shadowtex.o showbuffer.o $(APP_LIB_DEPS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) shadowtex.o showbuffer.o $(OSMESA_LIBS) -o $@
 
 shadowtex.o: shadowtex.c showbuffer.h
 	$(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
Index: progs/redbook/Makefile
diff -Nau progs/redbook/Makefile.orig progs/redbook/Makefile
--- progs/redbook/Makefile.orig	2005-03-23 20:36:22 +0100
+++ progs/redbook/Makefile	2005-03-23 20:36:29 +0100
@@ -24,7 +24,7 @@
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
+	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 
 
Index: progs/samples/Makefile
diff -Nau progs/samples/Makefile.orig progs/samples/Makefile
--- progs/samples/Makefile.orig	2004-08-25 16:51:18 +0200
+++ progs/samples/Makefile	2005-03-23 21:21:16 +0100
@@ -18,16 +18,18 @@
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 
 ##### TARGETS #####
 
 default: $(PROGS)
 
+nurb: nurb.c
+	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 sphere: sphere.o readtex.o
-	$(CC) -I$(INCDIR) $(CFLAGS) sphere.o readtex.o $(APP_LIB_DEPS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) sphere.o readtex.o -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 sphere.o: sphere.c readtex.h
 	$(CC) -c -I$(INCDIR) $(CFLAGS) sphere.c
Index: progs/xdemos/Makefile
diff -Nau progs/xdemos/Makefile.orig progs/xdemos/Makefile
--- progs/xdemos/Makefile.orig	2005-11-10 17:35:07.000000000 +0100
+++ progs/xdemos/Makefile	2006-04-01 13:11:51.000000000 +0200
@@ -37,7 +37,7 @@
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 
 ##### TARGETS #####
@@ -52,10 +52,10 @@
 
 # special cases
 pbinfo: pbinfo.o pbutil.o
-	$(CC) $(CFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
+	$(CC) $(CFLAGS) pbinfo.o pbutil.o -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 pbdemo: pbdemo.o pbutil.o
-	$(CC) $(CFLAGS) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
+	$(CC) $(CFLAGS) pbdemo.o pbutil.o -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 pbinfo.o: pbinfo.c pbutil.h
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
@@ -67,13 +67,13 @@
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c
 
 glxgears_fbconfig: glxgears_fbconfig.o pbutil.o
-	$(CC) $(CFLAGS) glxgears_fbconfig.o pbutil.o $(APP_LIB_DEPS) -o $@
+	$(CC) $(CFLAGS) glxgears_fbconfig.o pbutil.o -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 glxgears_fbconfig.o: glxgears_fbconfig.c pbutil.h
 	$(CC) $(CFLAGS) -c -I. -I$(INCDIR) $(CFLAGS) glxgears_fbconfig.c
 
 xrotfontdemo: xrotfontdemo.o xuserotfont.o
-	$(CC) $(CFLAGS) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
+	$(CC) $(CFLAGS) xrotfontdemo.o xuserotfont.o -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 xuserotfont.o: xuserotfont.c xuserotfont.h
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) xuserotfont.c