[209] AppleSGLX/trunk

20 Feb 2009

Revision: 209
          http://trac.macosforge.org/projects/xquartz/changeset/209
Author:   jeremyhu@freedesktop.org
Date:     2009-02-20 14:24:59 -0800 (Fri, 20 Feb 2009)
Log Message:
-----------
Makefile cleanup

Modified Paths:
--------------
    AppleSGLX/trunk/Makefile
    AppleSGLX/trunk/tests/tests.mk

Modified: AppleSGLX/trunk/Makefile
===================================================================

--- AppleSGLX/trunk/Makefile	2009-02-20 22:18:49 UTC (rev 208)
+++ AppleSGLX/trunk/Makefile	2009-02-20 22:24:59 UTC (rev 209)
@@ -21,13 +21,10 @@
 
 PROGRAMS=$(BUILD_DIR)/glxinfo $(BUILD_DIR)/glxgears
 
-#The final resulting library to be created upon install.
-DEST_LIBGL=$(DESTDIR)$(INSTALL_DIR)/lib/libGL.1.2.dylib
-
-all: $(TEST_BUILD_DIR) Makefile $(BUILD_DIR)/libGL.1.2.dylib libGL.dylib 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 \
@@ -43,8 +40,8 @@
 
 #This is used for building the tests.
 #The tests don't require installation.
-libGL.dylib: $(OBJECTS)
-	$(CC) -o libGL.dylib -dynamiclib -lXplugin -framework ApplicationServices -framework CoreFoundation -L$(X11_DIR)/lib -lX11 -lXext -Wl,-exported_symbols_list,exports.list $(OBJECTS)
+$(TEST_BUILD_DIR)/libGL.dylib: $(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)
 	$(CC) $(GL_CFLAGS) -o $(BUILD_DIR)/libGL.1.2.dylib -dynamiclib -install_name $(INSTALL_DIR)/lib/libGL.1.2.dylib -compatibility_version 1.2 -current_version 1.2 -lXplugin -framework ApplicationServices -framework CoreFoundation $(GL_LDFLAGS) -lXext -lX11 -Wl,-exported_symbols_list,exports.list $(OBJECTS)
@@ -124,19 +121,15 @@
 glx_empty.o: glx_empty.c
 	$(COMPILE) glx_empty.c
 
-$(BUILD_DIR)/glxinfo: tests/glxinfo/glxinfo.c $(DEST_LIBGL)
-	$(CC) tests/glxinfo/glxinfo.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(DESTDIR)$(INSTALL_DIR)/lib -lX11 -lGL \
-   -o $(BUILD_DIR)/glxinfo
+$(BUILD_DIR)/glxinfo: tests/glxinfo/glxinfo.c $(BUILD_DIR)/libGL.1.2.dylib
+	$(CC) tests/glxinfo/glxinfo.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(BUILD_DIR) -L$(X11_DIR)/lib -lX11 -lGL -o $(BUILD_DIR)/glxinfo
 
-$(BUILD_DIR)/glxgears: tests/glxgears/glxgears.c $(DEST_LIBGL)
-	$(CC) tests/glxgears/glxgears.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(DESTDIR)$(INSTALL_DIR)/lib -lX11 -lGL \
-   -o $(BUILD_DIR)/glxgears
+$(BUILD_DIR)/glxgears: tests/glxgears/glxgears.c $(BUILD_DIR)/libGL.1.2.dylib
+	$(CC) tests/glxgears/glxgears.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(BUILD_DIR) -L$(X11_DIR)/lib -lX11 -lGL -o $(BUILD_DIR)/glxgears
 
 install_headers:
 	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL
-	$(INSTALL) -m 444 include/GL/gl.h include/GL/glext.h $(DESTDIR)$(INSTALL_DIR)/include/GL
-	$(INSTALL) -m 444 include/GL/glx.h include/GL/glxext.h include/GL/glxint.h include/GL/glxmd.h \
-   include/GL/glxproto.h $(DESTDIR)$(INSTALL_DIR)/include/GL
+	$(INSTALL) -m 444 include/GL/glx.h include/GL/glxext.h include/GL/glxint.h include/GL/glxmd.h include/GL/glxproto.h $(DESTDIR)$(INSTALL_DIR)/include/GL
 
 install_programs: $(PROGRAMS)
 	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/bin

Modified: AppleSGLX/trunk/tests/tests.mk
===================================================================
--- AppleSGLX/trunk/tests/tests.mk	2009-02-20 22:18:49 UTC (rev 208)
+++ AppleSGLX/trunk/tests/tests.mk	2009-02-20 22:24:59 UTC (rev 209)
@@ -1,6 +1,6 @@
 .PHONY : tests
 
-LIBGL=./libGL.dylib
+LIBGL=$(TEST_BUILD_DIR)/libGL.dylib
 LINK_TEST=-L/usr/X11/lib ./libGL.dylib -lX11 -lXext -lXplugin -lpthread
 
 include tests/triangle/triangle.mk
@@ -17,8 +17,7 @@
 include tests/triangle_glx_single/triangle_glx.mk
 include tests/shared/shared.mk
 
-
-tests: $(TEST_BUILD_DIR)/simple $(TEST_BUILD_DIR)/fbconfigs $(TEST_BUILD_DIR)/triangle_glx \
+tests: $(TEST_BUILD_DIR)/libGL.dylib $(TEST_BUILD_DIR) $(TEST_BUILD_DIR)/simple $(TEST_BUILD_DIR)/fbconfigs $(TEST_BUILD_DIR)/triangle_glx \
   $(TEST_BUILD_DIR)/create_destroy_context $(TEST_BUILD_DIR)/glxgears $(TEST_BUILD_DIR)/glxinfo \
   $(TEST_BUILD_DIR)/pbuffer $(TEST_BUILD_DIR)/pbuffer_destroy \
   $(TEST_BUILD_DIR)/glxpixmap \

    

source_changes＠macosforge.org

tags

participants (1)