diff options
| author | Dan Nicholson <[email protected]> | 2007-10-29 09:03:01 -0600 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-10-29 09:03:01 -0600 |
| commit | c05aa5ec4cc29f949eff350582cb6f6c03dce3c6 (patch) | |
| tree | 7fbd2ddd53a5eabacd35e12b407e203a7d2b2853 /progs/glsl | |
| parent | b59dbd822f353cbf0db404f14c2721c79cde79fc (diff) | |
specify app lib dependencies in Makefiles (patch 1/3)
Diffstat (limited to 'progs/glsl')
| -rw-r--r-- | progs/glsl/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/progs/glsl/Makefile b/progs/glsl/Makefile index 8b44239b43e..fe2943d88dd 100644 --- a/progs/glsl/Makefile +++ b/progs/glsl/Makefile @@ -7,6 +7,8 @@ INCDIR = $(TOP)/include LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) + PROGS = \ bitmap \ brick \ @@ -28,7 +30,7 @@ PROGS = \ # make executable from .c file: .c: $(LIB_DEP) - $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< $(APP_LIB_DEPS) -o $@ + $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@ ##### TARGETS ##### @@ -64,7 +66,7 @@ points.c: extfuncs.h toyball.c: extfuncs.h texdemo1: texdemo1.o readtex.o - $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) texdemo1.o readtex.o $(APP_LIB_DEPS) -o $@ + $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) texdemo1.o readtex.o $(LIBS) -o $@ texdemo1.o: texdemo1.c readtex.h extfuncs.h $(CC) -c -I$(INCDIR) $(CFLAGS) texdemo1.c |