From 6bd32cbcf30acb693f9b32fac3d4bcd5a785b5f6 Mon Sep 17 00:00:00 2001 From: Brian Date: Tue, 22 Jan 2008 07:56:26 -0700 Subject: Don't build yuvrect_client by default Added 'extra' rule to build optional yuvrect_client, shape, xdemo programs --- progs/xdemos/Makefile | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'progs/xdemos') diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile index d49b3d2f5c..905353c7be 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 \ @@ -31,10 +31,14 @@ PROGS = \ texture_from_pixmap \ wincopy \ xfont \ - xrotfontdemo \ - yuvrect_client + xrotfontdemo + +# Don't build these by default because of extra library dependencies +EXTRA_PROGS = \ + shape \ + yuvrect_client \ + xdemo -# omit this XMesa API demo: xdemo ##### RULES ##### @@ -51,8 +55,11 @@ PROGS = \ default: $(PROGS) +extra: $(EXTRA_PROGS) + + clean: - -rm -f $(PROGS) + -rm -f $(PROGS) $(EXTRA_PROGS) -rm -f *.o *~ @@ -95,3 +102,7 @@ corender.o: corender.c ipc.h ipc.o: ipc.c ipc.h $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) ipc.c + +yuvrect_client: yuvrect_client.c + $(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $< $(LDFLAGS) $(LIBS) -l$(GLU_LIB) -o $@ + -- cgit v1.2.3