Since most of the xdemos don't require libGLU, it should not be required
except for those special cases. The Makefile now checks for libGLU
before attempting to build these programs.
---
Brian, I saw you changed offset.c to not use libGLU, so it could be
dropped from this patch. Does the approach seem OK? It worked on
master for me, but I haven't backported to 7.0.
progs/xdemos/Makefile | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
index d49b3d2..c05a5c1 100644
--- a/progs/xdemos/Makefile
+++ b/progs/xdemos/Makefile
@@ -6,9 +6,9 @@ include $(TOP)/configs/current
INCDIR = $(TOP)/include
-LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME)
+LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
PROGS = \
corender \
@@ -24,14 +24,20 @@ PROGS = \
glxsnoop \
glxswapcontrol \
manywin \
- offset \
overlay \
pbinfo \
pbdemo \
texture_from_pixmap \
wincopy \
xfont \
- xrotfontdemo \
+ xrotfontdemo
+
+LIB_DEP_GLU = $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME)
+
+LIBS_GLU = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
+
+GLU_PROGS = \
+ offset \
yuvrect_client
# omit this XMesa API demo: xdemo
@@ -49,10 +55,16 @@ PROGS = \
##### TARGETS #####
default: $(PROGS)
+ @if [ -f "$(LIB_DEP_GLU)" ]; then \
+ $(MAKE) glu-progs; \
+ fi
+
+glu-progs: $(GLU_PROGS)
clean:
-rm -f $(PROGS)
+ -rm -f $(GLU_PROGS)
-rm -f *.o *~
@@ -95,3 +107,9 @@ corender.o: corender.c ipc.h
ipc.o: ipc.c ipc.h
$(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) ipc.c
+
+# Special cases for glu
+offset: offset.c $(LIB_DEP) $(LIB_DEP_GLU)
+ $(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS_GLU)
-o $@
+yuvrect_client: yuvrect_client.c $(LIB_DEP) $(LIB_DEP_GLU)
+ $(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS_GLU)
-o $@
--
1.5.3.2
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
