diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2008-01-22 07:56:31 -0700 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2008-01-22 07:56:31 -0700 |
| commit | 834decdaaeb33402e0a54b81285f2e6a13c518b2 (patch) | |
| tree | a4457dcbfcea3316cf7284a5c996b039d473e805 /progs | |
| parent | 18b2d83173a0db1bd95d545cd6872826559dd081 (diff) | |
Don't build yuvrect_client by default
Added 'extra' rule to build optional yuvrect_client, shape, xdemo programs
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/xdemos/Makefile | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile index 5511b8c5f42..1803633ef11 100644 --- a/progs/xdemos/Makefile +++ b/progs/xdemos/Makefile @@ -6,11 +6,12 @@ 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 = glthreads \ +PROGS = \ + glthreads \ glxdemo \ glxgears \ glxgears_fbconfig \ @@ -27,10 +28,14 @@ PROGS = glthreads \ pbdemo \ 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 ##### @@ -47,8 +52,11 @@ PROGS = glthreads \ default: $(PROGS) +extra: $(EXTRA_PROGS) + + clean: - -rm -f $(PROGS) + -rm -f $(PROGS) $(EXTRA_PROGS) -rm -f *.o *~ @@ -83,3 +91,6 @@ xuserotfont.o: xuserotfont.c xuserotfont.h xrotfontdemo.o: xrotfontdemo.c xuserotfont.h $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xrotfontdemo.c +yuvrect_client: yuvrect_client.c + $(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $< $(LDFLAGS) $(LIBS) -l$(GLU_LIB) -o $@ + |