Commit 5c2040c7 authored by Brian Paul's avatar Brian Paul

minor fixes

parent 1c8e825c
...@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include ...@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include
OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS) OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
LIB_DEP = $(LIB_DIR)/$(GL_LIB) $(LIB_DIR)/$(GLU_LIB) $(LIB_DIR)/$(GLUT_LIB) LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME)
PROGS = \ PROGS = \
arbfplight \ arbfplight \
......
...@@ -5,7 +5,7 @@ include $(TOP)/configs/current ...@@ -5,7 +5,7 @@ include $(TOP)/configs/current
INCDIR = $(TOP)/include INCDIR = $(TOP)/include
LIB_DEP = $(LIB_DIR)/$(GL_LIB) $(LIB_DIR)/$(GLU_LIB) $(LIB_DIR)/$(GLUT_LIB) LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME)
PROGS = aaindex aapoly aargb accanti accpersp alpha alpha3D anti \ PROGS = aaindex aapoly aargb accanti accpersp alpha alpha3D anti \
bezcurve bezmesh checker clip colormat cube depthcue dof \ bezcurve bezmesh checker clip colormat cube depthcue dof \
......
...@@ -5,7 +5,7 @@ include $(TOP)/configs/current ...@@ -5,7 +5,7 @@ include $(TOP)/configs/current
INCDIR = $(TOP)/include INCDIR = $(TOP)/include
LIB_DEP = $(LIB_DIR)/$(GL_LIB) $(LIB_DIR)/$(GLU_LIB) $(LIB_DIR)/$(GLUT_LIB) LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME)
PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \ PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
font line logo nurb oglinfo olympic overlay point prim quad select \ font line logo nurb oglinfo olympic overlay point prim quad select \
......
...@@ -68,7 +68,7 @@ INCLUDES = -I. -I$(TOP)/include ...@@ -68,7 +68,7 @@ INCLUDES = -I. -I$(TOP)/include
##### TARGETS ##### ##### TARGETS #####
default: depend $(PROGS) default: $(PROGS)
clean: clean:
rm -f $(PROGS) rm -f $(PROGS)
...@@ -100,9 +100,6 @@ readtex.c: $(TOP)/progs/util/readtex.c ...@@ -100,9 +100,6 @@ readtex.c: $(TOP)/progs/util/readtex.c
ln -s $(TOP)/progs/util/readtex.c . ln -s $(TOP)/progs/util/readtex.c .
# Update dependencies
depend: $(SOURCES)
makedepend -fdepend -Y $(INCLUDES) $(SOURCES)
# Emacs tags # Emacs tags
......
...@@ -6,9 +6,7 @@ include $(TOP)/configs/current ...@@ -6,9 +6,7 @@ include $(TOP)/configs/current
INCDIR = $(TOP)/include INCDIR = $(TOP)/include
LIBS = $(APP_LIB_DEPS) LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME)
LIB_DEP = $(LIB_DIR)/$(GL_LIB) $(LIB_DIR)/$(GLU_LIB)
PROGS = glthreads \ PROGS = glthreads \
glxdemo \ glxdemo \
...@@ -35,7 +33,7 @@ PROGS = glthreads \ ...@@ -35,7 +33,7 @@ PROGS = glthreads \
.SUFFIXES: .c .SUFFIXES: .c
.c: $(LIB_DEP) .c: $(LIB_DEP)
$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@ $(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
##### TARGETS ##### ##### TARGETS #####
...@@ -50,10 +48,10 @@ clean: ...@@ -50,10 +48,10 @@ clean:
# special cases # special cases
pbinfo: pbinfo.o pbutil.o pbinfo: pbinfo.o pbutil.o
$(CC) pbinfo.o pbutil.o $(LIBS) -o $@ $(CC) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
pbdemo: pbdemo.o pbutil.o pbdemo: pbdemo.o pbutil.o
$(CC) pbdemo.o pbutil.o $(LIBS) -o $@ $(CC) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
pbinfo.o: pbinfo.c pbutil.h pbinfo.o: pbinfo.c pbutil.h
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
...@@ -66,7 +64,7 @@ pbutil.o: pbutil.c pbutil.h ...@@ -66,7 +64,7 @@ pbutil.o: pbutil.c pbutil.h
xrotfontdemo: xrotfontdemo.o xuserotfont.o xrotfontdemo: xrotfontdemo.o xuserotfont.o
$(CC) xrotfontdemo.o xuserotfont.o $(LIBS) -o $@ $(CC) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
xuserotfont.o: xuserotfont.c xuserotfont.h xuserotfont.o: xuserotfont.c xuserotfont.h
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) xuserotfont.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) xuserotfont.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment