Mesa (mesa_7_7_branch): progs/glsl: minor Makefile clean-ups
Jakob Bornecrantz
wallbraker at kemper.freedesktop.org
Thu Dec 3 19:19:59 UTC 2009
Module: Mesa
Branch: mesa_7_7_branch
Commit: ccea09cd3a3f18c28ebdc07c7fe879a59cd72f60
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ccea09cd3a3f18c28ebdc07c7fe879a59cd72f60
Author: Brian Paul <brianp at vmware.com>
Date: Wed Sep 16 15:49:33 2009 -0600
progs/glsl: minor Makefile clean-ups
(cherry picked from commit 4df2f7af5e9b2c00ead92fe0ae49ed8491aef1d0)
---
progs/glsl/Makefile | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile
index 8103a5c..a8e4cf3 100644
--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -10,16 +10,15 @@ LIB_DEP = \
$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
-
-INCLUDE_DIRS = -I$(TOP)/progs/util
+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \
+ -l$(GL_LIB) $(APP_LIB_DEPS)
# using : to avoid APP_CC pointing to CC loop
-CC:=$(APP_CC)
+CC := $(APP_CC)
CFLAGS += -I$(INCDIR)
-LDLIBS=$(LIBS)
+LDLIBS = $(LIBS)
-DEMO_SOURCES = \
+PROG_SOURCES = \
array.c \
bitmap.c \
brick.c \
@@ -59,8 +58,8 @@ UTIL_SOURCES = \
readtex.c
UTIL_OBJS = $(UTIL_SOURCES:.c=.o)
-PROG_OBJS = $(DEMO_SOURCES:.c=.o)
-PROGS = $(DEMO_SOURCES:%.c=%)
+PROG_OBJS = $(PROG_SOURCES:.c=.o)
+PROGS = $(PROG_SOURCES:%.c=%)
##### TARGETS #####
More information about the mesa-commit
mailing list