Mesa (master): gallium: Don' t depend directly on staging dir in Xorg template makefile

Jakob Bornecrantz wallbraker at kemper.freedesktop.org
Thu Jun 3 08:18:28 PDT 2010


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

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Tue Jun  1 10:15:52 2010 +0100

gallium: Don't depend directly on staging dir in Xorg template makefile

---

 src/gallium/targets/Makefile.xorg |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/targets/Makefile.xorg b/src/gallium/targets/Makefile.xorg
index 610cf45..f638fbe 100644
--- a/src/gallium/targets/Makefile.xorg
+++ b/src/gallium/targets/Makefile.xorg
@@ -29,7 +29,7 @@ LIBNAME_STAGING = $(TOP)/$(LIB_DIR)/gallium/$(TARGET)
 
 ##### TARGETS #####
 
-default: depend $(LIBNAME) $(LIBNAME_STAGING)
+default: depend $(TOP)/$(LIB_DIR)/gallium $(LIBNAME) $(LIBNAME_STAGING)
 
 $(LIBNAME): $(OBJECTS) Makefile $(LIBS)
 	$(MKLIB) -noprefix -o $@ $(OBJECTS) $(DRIVER_LINKS)
@@ -39,7 +39,7 @@ depend: $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(SYMLINKS) $(GENERATED_SOURC
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(GENERATED_SOURCES) 2> /dev/null
 
-$(LIBNAME_STAGING): $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium
+$(LIBNAME_STAGING): $(LIBNAME)
 	$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium
 
 $(TOP)/$(LIB_DIR)/gallium:



More information about the mesa-commit mailing list