15 files changed, 12 insertions, 24 deletions
diff --git a/llvm/lib/Analysis/DataStructure/Makefile b/llvm/lib/Analysis/DataStructure/Makefile
index 6822b3742d9..3c4c7e2322e 100644
--- a/llvm/lib/Analysis/DataStructure/Makefile
+++ b/llvm/lib/Analysis/DataStructure/Makefile
@@ -1,7 +1,6 @@
-
 LEVEL = ../../..
-
 LIBRARYNAME = datastructure
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/lib/Analysis/IPA/Makefile b/llvm/lib/Analysis/IPA/Makefile
index 95ea15c8eb9..80ef418edb7 100644
--- a/llvm/lib/Analysis/IPA/Makefile
+++ b/llvm/lib/Analysis/IPA/Makefile
@@ -1,7 +1,6 @@
-
 LEVEL = ../../..
-
 LIBRARYNAME = ipa
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/lib/Analysis/LiveVar/Makefile b/llvm/lib/Analysis/LiveVar/Makefile
index 81d49480802..7fdf34d50e2 100644
--- a/llvm/lib/Analysis/LiveVar/Makefile
+++ b/llvm/lib/Analysis/LiveVar/Makefile
@@ -1,6 +1,4 @@
-
 LEVEL = ../../..
-
 LIBRARYNAME = livevar
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/lib/Bytecode/Reader/Makefile b/llvm/lib/Bytecode/Reader/Makefile
index 2c79d151046..b48b4d329d5 100644
--- a/llvm/lib/Bytecode/Reader/Makefile
+++ b/llvm/lib/Bytecode/Reader/Makefile
@@ -1,6 +1,4 @@
-
 LEVEL = ../../..
-
 LIBRARYNAME = bcreader
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/lib/Bytecode/Writer/Makefile b/llvm/lib/Bytecode/Writer/Makefile
index c03db561543..76c52f465d7 100644
--- a/llvm/lib/Bytecode/Writer/Makefile
+++ b/llvm/lib/Bytecode/Writer/Makefile
@@ -1,7 +1,4 @@
-
 LEVEL = ../../..
-
 LIBRARYNAME = bcwriter
 
 include $(LEVEL)/Makefile.common
-
diff --git a/llvm/lib/ExecutionEngine/Makefile b/llvm/lib/ExecutionEngine/Makefile
index 4a5641106d0..4e47ee6a718 100644
--- a/llvm/lib/ExecutionEngine/Makefile
+++ b/llvm/lib/ExecutionEngine/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../..
 TOOLNAME = lli
-USEDLIBS = bcreader vmcore analysis support target transforms
+USEDLIBS = bcreader vmcore analysis.a support.a target.a transforms.a
 TOOLLINKOPTS = -ldl
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/lib/Support/Makefile b/llvm/lib/Support/Makefile
index c7eb8adcb19..7b263b79c88 100644
--- a/llvm/lib/Support/Makefile
+++ b/llvm/lib/Support/Makefile
@@ -1,7 +1,5 @@
 LEVEL = ../..
-
-DIRS  = 
-
 LIBRARYNAME = support
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/lib/Target/Makefile b/llvm/lib/Target/Makefile
index 7fd02c66722..3c5bf674648 100644
--- a/llvm/lib/Target/Makefile
+++ b/llvm/lib/Target/Makefile
@@ -1,5 +1,6 @@
 LEVEL = ../..
 DIRS = Sparc
 LIBRARYNAME = target
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
diff --git a/llvm/lib/Transforms/IPO/Makefile b/llvm/lib/Transforms/IPO/Makefile
index 778d2eba028..0bc3f72bcf0 100644
--- a/llvm/lib/Transforms/IPO/Makefile
+++ b/llvm/lib/Transforms/IPO/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../../..
-
 LIBRARYNAME = ipo
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/lib/Transforms/Instrumentation/Makefile b/llvm/lib/Transforms/Instrumentation/Makefile
index e0e7d7cfb46..ca48b0b2542 100644
--- a/llvm/lib/Transforms/Instrumentation/Makefile
+++ b/llvm/lib/Transforms/Instrumentation/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../..
-
 LIBRARYNAME = instrument
 DIRS = ProfilePaths 
+BUILD_ARCHIVE = 1
+
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/lib/Transforms/Instrumentation/ProfilePaths/Makefile b/llvm/lib/Transforms/Instrumentation/ProfilePaths/Makefile
index ef2fc28406e..91e1c2f8a66 100644
--- a/llvm/lib/Transforms/Instrumentation/ProfilePaths/Makefile
+++ b/llvm/lib/Transforms/Instrumentation/ProfilePaths/Makefile
@@ -1,6 +1,5 @@
 LEVEL = ../../../..
-
-DIRS = 
 LIBRARYNAME = profpaths
+
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/lib/Transforms/Makefile b/llvm/lib/Transforms/Makefile
index b9f65b2e7f4..31436216db4 100644
--- a/llvm/lib/Transforms/Makefile
+++ b/llvm/lib/Transforms/Makefile
@@ -1,7 +1,7 @@
 LEVEL = ../..
 DIRS = Utils Instrumentation Scalar IPO
-
 LIBRARYNAME = transforms
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/lib/Transforms/Scalar/Makefile b/llvm/lib/Transforms/Scalar/Makefile
index fed3412dfd3..9f73623cbdb 100644
--- a/llvm/lib/Transforms/Scalar/Makefile
+++ b/llvm/lib/Transforms/Scalar/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../../..
-
 LIBRARYNAME = scalaropts
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/lib/Transforms/Utils/Makefile b/llvm/lib/Transforms/Utils/Makefile
index f451df2d5c2..00e4170184d 100644
--- a/llvm/lib/Transforms/Utils/Makefile
+++ b/llvm/lib/Transforms/Utils/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../../..
-
 LIBRARYNAME = transformutils
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
 
diff --git a/llvm/lib/VMCore/Makefile b/llvm/lib/VMCore/Makefile
index 7d1289c4529..b0c96e90f30 100644
--- a/llvm/lib/VMCore/Makefile
+++ b/llvm/lib/VMCore/Makefile
@@ -1,6 +1,4 @@
-
 LEVEL = ../..
-
 LIBRARYNAME = vmcore
 
 include $(LEVEL)/Makefile.common