Merge branch 'mesa_7_7_branch'

[mesa.git] / progs / xdemos / Makefile

diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile
index 8d248fb0a925756544fc0a155ca620baef8390f4..f866a328656f5a558b5f7654cde5780dc253c569 100644 (file)
--- a/progs/xdemos/Makefile
+++ b/progs/xdemos/Makefile
@@ -8,6 +8,9 @@ INCDIR = $(TOP)/include
 
 LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
 
+# Add X11 and pthread libs to satisfy GNU gold.
+APP_LIB_DEPS += -lX11 -lpthread
+
 LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS)
 
 PROGS = \
@@ -26,11 +29,14 @@ PROGS = \
        glxsnoop \
        glxswapcontrol \
        manywin \
+       msctest \
+       multictx \
        offset \
        overlay \
        pbinfo \
        pbdemo \
        sharedtex \
+        sharedtex_mt \
        texture_from_pixmap \
        wincopy \
        xfont \
@@ -98,7 +104,7 @@ xrotfontdemo.o: xrotfontdemo.c xuserotfont.h
        $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xrotfontdemo.c
 
 corender: corender.o ipc.o
-       $(APP_CC) $(CFLAGS) corender.o ipc.o $(LIBS) -o $@
+       $(APP_CC) $(CFLAGS) $(LDFLAGS) corender.o ipc.o $(LIBS) -o $@
 
 corender.o: corender.c ipc.h
        $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) corender.c