Index: progs/demos/Makefile
diff -Nau progs/demos/Makefile.orig progs/demos/Makefile
--- progs/demos/Makefile.orig	2004-10-23 19:00:52.000000000 +0200
+++ progs/demos/Makefile	2005-03-23 21:52:13.356915218 +0100
@@ -5,9 +5,9 @@
 
 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)
 
-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)
 
@@ -67,7 +67,7 @@
 
 # make executable from .c file:
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 
 ##### TARGETS #####
Index: progs/demos/arbfplight.c
diff -Nau progs/demos/arbfplight.c.orig progs/demos/arbfplight.c
--- progs/demos/arbfplight.c.orig	2005-03-23 18:50:08 +0100
+++ progs/demos/arbfplight.c	2005-03-23 18:50:12 +0100
@@ -6,6 +6,7 @@
  * 17 April 2003
  */
 
+#include <GL/gl.h>
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
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$(X11LIB_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,7 +18,7 @@
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 
 
@@ -26,6 +26,8 @@
 
 default: $(PROGS)
 
+nurb: nurb.c
+	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 clean:
 	-rm -f $(PROGS)
Index: progs/xdemos/Makefile
diff -Nau progs/xdemos/Makefile.orig progs/xdemos/Makefile
--- progs/xdemos/Makefile.orig	2005-03-23 21:04:26 +0100
+++ progs/xdemos/Makefile	2005-03-23 21:04:46 +0100
@@ -33,7 +33,7 @@
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 
 ##### TARGETS #####
@@ -48,10 +48,10 @@
 
 # special cases
 pbinfo: pbinfo.o pbutil.o
-	$(CC) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
+	$(CC) pbinfo.o pbutil.o -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 pbdemo: pbdemo.o pbutil.o
-	$(CC) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
+	$(CC) pbinfo.o pbutil.o -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 pbinfo.o: pbinfo.c pbutil.h
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
@@ -64,7 +64,7 @@
 
 
 xrotfontdemo: xrotfontdemo.o xuserotfont.o
-	$(CC) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
+	$(CC) xrotfontdemo.o xuserotfont.o -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
 
 xuserotfont.o: xuserotfont.c xuserotfont.h
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) xuserotfont.c