DONT_BUILD_RELINKED is gone and implied by BUILD_ARCHIVE now
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23940 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/IPA/Makefile b/lib/Analysis/IPA/Makefile
index b7a6f76..786e743 100644
--- a/lib/Analysis/IPA/Makefile
+++ b/lib/Analysis/IPA/Makefile
@@ -6,10 +6,9 @@
# the University of Illinois Open Source License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
+
LEVEL = ../../..
LIBRARYNAME = LLVMipa
BUILD_ARCHIVE = 1
-DONT_BUILD_RELINKED = 1
-
include $(LEVEL)/Makefile.common
diff --git a/lib/Analysis/Makefile b/lib/Analysis/Makefile
index 4ec6b06..b679b57 100644
--- a/lib/Analysis/Makefile
+++ b/lib/Analysis/Makefile
@@ -11,7 +11,6 @@
LIBRARYNAME = LLVMAnalysis
PARALLEL_DIRS = IPA DataStructure
BUILD_ARCHIVE = 1
-DONT_BUILD_RELINKED = 1
include $(LEVEL)/Makefile.common
diff --git a/lib/Archive/Makefile b/lib/Archive/Makefile
index 9b6b3a9..e8cc803 100644
--- a/lib/Archive/Makefile
+++ b/lib/Archive/Makefile
@@ -13,6 +13,5 @@
# We only want an archive so only those modules actually used by a tool are
# included.
BUILD_ARCHIVE = 1
-DONT_BUILD_RELINKED = 1
include $(LEVEL)/Makefile.common
diff --git a/lib/Bytecode/Archive/Makefile b/lib/Bytecode/Archive/Makefile
index 9b6b3a9..e8cc803 100644
--- a/lib/Bytecode/Archive/Makefile
+++ b/lib/Bytecode/Archive/Makefile
@@ -13,6 +13,5 @@
# We only want an archive so only those modules actually used by a tool are
# included.
BUILD_ARCHIVE = 1
-DONT_BUILD_RELINKED = 1
include $(LEVEL)/Makefile.common
diff --git a/lib/Linker/Makefile b/lib/Linker/Makefile
index 688c832..efa2c35 100644
--- a/lib/Linker/Makefile
+++ b/lib/Linker/Makefile
@@ -6,10 +6,10 @@
# University of Illinois Open Source License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
+
LEVEL = ../..
LIBRARYNAME = LLVMLinker
BUILD_ARCHIVE := 1
-DONT_BUILD_RELINKED := 1
include $(LEVEL)/Makefile.common
diff --git a/lib/Support/Makefile b/lib/Support/Makefile
index 30862aa..6b96056 100644
--- a/lib/Support/Makefile
+++ b/lib/Support/Makefile
@@ -6,10 +6,10 @@
# the University of Illinois Open Source License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
+
LEVEL = ../..
PARALLEL_DIRS=bzip2
LIBRARYNAME = LLVMSupport
BUILD_ARCHIVE = 1
-DONT_BUILD_RELINKED := 1
include $(LEVEL)/Makefile.common
diff --git a/lib/System/Makefile b/lib/System/Makefile
index b03de17..80fea39 100644
--- a/lib/System/Makefile
+++ b/lib/System/Makefile
@@ -6,10 +6,10 @@
# University of Illinois Open Source License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
+
LEVEL = ../..
LIBRARYNAME = LLVMSystem
BUILD_ARCHIVE = 1
-DONT_BUILD_RELINKED = 1
EXTRA_DIST = Unix Win32
diff --git a/lib/Target/Makefile b/lib/Target/Makefile
index d0efc98..8b75294 100644
--- a/lib/Target/Makefile
+++ b/lib/Target/Makefile
@@ -6,10 +6,10 @@
# the University of Illinois Open Source License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
+
LEVEL = ../..
LIBRARYNAME = LLVMTarget
BUILD_ARCHIVE = 1
-DONT_BUILD_RELINKED = 1
# We include this early so we can access the value of TARGETS_TO_BUILD as the
# value for PARALLEL_DIRS which must be set before Makefile.rules is included
diff --git a/lib/Transforms/IPO/Makefile b/lib/Transforms/IPO/Makefile
index 7bf5379..22a76d3 100644
--- a/lib/Transforms/IPO/Makefile
+++ b/lib/Transforms/IPO/Makefile
@@ -6,10 +6,10 @@
# the University of Illinois Open Source License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
+
LEVEL = ../../..
LIBRARYNAME = LLVMipo
BUILD_ARCHIVE = 1
-DONT_BUILD_RELINKED = 1
include $(LEVEL)/Makefile.common
diff --git a/lib/Transforms/Instrumentation/Makefile b/lib/Transforms/Instrumentation/Makefile
index 9ab805c..beba7e5 100644
--- a/lib/Transforms/Instrumentation/Makefile
+++ b/lib/Transforms/Instrumentation/Makefile
@@ -6,11 +6,11 @@
# the University of Illinois Open Source License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
+
LEVEL = ../../..
LIBRARYNAME = LLVMInstrumentation
PARALLEL_DIRS = ProfilePaths
BUILD_ARCHIVE = 1
-DONT_BUILD_RELINKED = 1
include $(LEVEL)/Makefile.common
diff --git a/lib/Transforms/Makefile b/lib/Transforms/Makefile
index 0493e9a..c63bb7f 100644
--- a/lib/Transforms/Makefile
+++ b/lib/Transforms/Makefile
@@ -6,11 +6,11 @@
# the University of Illinois Open Source License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
+
LEVEL = ../..
PARALLEL_DIRS = Utils Instrumentation Scalar IPO
LIBRARYNAME = LLVMTransforms
BUILD_ARCHIVE = 1
-DONT_BUILD_RELINKED = 1
include $(LEVEL)/Makefile.common
diff --git a/lib/Transforms/Scalar/Makefile b/lib/Transforms/Scalar/Makefile
index f327b85..79643c4 100644
--- a/lib/Transforms/Scalar/Makefile
+++ b/lib/Transforms/Scalar/Makefile
@@ -6,10 +6,10 @@
# the University of Illinois Open Source License. See LICENSE.TXT for details.
#
##===----------------------------------------------------------------------===##
+
LEVEL = ../../..
LIBRARYNAME = LLVMScalarOpts
BUILD_ARCHIVE = 1
-DONT_BUILD_RELINKED = 1
include $(LEVEL)/Makefile.common
diff --git a/lib/Transforms/Utils/Makefile b/lib/Transforms/Utils/Makefile
index b78e89e..26fc426 100644
--- a/lib/Transforms/Utils/Makefile
+++ b/lib/Transforms/Utils/Makefile
@@ -10,7 +10,6 @@
LEVEL = ../../..
LIBRARYNAME = LLVMTransformUtils
BUILD_ARCHIVE = 1
-DONT_BUILD_RELINKED = 1
include $(LEVEL)/Makefile.common