Mesa (master): winsys/drm: Update Makefile.template.

Chia-I Wu olv at kemper.freedesktop.org
Fri Jan 22 03:30:14 UTC 2010


Module: Mesa
Branch: master
Commit: 883b57e66c8adc800d56080706c04cda4ffede11
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=883b57e66c8adc800d56080706c04cda4ffede11

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Fri Jan 22 11:11:48 2010 +0800

winsys/drm: Update Makefile.template.

Mainly to respect LDFLAGS and remove unused target $(LIBNAME_EGL).  This
is based on the patch by Tomáš Chvátal <scarabeus at gentoo.org>.

---

 src/gallium/winsys/drm/Makefile.template |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/src/gallium/winsys/drm/Makefile.template b/src/gallium/winsys/drm/Makefile.template
index 9635c3c..960353a 100644
--- a/src/gallium/winsys/drm/Makefile.template
+++ b/src/gallium/winsys/drm/Makefile.template
@@ -82,18 +82,11 @@ SHARED_INCLUDES = \
 default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME)
 
 $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
-	$(MKLIB) -noprefix -o $@ \
+	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
 		$(OBJECTS) $(PIPE_DRIVERS) \
                 -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
                  $(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
 
-$(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)
-	$(MKLIB) -o $(LIBNAME_EGL) \
-		-linker "$(CC)" \
-		-noprefix \
-		$(OBJECTS) $(MKLIB_OPTIONS) $(WINSYS_OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) $(DRI_LIB_DEPS) \
-		--whole-archive $(LIBS) $(GALLIUM_AUXILIARIES) --no-whole-archive $(DRIVER_EXTRAS)
-
 $(TOP)/$(LIB_DIR)/gallium:
 	mkdir -p $@
 




More information about the mesa-commit mailing list