gallium: Don't always copy the dri driver to the staging dir
authorJakob Bornecrantz <jakob@vmware.com>
Tue, 1 Jun 2010 08:34:41 +0000 (09:34 +0100)
committerJakob Bornecrantz <jakob@vmware.com>
Tue, 1 Jun 2010 08:41:01 +0000 (09:41 +0100)
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

index 3eff07538fe4024045d899f20ea7a623cb13f88b..de05f96d231779a38fa298482dda415469bc4cae 100644 (file)
@@ -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)