Update to reflect changes in Makefile rules.

llvm-svn: 16950

21 files changed, 28 insertions, 29 deletions

diff --git a/llvm/tools/Makefile.am b/llvm/tools/Makefile.am
index a859c26e214..64c50f44b96 100644
--- a/llvm/tools/Makefile.am
+++ b/llvm/tools/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 SUBDIRS = analyze llvmc bugpoint extract gccas gccld llvm-bcanalyzer llc \
           llee lli llvm-ar llvm-as llvm-db llvm-dis llvm-link llvm-nm \
diff --git a/llvm/tools/analyze/Makefile.am b/llvm/tools/analyze/Makefile.am
index 7bad54c0011..b54c7b3cf78 100644
--- a/llvm/tools/analyze/Makefile.am
+++ b/llvm/tools/analyze/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = analyze
 
@@ -16,9 +16,6 @@ analyze_SOURCES = \
   analyze.cpp \
   GraphPrinters.cpp
 
-#USEDLIBS = asmparser bcreader analysis ipa datastructure scalaropts.a transforms.a \
-#           target.a scalaropts.a transformutils.a vmcore support LLVMsystem.a
-
 analyze_LDADD = \
   $(call GETOBJS,AsmParser,BCReader,Core) \
   $(call GETLIBS,Analysis,IPA,DataStructure,ScalarOpts,Transforms,Target) \
diff --git a/llvm/tools/bugpoint/Makefile.am b/llvm/tools/bugpoint/Makefile.am
index 312d4917d4f..600f854513e 100644
--- a/llvm/tools/bugpoint/Makefile.am
+++ b/llvm/tools/bugpoint/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = bugpoint
 
@@ -22,6 +22,8 @@ bugpoint_SOURCES = \
   TestPasses.cpp
 
 bugpoint_LDADD = \
-  $(call GETOBJS,AsmParser,BCReader,BCWriter,Core,ProfilePaths) \
-  $(call GETLIBS,IPO,ScalarOpts,Analysis,Transforms,Instrument) \
-  $(call GETLIBS,DataStructure,IPA,Target,TransformUtils,Support,System)
+  $(call GETOBJS,IPO,ScalarOpts,Analysis,Transforms,Instrument,ProfilePaths) \
+  $(call GETOBJS,DataStructure,IPA) \
+  $(call GETLIBS,Target) \
+  $(call GETOBJS,TransformUtils,AsmParser,BCReader,BCWriter,Core) \
+  $(call GETLIBS,Support,System)
diff --git a/llvm/tools/extract/Makefile.am b/llvm/tools/extract/Makefile.am
index 56977c15b73..9af226a8005 100644
--- a/llvm/tools/extract/Makefile.am
+++ b/llvm/tools/extract/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = extract
 
diff --git a/llvm/tools/gccas/Makefile.am b/llvm/tools/gccas/Makefile.am
index b6b6d0b834b..64ac578a019 100644
--- a/llvm/tools/gccas/Makefile.am
+++ b/llvm/tools/gccas/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = gccas
 
diff --git a/llvm/tools/gccld/Makefile.am b/llvm/tools/gccld/Makefile.am
index e88b9abfed3..0f98ab13188 100644
--- a/llvm/tools/gccld/Makefile.am
+++ b/llvm/tools/gccld/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = gccld
 
diff --git a/llvm/tools/llc/Makefile.am b/llvm/tools/llc/Makefile.am
index 2513cad4825..6aacba6d101 100644
--- a/llvm/tools/llc/Makefile.am
+++ b/llvm/tools/llc/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llc
 
diff --git a/llvm/tools/llee/Makefile.am b/llvm/tools/llee/Makefile.am
index 36700ff50de..d085c87c363 100644
--- a/llvm/tools/llee/Makefile.am
+++ b/llvm/tools/llee/Makefile.am
@@ -7,11 +7,11 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
-lib_LIBRARIES = libexecve.a
+lib_LTLIBRARIES = libexecve.la
 
-libexecve_a_SOURCES = ExecveHandler.c StorageProxy.c SysUtils.c
+libexecve_la_SOURCES = ExecveHandler.c StorageProxy.c SysUtils.c
 
 all: llee
 
diff --git a/llvm/tools/lli/Makefile.am b/llvm/tools/lli/Makefile.am
index 9fa36eeb7c3..e310951f3de 100644
--- a/llvm/tools/lli/Makefile.am
+++ b/llvm/tools/lli/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = lli
 
diff --git a/llvm/tools/llvm-ar/Makefile.am b/llvm/tools/llvm-ar/Makefile.am
index abc639911c1..1bc5844e73d 100644
--- a/llvm/tools/llvm-ar/Makefile.am
+++ b/llvm/tools/llvm-ar/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-ar
 
diff --git a/llvm/tools/llvm-as/Makefile.am b/llvm/tools/llvm-as/Makefile.am
index 52831f44991..31a8487159e 100644
--- a/llvm/tools/llvm-as/Makefile.am
+++ b/llvm/tools/llvm-as/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-as
 
diff --git a/llvm/tools/llvm-bcanalyzer/Makefile.am b/llvm/tools/llvm-bcanalyzer/Makefile.am
index a898f7eefa0..cb83e9c6939 100644
--- a/llvm/tools/llvm-bcanalyzer/Makefile.am
+++ b/llvm/tools/llvm-bcanalyzer/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-bcanalyzer
 
diff --git a/llvm/tools/llvm-db/Makefile.am b/llvm/tools/llvm-db/Makefile.am
index a7a5ed8162a..42d7d418de7 100644
--- a/llvm/tools/llvm-db/Makefile.am
+++ b/llvm/tools/llvm-db/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-db
 
diff --git a/llvm/tools/llvm-dis/Makefile.am b/llvm/tools/llvm-dis/Makefile.am
index e379c1c86a2..de606dd06c9 100644
--- a/llvm/tools/llvm-dis/Makefile.am
+++ b/llvm/tools/llvm-dis/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-dis
 
diff --git a/llvm/tools/llvm-ld/Makefile.am b/llvm/tools/llvm-ld/Makefile.am
index 678c064733e..c6aa9931c99 100644
--- a/llvm/tools/llvm-ld/Makefile.am
+++ b/llvm/tools/llvm-ld/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-ld
 
diff --git a/llvm/tools/llvm-link/Makefile.am b/llvm/tools/llvm-link/Makefile.am
index 575ff28a20b..cc285a9a94b 100644
--- a/llvm/tools/llvm-link/Makefile.am
+++ b/llvm/tools/llvm-link/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-link
 
diff --git a/llvm/tools/llvm-nm/Makefile.am b/llvm/tools/llvm-nm/Makefile.am
index 57f7650314e..d04c7607643 100644
--- a/llvm/tools/llvm-nm/Makefile.am
+++ b/llvm/tools/llvm-nm/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-nm
 
diff --git a/llvm/tools/llvm-prof/Makefile.am b/llvm/tools/llvm-prof/Makefile.am
index 1e942d37bd2..2465361ec98 100644
--- a/llvm/tools/llvm-prof/Makefile.am
+++ b/llvm/tools/llvm-prof/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-prof
 
diff --git a/llvm/tools/llvm-stub/Makefile.am b/llvm/tools/llvm-stub/Makefile.am
index e4c867d014f..aa5119cc6ca 100644
--- a/llvm/tools/llvm-stub/Makefile.am
+++ b/llvm/tools/llvm-stub/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvm-stub
 
diff --git a/llvm/tools/llvmc/Makefile.am b/llvm/tools/llvmc/Makefile.am
index ac1b398fff0..125e041aea7 100644
--- a/llvm/tools/llvmc/Makefile.am
+++ b/llvm/tools/llvmc/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = llvmc
 
diff --git a/llvm/tools/opt/Makefile.am b/llvm/tools/opt/Makefile.am
index 14cbaade0ef..9c37905ded4 100644
--- a/llvm/tools/opt/Makefile.am
+++ b/llvm/tools/opt/Makefile.am
@@ -7,7 +7,7 @@
 # 
 #===------------------------------------------------------------------------===#
 
-include $(top_srcdir)/Makefile.rules.am
+include $(top_srcdir)/Makefile_config
 
 bin_PROGRAMS = opt