michael@34: Index: progs/demos/Makefile michael@34: diff -Nau progs/demos/Makefile.orig progs/demos/Makefile michael@34: --- progs/demos/Makefile.orig 2008-08-25 16:46:41.000000000 +0200 michael@34: +++ progs/demos/Makefile 2008-11-26 21:42:37.000000000 +0100 michael@34: @@ -5,17 +5,17 @@ michael@34: michael@34: INCDIR = $(TOP)/include michael@34: michael@34: -OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) michael@34: +OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(GLUT_LIB_DEPS) michael@34: michael@34: -OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(APP_LIB_DEPS) michael@34: +OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa16 -lGLU -lGL $(GLUT_LIB_DEPS) michael@34: michael@34: -OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS) michael@34: +OSMESA32_LIBS = -L$(TOP)/$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(GLUT_LIB_DEPS) michael@34: michael@34: LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \ michael@34: $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) michael@34: michael@34: LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \ michael@34: - $(APP_LIB_DEPS) michael@34: + $(GLUT_LIB_DEPS) michael@34: michael@34: PROGS = \ michael@34: arbfplight \ michael@34: @@ -125,14 +125,14 @@ michael@34: michael@34: michael@34: reflect: reflect.o showbuffer.o readtex.o michael@34: - $(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@ michael@34: + $(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(OSMESA_LIBS) -o $@ michael@34: michael@34: reflect.o: reflect.c showbuffer.h michael@34: $(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c michael@34: michael@34: michael@34: shadowtex: shadowtex.o showbuffer.o michael@34: - $(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@ michael@34: + $(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(OSMESA_LIBS) -o $@ michael@34: michael@34: shadowtex.o: shadowtex.c showbuffer.h michael@34: $(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c michael@34: Index: progs/samples/Makefile michael@34: diff -Nau progs/samples/Makefile.orig progs/samples/Makefile michael@34: --- progs/samples/Makefile.orig 2008-08-25 16:46:42.000000000 +0200 michael@34: +++ progs/samples/Makefile 2008-11-26 21:46:18.000000000 +0100 michael@34: @@ -7,7 +7,7 @@ michael@34: michael@34: LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) michael@34: michael@34: -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) michael@34: +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(GLUT_LIB_DEPS) michael@34: michael@34: PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \ michael@34: font line logo nurb olympic overlay point prim quad select \ michael@34: @@ -28,6 +28,9 @@ michael@34: default: $(PROGS) michael@34: michael@34: michael@34: +nurb: nurb.c michael@34: + $(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@ michael@34: + michael@34: sphere: sphere.o readtex.o michael@34: $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) sphere.o readtex.o $(LIBS) -o $@ michael@34: michael@34: Index: progs/xdemos/Makefile michael@34: diff -Nau progs/xdemos/Makefile.orig progs/xdemos/Makefile michael@34: --- progs/xdemos/Makefile.orig 2008-08-25 16:46:42.000000000 +0200 michael@34: +++ progs/xdemos/Makefile 2008-11-26 21:48:28.000000000 +0100 michael@34: @@ -8,7 +8,7 @@ michael@34: michael@34: LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) michael@34: michael@34: -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) michael@34: +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GLUT_LIB_DEPS) michael@34: michael@34: PROGS = \ michael@34: corender \