get rid of unused span->start field

[mesa.git] / progs / xdemos / Makefile

diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
index 0904ee3445a1900fe6f037a701208fa16ec6e702..4ca8b107a24c9e8cc91d536359736d2400099ccc 100644 (file)
--- a/progs/xdemos/Makefile
+++ b/progs/xdemos/Makefile
@@ -1,18 +1,18 @@
 # progs/xdemos/Makefile
 
-TOP = ../../
+TOP = ../..
 include $(TOP)/configs/current
 
 
 INCDIR = $(TOP)/include
 
-LIBS = -L$(LIB_DIR) $(APP_LIB_DEPS)
-
-LIB_DEP = $(LIB_DIR)/$(GL_LIB) $(LIB_DIR)/$(GLU_LIB)
+LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME)
 
 PROGS = glthreads \
        glxdemo \
        glxgears \
+       glxgears_fbconfig \
+       glxcontexts \
        glxheads \
        glxinfo \
        glxpixmap \
@@ -20,12 +20,14 @@ PROGS = glthreads \
        glxswapcontrol \
        manywin \
        offset \
+       overlay \
        pbinfo \
        pbdemo \
        wincopy \
        xdemo \
        xfont \
-       xrotfontdemo
+       xrotfontdemo \
+       yuvrect_client
 
 
 
@@ -35,7 +37,7 @@ PROGS = glthreads \
 .SUFFIXES: .c
 
 .c: $(LIB_DEP)
-       $(CC) -I$(INCDIR) $(CFLAGS) $< $(LIBS) -o $@
+       $(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
 
 
 ##### TARGETS #####
@@ -44,19 +46,16 @@ default: $(PROGS)
 
 
 clean:
-       -rm -f *.o *~
-
-realclean:
        -rm -f $(PROGS)
        -rm -f *.o *~
 
 
 # special cases
 pbinfo: pbinfo.o pbutil.o
-       $(CC) pbinfo.o pbutil.o $(LIBS) -o $@
+       $(CC) -I$(INCDIR) $(CFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
 
 pbdemo: pbdemo.o pbutil.o
-       $(CC) pbdemo.o pbutil.o $(LIBS) -o $@
+       $(CC) -I$(INCDIR) $(CFLAGS) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
 
 pbinfo.o: pbinfo.c pbutil.h
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
@@ -67,9 +66,14 @@ pbdemo.o: pbdemo.c pbutil.h
 pbutil.o: pbutil.c pbutil.h
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c
 
+glxgears_fbconfig: glxgears_fbconfig.o pbutil.o
+       $(CC) -I$(INCDIR) $(CFLAGS) glxgears_fbconfig.o pbutil.o $(APP_LIB_DEPS) -o $@
+
+glxgears_fbconfig.o: glxgears_fbconfig.c pbutil.h
+       $(CC) -I$(INCDIR) $(CFLAGS) -c -I. $(CFLAGS) glxgears_fbconfig.c
 
 xrotfontdemo: xrotfontdemo.o xuserotfont.o
-       $(CC) xrotfontdemo.o xuserotfont.o $(LIBS) -o $@
+       $(CC) -I$(INCDIR) $(CFLAGS) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
 
 xuserotfont.o: xuserotfont.c xuserotfont.h
        $(CC) -c -I. -I$(INCDIR) $(CFLAGS) xuserotfont.c