diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-03-26 23:58:08 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-03-26 23:58:08 +0000 |
| commit | 5c2040c7684c4aa9230e2ed344c4bde6ee49552d (patch) | |
| tree | 4ed0c7b5bcba06aca956174faa0a12d32cf4b909 /progs/xdemos | |
| parent | 1c8e825c2a926c65d0728f7884d61b0ba38e57a6 (diff) | |
minor fixes
Diffstat (limited to 'progs/xdemos')
| -rw-r--r-- | progs/xdemos/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile index 6462c8ee20..2bc0b88b0d 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 |