From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 26 Mar 2004 23:58:08 +0000 (+0000)
Subject: minor fixes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5c2040c7684c4aa9230e2ed344c4bde6ee49552d;p=mesa.git

minor fixes
---

diff --git a/progs/demos/Makefile b/progs/demos/Makefile
index ad0b47a2b9f..16f8df8a77a 100644
--- a/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@ -7,7 +7,7 @@ INCDIR = $(TOP)/include
 
 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 = \
 	arbfplight \
diff --git a/progs/redbook/Makefile b/progs/redbook/Makefile
index 5fbfde2ca47..4cfbb9aeacd 100644
--- a/progs/redbook/Makefile
+++ b/progs/redbook/Makefile
@@ -5,7 +5,7 @@ include $(TOP)/configs/current
 
 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 \
 	bezcurve bezmesh checker clip colormat cube depthcue dof \
diff --git a/progs/samples/Makefile b/progs/samples/Makefile
index cf651b25a9b..d7fcf8709d6 100644
--- a/progs/samples/Makefile
+++ b/progs/samples/Makefile
@@ -5,7 +5,7 @@ include $(TOP)/configs/current
 
 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 \
 	font line logo nurb oglinfo olympic overlay point prim quad select \
diff --git a/progs/tests/Makefile b/progs/tests/Makefile
index 5b9e7495aca..95c69605cfb 100644
--- a/progs/tests/Makefile
+++ b/progs/tests/Makefile
@@ -68,7 +68,7 @@ INCLUDES = -I. -I$(TOP)/include
 
 ##### TARGETS #####
 
-default: depend $(PROGS)
+default: $(PROGS)
 
 clean:
 	rm -f $(PROGS)
@@ -100,9 +100,6 @@ readtex.c: $(TOP)/progs/util/readtex.c
 	ln -s $(TOP)/progs/util/readtex.c .
 
 
-# Update dependencies
-depend: $(SOURCES)
-	makedepend -fdepend -Y $(INCLUDES) $(SOURCES)
 
 
 # Emacs tags
diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
index 6462c8ee206..2bc0b88b0d9 100644
--- a/progs/xdemos/Makefile
+++ b/progs/xdemos/Makefile
@@ -6,9 +6,7 @@ include $(TOP)/configs/current
 
 INCDIR = $(TOP)/include
 
-LIBS = $(APP_LIB_DEPS)
-
-LIB_DEP = $(LIB_DIR)/$(GL_LIB) $(LIB_DIR)/$(GLU_LIB)
+LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME)
 
 PROGS = glthreads \
 	glxdemo \
@@ -35,7 +33,7 @@ PROGS = glthreads \
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
+	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
 
 
 ##### TARGETS #####
@@ -50,10 +48,10 @@ clean:
 
 # special cases
 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
-	$(CC) pbdemo.o pbutil.o $(LIBS) -o $@
+	$(CC) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
 
 pbinfo.o: pbinfo.c pbutil.h
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
@@ -66,7 +64,7 @@ pbutil.o: pbutil.c pbutil.h
 
 
 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
 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) xuserotfont.c