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 bf4483f..9cf483c 100644
--- a/lib/ExecutionEngine/Makefile
+++ b/lib/ExecutionEngine/Makefile
@@ -1,11 +1,6 @@
LEVEL = ../..
+TOOLNAME = lli
+USEDLIBS = opt bcreader bcwriter vmcore asmwriter analysis support target
+
include $(LEVEL)/Makefile.common
-all:: lli
-clean::
- rm -f lli
-
-lli : $(ObjectsG)
- $(LinkG) -o $@ $(ObjectsG) \
- -lopt -lbcreader -lbcwriter \
- -lvmcore -lasmwriter -lanalysis -lsupport -ltarget
diff --git a/tools/analyze/Makefile b/tools/analyze/Makefile
index 1ff0e53..98599b3 100644
--- a/tools/analyze/Makefile
+++ b/tools/analyze/Makefile
@@ -1,13 +1,6 @@
LEVEL = ../..
+TOOLNAME = analyze
+USEDLIBS = opt asmparser bcreader vmcore asmwriter analysis opt support
+
include $(LEVEL)/Makefile.common
-all:: analyze
-clean ::
- rm -f analyze
-
-LIBDEPS = ../../lib/Optimizations/Debug/libopt.a ../../lib/Analysis/Debug/libanalysis.a
-
-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 74bfc68..b1d71e0 100644
--- a/tools/as/Makefile
+++ b/tools/as/Makefile
@@ -1,10 +1,6 @@
LEVEL = ../..
+
+TOOLNAME = as
+USEDLIBS = asmparser bcwriter asmwriter analysis vmcore support
+
include $(LEVEL)/Makefile.common
-
-all:: as
-clean::
- rm -f as
-
-as : $(ObjectsG) ../../lib/Assembly/Parser/Debug/libasmparser.a \
- ../../lib/VMCore/Debug/libvmcore.a
- $(LinkG) -o as $(ObjectsG) -lasmparser -lbcwriter -lasmwriter -lanalysis -lvmcore -lsupport
diff --git a/tools/dis/Makefile b/tools/dis/Makefile
index 8ce3e21..ef65811 100644
--- a/tools/dis/Makefile
+++ b/tools/dis/Makefile
@@ -1,10 +1,7 @@
LEVEL = ../..
+
+TOOLNAME = dis
+USEDLIBS = bcreader asmwriter analysis vmcore support
include $(LEVEL)/Makefile.common
-all:: dis
-clean ::
- rm -f dis
-
-dis : $(ObjectsG)
- $(LinkG) -o $@ $(ObjectsG) -lbcreader -lasmwriter -lanalysis -lvmcore -lsupport
diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index ea6ac95..e0cce9a 100644
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -1,12 +1,6 @@
LEVEL = ../..
+TOOLNAME = llc
+USEDLIBS = sched select sparc target opt livevar bcreader vmcore asmwriter analysis support
+
include $(LEVEL)/Makefile.common
-all:: llc
-clean::
- rm -f llc
-
-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 bf4483f..9cf483c 100644
--- a/tools/lli/Makefile
+++ b/tools/lli/Makefile
@@ -1,11 +1,6 @@
LEVEL = ../..
+TOOLNAME = lli
+USEDLIBS = opt bcreader bcwriter vmcore asmwriter analysis support target
+
include $(LEVEL)/Makefile.common
-all:: lli
-clean::
- rm -f lli
-
-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 74bfc68..b1d71e0 100644
--- a/tools/llvm-as/Makefile
+++ b/tools/llvm-as/Makefile
@@ -1,10 +1,6 @@
LEVEL = ../..
+
+TOOLNAME = as
+USEDLIBS = asmparser bcwriter asmwriter analysis vmcore support
+
include $(LEVEL)/Makefile.common
-
-all:: as
-clean::
- rm -f as
-
-as : $(ObjectsG) ../../lib/Assembly/Parser/Debug/libasmparser.a \
- ../../lib/VMCore/Debug/libvmcore.a
- $(LinkG) -o as $(ObjectsG) -lasmparser -lbcwriter -lasmwriter -lanalysis -lvmcore -lsupport
diff --git a/tools/llvm-dis/Makefile b/tools/llvm-dis/Makefile
index 8ce3e21..ef65811 100644
--- a/tools/llvm-dis/Makefile
+++ b/tools/llvm-dis/Makefile
@@ -1,10 +1,7 @@
LEVEL = ../..
+
+TOOLNAME = dis
+USEDLIBS = bcreader asmwriter analysis vmcore support
include $(LEVEL)/Makefile.common
-all:: dis
-clean ::
- rm -f dis
-
-dis : $(ObjectsG)
- $(LinkG) -o $@ $(ObjectsG) -lbcreader -lasmwriter -lanalysis -lvmcore -lsupport
diff --git a/tools/opt/Makefile b/tools/opt/Makefile
index 658b299..d374f0a 100644
--- a/tools/opt/Makefile
+++ b/tools/opt/Makefile
@@ -1,10 +1,6 @@
LEVEL = ../..
+TOOLNAME = opt
+USEDLIBS = opt bcreader bcwriter asmwriter analysis vmcore support
+
include $(LEVEL)/Makefile.common
-all:: opt
-clean ::
- rm -f opt
-
-opt : $(ObjectsG) ../../lib/Optimizations/Debug/libopt.a
- $(LinkG) -o $@ $(ObjectsG) -lopt -lbcreader -lbcwriter \
- -lasmwriter -lanalysis -lvmcore -lsupport