Revision: 210 http://trac.macosforge.org/projects/xquartz/changeset/210 Author: jeremyhu@freedesktop.org Date: 2009-02-20 14:27:37 -0800 (Fri, 20 Feb 2009) Log Message: ----------- More Makefile cleanup Modified Paths: -------------- AppleSGLX/trunk/Makefile AppleSGLX/trunk/tests/tests.mk Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-20 22:24:59 UTC (rev 209) +++ AppleSGLX/trunk/Makefile 2009-02-20 22:27:37 UTC (rev 210) @@ -21,10 +21,10 @@ PROGRAMS=$(BUILD_DIR)/glxinfo $(BUILD_DIR)/glxgears +all: $(PROGRAMS) tests + include tests/tests.mk -all: $(PROGRAMS) tests - OBJECTS=glxext.o glxcmds.o glx_pbuffer.o glx_query.o glxcurrent.o glxextensions.o \ appledri.o apple_glx_context.o apple_glx.o pixel.o \ compsize.o apple_visual.o apple_cgl.o glxreply.o glcontextmodes.o \ @@ -40,7 +40,7 @@ #This is used for building the tests. #The tests don't require installation. -$(TEST_BUILD_DIR)/libGL.dylib: $(OBJECTS) +$(TEST_BUILD_DIR)/libGL.dylib: $(TEST_BUILD_DIR) $(OBJECTS) $(CC) -o $(TEST_BUILD_DIR)/libGL.dylib -dynamiclib -lXplugin -framework ApplicationServices -framework CoreFoundation -L$(X11_DIR)/lib -lX11 -lXext -Wl,-exported_symbols_list,exports.list $(OBJECTS) $(BUILD_DIR)/libGL.1.2.dylib: $(BUILD_DIR) $(OBJECTS) Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-02-20 22:24:59 UTC (rev 209) +++ AppleSGLX/trunk/tests/tests.mk 2009-02-20 22:27:37 UTC (rev 210) @@ -1,7 +1,7 @@ .PHONY : tests LIBGL=$(TEST_BUILD_DIR)/libGL.dylib -LINK_TEST=-L/usr/X11/lib ./libGL.dylib -lX11 -lXext -lXplugin -lpthread +LINK_TEST=-L/usr/X11/lib $(LIBGL) -lX11 -lXext -lXplugin -lpthread include tests/triangle/triangle.mk include tests/simple/simple.mk