[Xquartz-changes] [213] AppleSGLX/trunk/Makefile

[source_changes at macosforge.org]

Revision: 213
          http://trac.macosforge.org/projects/xquartz/changeset/213
Author:   jeremyhu at freedesktop.org
Date:     2009-02-20 14:45:02 -0800 (Fri, 20 Feb 2009)
Log Message:
-----------
Simplified dependencies in the Makefile

Modified Paths:
--------------
    AppleSGLX/trunk/Makefile

Modified: AppleSGLX/trunk/Makefile
===================================================================
--- AppleSGLX/trunk/Makefile	2009-02-20 22:33:46 UTC (rev 212)
+++ AppleSGLX/trunk/Makefile	2009-02-20 22:45:02 UTC (rev 213)
@@ -41,99 +41,54 @@
 #This is used for building the tests.
 #The tests don't require installation.
 $(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)
+	$(CC) -o $@ -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)
+	$(CC) $(GL_CFLAGS) -o $@ -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)
 
-apple_glx_drawable.o: apple_glx_drawable.h apple_glx_drawable.c apple_glx_pixmap.h apple_glx_pbuffer.h
-	$(COMPILE) apple_glx_drawable.c
+.c.o:
+	$(COMPILE) $<
 
+apple_glx_drawable.o: apple_glx_drawable.h apple_glx_drawable.c apple_glx_pixmap.h apple_glx_pbuffer.h
 apple_xgl_api.o: apple_xgl_api.h apple_xgl_api.c apple_xgl_api_stereo.c
-	$(COMPILE) apple_xgl_api.c
-
 apple_xgl_api_read.o: apple_xgl_api_read.h apple_xgl_api_read.c apple_xgl_api.h
-	$(COMPILE) apple_xgl_api_read.c
-
 glcontextmodes.o: glcontextmodes.c glcontextmodes.h
-	$(COMPILE) glcontextmodes.c
-
 glxext.o: glxext.c
-	$(COMPILE) glxext.c
-
 glxreply.o: glxreply.c
-	$(COMPILE) glxreply.c
-
 glxcmds.o: glxcmds.c apple_glx_context.h
-	$(COMPILE) glxcmds.c
-
 glx_pbuffer.o: glx_pbuffer.c
-	$(COMPILE) glx_pbuffer.c
-
 glx_query.o: glx_query.c
-	$(COMPILE) glx_query.c
-
 glxcurrent.o: glxcurrent.c
-	$(COMPILE) glxcurrent.c
-
 glxextensions.o: glxextensions.h glxextensions.c
-	$(COMPILE) glxextensions.c
-
 glxhash.o: glxhash.h glxhash.c
-	$(COMPILE) glxhash.c
-
 appledri.o: appledri.h appledristr.h appledri.c
-	$(COMPILE) appledri.c
-
 apple_glx_context.o: apple_glx_context.c apple_glx_context.h apple_glx_context.h
-	$(COMPILE) apple_glx_context.c
-
 apple_glx.o: apple_glx.h apple_glx.c
-	$(COMPILE) apple_glx.c
-
 apple_visual.o: apple_visual.h apple_visual.c
-	$(COMPILE) apple_visual.c
-
 apple_cgl.o: apple_cgl.h apple_cgl.c
-	$(COMPILE) apple_cgl.c 
-
 apple_glx_pbuffer.o: apple_glx_pbuffer.h apple_glx_pbuffer.c
-	$(COMPILE) apple_glx_pbuffer.c
-
 apple_glx_pixmap.o: apple_glx_pixmap.h apple_glx_pixmap.c appledri.h
-	$(COMPILE) apple_glx_pixmap.c
-
 xfont.o: xfont.c glxclient.h
-	$(COMPILE) xfont.c
-
 compsize.o: compsize.c
-	$(COMPILE) $?
-
 renderpix.o: renderpix.c
-	$(COMPILE) $?
-
 singlepix.o: singlepix.c
-	$(COMPILE) $?
-
 pixel.o: pixel.c
-	$(COMPILE) $?
-
 glx_empty.o: glx_empty.c
-	$(COMPILE) glx_empty.c
 
 $(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
+	$(CC) tests/glxinfo/glxinfo.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(BUILD_DIR) -L$(X11_DIR)/lib -lX11 -lGL -o $@
 
 $(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
+	$(CC) tests/glxgears/glxgears.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(BUILD_DIR) -L$(X11_DIR)/lib -lX11 -lGL -o $@
 
 install_headers:
 	$(INSTALL) -d $(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 644 include/GL/gl.h include/GL/glext.h 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
-	$(INSTALL) -m 555 $(PROGRAMS) $(DESTDIR)$(INSTALL_DIR)/bin
+	$(INSTALL) -m 755 $(PROGRAMS) $(DESTDIR)$(INSTALL_DIR)/bin
 
 install_libraries: $(BUILD_DIR)/libGL.1.2.dylib
 	$(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/lib
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20090220/22fc178d/attachment.html>