projects
/
profile
/
ivi
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b45ce5c
)
fix-up rules for sphere demo, which uses readtex utility
author
Brian Paul
<brian.paul@tungstengraphics.com>
Sat, 8 Jan 2005 23:51:50 +0000
(23:51 +0000)
committer
Brian Paul
<brian.paul@tungstengraphics.com>
Sat, 8 Jan 2005 23:51:50 +0000
(23:51 +0000)
progs/samples/Makefile
patch
|
blob
|
history
diff --git
a/progs/samples/Makefile
b/progs/samples/Makefile
index
36de6e2
..
2b8ea09
100644
(file)
--- a/
progs/samples/Makefile
+++ b/
progs/samples/Makefile
@@
-18,8
+18,7
@@
PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
.SUFFIXES: .c
.c: $(LIB_DEP)
.SUFFIXES: .c
.c: $(LIB_DEP)
- $(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
-
+ $(CC) -I$(INCDIR) $(CFLAGS) $< readtex.o $(APP_LIB_DEPS) -o $@
##### TARGETS #####
##### TARGETS #####
@@
-27,6
+26,22
@@
PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
default: $(PROGS)
default: $(PROGS)
+sphere: sphere.o readtex.o
+ $(CC) -I$(INCDIR) $(CFLAGS) sphere.o readtex.o $(APP_LIB_DEPS) -o $@
+
+sphere.o: sphere.c readtex.h
+ $(CC) -c -I$(INCDIR) $(CFLAGS) sphere.c
+
+readtex.c: ../util/readtex.c
+ cp ../util/readtex.c .
+
+readtex.h: ../util/readtex.h
+ cp ../util/readtex.h .
+
+readtex.o: readtex.c readtex.h
+ $(CC) -c -I$(INCDIR) $(CFLAGS) $< -o $@
+
+
clean:
-rm -f $(PROGS)
-rm -f *.o *~
clean:
-rm -f $(PROGS)
-rm -f *.o *~