summaryrefslogtreecommitdiff
path: root/src/gallium/Makefile.template
diff options
context:
space:
mode:
authorChris Li <chrisl@vmware.com>2010-02-24 17:43:38 -0800
committerChris Li <chrisl@vmt500.localdomain>2010-03-26 15:56:02 -0700
commit8260e9a8217bf003f490b17cbd9df93bf0cc6675 (patch)
tree93242a31cd154896b7c9814055b8330f2c9ec95f /src/gallium/Makefile.template
parentd4b103e031b7647012733641b8a31c19b8b852fb (diff)
gallium/llvmpipe: add PROGS target/rule to Makefile.template
So other directory can share it. Also remove the libllvmpipe.a dependency from test programs. It is not needed any more. Signed-Off-By: Christopher Li <chrisl@vmware.com>
Diffstat (limited to 'src/gallium/Makefile.template')
-rw-r--r--src/gallium/Makefile.template7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template
index 91a9b54b36..b5a9938c74 100644
--- a/src/gallium/Makefile.template
+++ b/src/gallium/Makefile.template
@@ -26,7 +26,7 @@ INCLUDES = \
##### TARGETS #####
-default: depend lib$(LIBNAME).a
+default: depend lib$(LIBNAME).a $(PROGS)
lib$(LIBNAME).a: $(OBJECTS) $(EXTRA_OBJECTS) Makefile $(TOP)/src/gallium/Makefile.template
$(MKLIB) -o $(LIBNAME) -static $(OBJECTS) $(EXTRA_OBJECTS)
@@ -36,13 +36,16 @@ 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
+
# Emacs tags
tags:
etags `find . -name \*.[ch]` `find $(TOP)/src/gallium/include -name \*.h`
# Remove .o and backup files
clean:
- rm -f $(OBJECTS) $(GENERATED_SOURCES) lib$(LIBNAME).a depend depend.bak
+ rm -f $(OBJECTS) $(GENERATED_SOURCES) $(PROGS) lib$(LIBNAME).a depend depend.bak
# Dummy target
install: