Mesa (master): gallium: Improve winsys dri template Makefile

[Jakob Bornecrantz]

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

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Fri Feb 20 00:47:46 2009 +0100

gallium: Improve winsys dri template Makefile

	LIBNAME_EGL had to be removed since if you didn't
	set it (nobody set it anyways) make would get it
	confused it with the $(TOP)/lib/gallium target.

---

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

diff --git a/src/gallium/winsys/drm/Makefile.template b/src/gallium/winsys/drm/Makefile.template
index cccf8ab..b0d9812 100644
--- a/src/gallium/winsys/drm/Makefile.template
+++ b/src/gallium/winsys/drm/Makefile.template
@@ -79,25 +79,24 @@ SHARED_INCLUDES = \
 
 ##### TARGETS #####
 
-default: depend symlinks $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME) $(LIBNAME_EGL) $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME_EGL)
-
+default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME)
 
 $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
-	$(TOP)/bin/mklib -noprefix -o $@ \
+	$(MKLIB) -noprefix -o $@ \
 		$(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES)  $(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
 
 $(LIBNAME_EGL): $(WINSYS_OBJECTS) $(LIBS)
-	$(TOP)/bin/mklib -o $(LIBNAME_EGL) \
+	$(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/$(LIBNAME): $(LIBNAME)
-	$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium
+$(TOP)/$(LIB_DIR)/gallium:
+	mkdir -p $@
 
-$(TOP)/$(LIB_DIR)/gallium/$(LIBNAME_EGL): $(LIBNAME_EGL)
-	$(INSTALL) $(LIBNAME_EGL) $(TOP)/$(LIB_DIR)/gallium
+$(TOP)/$(LIB_DIR)/gallium/$(LIBNAME): $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium
+	$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium
 
 depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
 	rm -f depend