Merge remote-tracking branch 'origin/master' into pipe-video

[mesa.git] / src / gallium / Makefile.template

diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template
index 43203b1756ee9346cc88b612550a2a746e55914d..036c11986ee8c0880cea1fa03f381ebb9d312855 100644 (file)
--- a/src/gallium/Makefile.template
+++ b/src/gallium/Makefile.template
@@ -23,6 +23,10 @@ INCLUDES = \
        -I$(TOP)/src/gallium/drivers \
        $(LIBRARY_INCLUDES)
 
+ifeq ($(MESA_LLVM),1)
+LIBRARY_DEFINES += $(LLVM_CFLAGS)
+endif
+
 
 ##### TARGETS #####
 
@@ -36,7 +40,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
 
-$(PROGS): % : %.o
+$(PROGS): % : %.o $(PROGS_DEPS)
        $(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group  $(LIBS) -Wl,--end-group
 
 # Emacs tags