summaryrefslogtreecommitdiffstats
path: root/progs
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2005-01-09 18:05:02 +0000
committerBrian Paul <[email protected]>2005-01-09 18:05:02 +0000
commit527af7571ef1ccfc772f444224e55534bf9dffe3 (patch)
tree5bc1957bfbb2fa444cd72f8eb17063655d630576 /progs
parent612bf1fa2ef1aaf2ab38877346bc37aefcb3760f (diff)
minor readtex fixes
Diffstat (limited to 'progs')
-rw-r--r--progs/samples/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/progs/samples/Makefile b/progs/samples/Makefile
index 2b8ea09fa12..0a8750698b7 100644
--- a/progs/samples/Makefile
+++ b/progs/samples/Makefile
@@ -18,7 +18,7 @@ PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
.SUFFIXES: .c
.c: $(LIB_DEP)
- $(CC) -I$(INCDIR) $(CFLAGS) $< readtex.o $(APP_LIB_DEPS) -o $@
+ $(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
##### TARGETS #####
@@ -32,11 +32,11 @@ sphere: sphere.o readtex.o
sphere.o: sphere.c readtex.h
$(CC) -c -I$(INCDIR) $(CFLAGS) sphere.c
-readtex.c: ../util/readtex.c
- cp ../util/readtex.c .
+readtex.c: $(TOP)/progs/util/readtex.c
+ cp $< .
-readtex.h: ../util/readtex.h
- cp ../util/readtex.h .
+readtex.h: $(TOP)/progs/util/readtex.h
+ cp $< .
readtex.o: readtex.c readtex.h
$(CC) -c -I$(INCDIR) $(CFLAGS) $< -o $@