X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FMakefile.template;h=036c11986ee8c0880cea1fa03f381ebb9d312855;hb=583eb139480fb1265b5106a09dcec8ce42d1124d;hp=b5a9938c74093637d272f2e277a592f36f9213f3;hpb=02224ec4e0de8072c9d730821f88e0a00212ff50;p=mesa.git

diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template
index b5a9938c740..036c11986ee 100644
--- 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,8 +40,8 @@ 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
-	$(LD) $(filter %.o,$^) -o $@ -Wl,--start-group  $(LIBS) -Wl,--end-group
+$(PROGS): % : %.o $(PROGS_DEPS)
+	$(LD) $(LDFLAGS) $(filter %.o,$^) -o $@ -Wl,--start-group  $(LIBS) -Wl,--end-group
 
 # Emacs tags
 tags:
@@ -45,7 +49,7 @@ tags:
 
 # Remove .o and backup files
 clean:
-	rm -f $(OBJECTS) $(GENERATED_SOURCES) $(PROGS) lib$(LIBNAME).a depend depend.bak
+	rm -f $(OBJECTS) $(GENERATED_SOURCES) $(PROGS) lib$(LIBNAME).a depend depend.bak $(CLEAN_EXTRA)
 
 # Dummy target
 install: