define new APP_CC configuration variable for building apps/demos/tests

[mesa.git] / progs / samples / Makefile

diff --git a/progs/samples/Makefile b/progs/samples/Makefile
index 2b8ea09fa128129462620d16fad119bb80dc294b..25ce14740a844535577aa127617712ea7ebf25dd 100644 (file)
--- a/progs/samples/Makefile
+++ b/progs/samples/Makefile
@@ -5,7 +5,7 @@ include $(TOP)/configs/current
 
 INCDIR = $(TOP)/include
 
-LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME)
+LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
 
 PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
        font line logo nurb olympic overlay point prim quad select \
@@ -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 $@
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
 
 
 ##### TARGETS #####
@@ -27,21 +27,22 @@ default: $(PROGS)
 
 
 sphere: sphere.o readtex.o
-       $(CC) -I$(INCDIR) $(CFLAGS) sphere.o readtex.o $(APP_LIB_DEPS) -o $@
+       $(APP_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
+       $(APP_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 $@
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) $< -o $@
 
 
 clean:
        -rm -f $(PROGS)
        -rm -f *.o *~
+       -rm -f readtex.c readtex.h