Make use of the new TOOLNAME/USEDLIBS options provided in Makefile.common

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@501 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/ExecutionEngine/Makefile b/lib/ExecutionEngine/Makefile
index bf4483f5b4d4445c2fc40c8d61442d241f63ebbe..9cf483c479fb04072ab0d43bc4e3ae8f3c758bfb 100644 (file)
--- a/lib/ExecutionEngine/Makefile
+++ b/lib/ExecutionEngine/Makefile
@@ -1,11 +1,6 @@
 LEVEL = ../..
-include $(LEVEL)/Makefile.common
+TOOLNAME = lli
+USEDLIBS = opt bcreader bcwriter vmcore asmwriter analysis support target
 
-all:: lli
-clean::        
-       rm -f lli
+include $(LEVEL)/Makefile.common
 
-lli : $(ObjectsG)
-       $(LinkG) -o $@ $(ObjectsG) \
-               -lopt -lbcreader -lbcwriter \
-               -lvmcore -lasmwriter -lanalysis -lsupport -ltarget

diff --git a/tools/analyze/Makefile b/tools/analyze/Makefile
index 1ff0e53fd8f47622ebea2f3c982e13ac1096c121..98599b36ae1a0b4f21c7fa354d6a9553e790ff74 100644 (file)
--- a/tools/analyze/Makefile
+++ b/tools/analyze/Makefile
@@ -1,13 +1,6 @@
 LEVEL = ../..
-include $(LEVEL)/Makefile.common
-
-all:: analyze
-clean ::
-       rm -f analyze
+TOOLNAME = analyze
+USEDLIBS = opt asmparser bcreader vmcore asmwriter analysis opt support
 
-LIBDEPS =  ../../lib/Optimizations/Debug/libopt.a  ../../lib/Analysis/Debug/libanalysis.a
+include $(LEVEL)/Makefile.common
 
-analyze : $(ObjectsG) Debug/.dir Depend/.dir $(LIBDEPS)
-       $(LinkG) -o $@ $(ObjectsG) -lopt -lasmparser \
-                                  -lbcreader -lvmcore -lasmwriter -lanalysis \
-                                   -lopt -lsupport

diff --git a/tools/as/Makefile b/tools/as/Makefile
index 74bfc6844f2ed041bef3f8368cfdbae0888094fe..b1d71e05b04e9fe163f6c2dcf1722fb42ecc6a69 100644 (file)
--- a/tools/as/Makefile
+++ b/tools/as/Makefile
@@ -1,10 +1,6 @@
 LEVEL = ../..
-include $(LEVEL)/Makefile.common
 
-all:: as
-clean::
-       rm -f as
+TOOLNAME = as
+USEDLIBS = asmparser bcwriter asmwriter analysis vmcore  support
 
-as : $(ObjectsG) ../../lib/Assembly/Parser/Debug/libasmparser.a \
-                ../../lib/VMCore/Debug/libvmcore.a
-       $(LinkG) -o as $(ObjectsG) -lasmparser -lbcwriter -lasmwriter -lanalysis -lvmcore  -lsupport
+include $(LEVEL)/Makefile.common

diff --git a/tools/dis/Makefile b/tools/dis/Makefile
index 8ce3e2161c24c471df51b55ea12f6a2ac5a9229f..ef65811893577194c4b0d7391e4f7900d173a9c8 100644 (file)
--- a/tools/dis/Makefile
+++ b/tools/dis/Makefile
@@ -1,10 +1,7 @@
 LEVEL = ../..
-include $(LEVEL)/Makefile.common
 
-all:: dis
-clean ::
-       rm -f dis
+TOOLNAME = dis
+USEDLIBS = bcreader asmwriter analysis vmcore support
+include $(LEVEL)/Makefile.common
 
-dis : $(ObjectsG)
-       $(LinkG) -o $@ $(ObjectsG) -lbcreader -lasmwriter -lanalysis -lvmcore -lsupport
 

diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index ea6ac95e63c81a94b631567c3b067ef783cf7efe..e0cce9a97a60925bac95825524f4853f4ac7c305 100644 (file)
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -1,12 +1,6 @@
 LEVEL = ../..
-include $(LEVEL)/Makefile.common
+TOOLNAME = llc
+USEDLIBS = sched select sparc target opt livevar bcreader vmcore asmwriter analysis support
 
-all:: llc
-clean::        
-       rm -f llc
+include $(LEVEL)/Makefile.common
 
-llc : $(ObjectsG) $(LibsG)
-       $(LinkG) -o $@ $(ObjectsG) \
-               -lsched -lselect -lsparc -ltarget \
-               -lopt -llivevar -lbcreader -lbcwriter \
-               -lvmcore -lasmwriter -lanalysis -lsupport

diff --git a/tools/lli/Makefile b/tools/lli/Makefile
index bf4483f5b4d4445c2fc40c8d61442d241f63ebbe..9cf483c479fb04072ab0d43bc4e3ae8f3c758bfb 100644 (file)
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -1,11 +1,6 @@
 LEVEL = ../..
-include $(LEVEL)/Makefile.common
+TOOLNAME = lli
+USEDLIBS = opt bcreader bcwriter vmcore asmwriter analysis support target
 
-all:: lli
-clean::        
-       rm -f lli
+include $(LEVEL)/Makefile.common
 
-lli : $(ObjectsG)
-       $(LinkG) -o $@ $(ObjectsG) \
-               -lopt -lbcreader -lbcwriter \
-               -lvmcore -lasmwriter -lanalysis -lsupport -ltarget

diff --git a/tools/llvm-as/Makefile b/tools/llvm-as/Makefile
index 74bfc6844f2ed041bef3f8368cfdbae0888094fe..b1d71e05b04e9fe163f6c2dcf1722fb42ecc6a69 100644 (file)
--- a/tools/llvm-as/Makefile
+++ b/tools/llvm-as/Makefile
@@ -1,10 +1,6 @@
 LEVEL = ../..
-include $(LEVEL)/Makefile.common
 
-all:: as
-clean::
-       rm -f as
+TOOLNAME = as
+USEDLIBS = asmparser bcwriter asmwriter analysis vmcore  support
 
-as : $(ObjectsG) ../../lib/Assembly/Parser/Debug/libasmparser.a \
-                ../../lib/VMCore/Debug/libvmcore.a
-       $(LinkG) -o as $(ObjectsG) -lasmparser -lbcwriter -lasmwriter -lanalysis -lvmcore  -lsupport
+include $(LEVEL)/Makefile.common

diff --git a/tools/llvm-dis/Makefile b/tools/llvm-dis/Makefile
index 8ce3e2161c24c471df51b55ea12f6a2ac5a9229f..ef65811893577194c4b0d7391e4f7900d173a9c8 100644 (file)
--- a/tools/llvm-dis/Makefile
+++ b/tools/llvm-dis/Makefile
@@ -1,10 +1,7 @@
 LEVEL = ../..
-include $(LEVEL)/Makefile.common
 
-all:: dis
-clean ::
-       rm -f dis
+TOOLNAME = dis
+USEDLIBS = bcreader asmwriter analysis vmcore support
+include $(LEVEL)/Makefile.common
 
-dis : $(ObjectsG)
-       $(LinkG) -o $@ $(ObjectsG) -lbcreader -lasmwriter -lanalysis -lvmcore -lsupport
 

diff --git a/tools/opt/Makefile b/tools/opt/Makefile
index 658b2998ec8ab1a10fe86126ce5860f7d6ba2d28..d374f0a76d19aaaec0b431738e16cf8b0b01e815 100644 (file)
--- a/tools/opt/Makefile
+++ b/tools/opt/Makefile
@@ -1,10 +1,6 @@
 LEVEL = ../..
-include $(LEVEL)/Makefile.common
+TOOLNAME = opt
+USEDLIBS = opt bcreader bcwriter asmwriter analysis vmcore support
 
-all:: opt
-clean ::
-       rm -f opt
+include $(LEVEL)/Makefile.common
 
-opt : $(ObjectsG) ../../lib/Optimizations/Debug/libopt.a
-       $(LinkG) -o $@ $(ObjectsG) -lopt -lbcreader -lbcwriter \
-                               -lasmwriter -lanalysis -lvmcore -lsupport