Mesa (master): gallium: Don't always copy the dri driver to the staging dir

Jakob Bornecrantz wallbraker at kemper.freedesktop.org
Thu Jun 3 07:29:01 PDT 2010


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

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Tue Jun  1 09:34:41 2010 +0100

gallium: Don't always copy the dri driver to the staging dir

So something in the build keept updating the timestamp on the
staging directory causing us to always copy the library to it.

---

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

diff --git a/src/gallium/targets/Makefile.dri b/src/gallium/targets/Makefile.dri
index 3eff075..de05f96 100644
--- a/src/gallium/targets/Makefile.dri
+++ b/src/gallium/targets/Makefile.dri
@@ -57,6 +57,8 @@ SHARED_INCLUDES = \
 	-I$(TOP)/src/egl/drivers/dri \
 	$(LIBDRM_CFLAGS)
 
+LIBNAME_STAGING = $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME)
+
 
 ##### RULES #####
 
@@ -69,7 +71,7 @@ SHARED_INCLUDES = \
 
 ##### TARGETS #####
 
-default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME)
+default: depend symlinks $(TOP)/$(LIB_DIR)/gallium $(LIBNAME) $(LIBNAME_STAGING)
 
 $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) Makefile \
 		$(TOP)/src/mesa/drivers/dri/Makefile.template $(TOP)/src/mesa/drivers/dri/common/dri_test.o
@@ -88,7 +90,7 @@ $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) Makefile \
 $(TOP)/$(LIB_DIR)/gallium:
 	mkdir -p $@
 
-$(TOP)/$(LIB_DIR)/gallium/$(LIBNAME): $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium
+$(LIBNAME_STAGING): $(LIBNAME)
 	$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium
 
 depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)



More information about the mesa-commit mailing list