build egl_xlib/ too (softpipe_egl.so library)

[mesa.git] / progs / xdemos / Makefile

diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
index 52f7583aee04579d40d3fcbd19b205f67f79e9ce..896b1608780627f49d6841e649e344186b21ece1 100644 (file)
--- a/progs/xdemos/Makefile
+++ b/progs/xdemos/Makefile
@@ -1,16 +1,17 @@
 # progs/xdemos/Makefile
 
-TOP = ../../
+TOP = ../..
 include $(TOP)/configs/current
 
 
 INCDIR = $(TOP)/include
 
-LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME)
+LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME)
 
 PROGS = glthreads \
        glxdemo \
        glxgears \
+       glxgears_fbconfig \
        glxcontexts \
        glxheads \
        glxinfo \
@@ -19,13 +20,17 @@ PROGS = glthreads \
        glxswapcontrol \
        manywin \
        offset \
+       overlay \
        pbinfo \
        pbdemo \
+       sharedtex \
+       texture_from_pixmap \
        wincopy \
-       xdemo \
        xfont \
-       xrotfontdemo
+       xrotfontdemo \
+       yuvrect_client
 
+# omit this XMesa API demo:    xdemo
 
 
 ##### RULES #####
@@ -49,10 +54,10 @@ clean:
 
 # special cases
 pbinfo: pbinfo.o pbutil.o
-       $(CC) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
+       $(CC) -I$(INCDIR) $(CFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
 
 pbdemo: pbdemo.o pbutil.o
-       $(CC) pbdemo.o pbutil.o $(APP_LIB_DEPS) -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
@@ -63,9 +68,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 $(APP_LIB_DEPS) -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