diff options
| author | Brian Paul <[email protected]> | 2009-09-16 15:49:33 -0600 |
|---|---|---|
| committer | Vinson Lee <[email protected]> | 2009-12-02 19:39:11 -0800 |
| commit | ccea09cd3a3f18c28ebdc07c7fe879a59cd72f60 (patch) | |
| tree | e6896de0af47fd426efa1f1815588b769670b39a /progs/glsl | |
| parent | 67a0628ab2830371fc0a80b58aa4757c099471dc (diff) | |
progs/glsl: minor Makefile clean-ups
(cherry picked from commit 4df2f7af5e9b2c00ead92fe0ae49ed8491aef1d0)
Diffstat (limited to 'progs/glsl')
| -rw-r--r-- | progs/glsl/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile index 8103a5cbca0..a8e4cf3e661 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 ##### |