Make Stacker makefiles more compliant with LLVM standards.

Fix linkage problems after libLLVMTransforms.a was removed.

llvm-svn: 33887

9 files changed, 79 insertions, 46 deletions

diff --git a/stacker/Makefile b/stacker/Makefile
index 9b0872b8dbe..3bea34664de 100644
--- a/stacker/Makefile
+++ b/stacker/Makefile
@@ -1,4 +1,11 @@
-##===- projects/Stacker/Makefile ---------------------------*- Makefile -*-===##
+#===-- projects/llvm-stacker/Makefile -----------------------*- Makefile -*-===#
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file was developed by Reid Spencer and is distributed under the 
+# University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+#===------------------------------------------------------------------------===#
 #
 # This is the Stacker top-level Makefile
 #
diff --git a/stacker/Makefile.common.in b/stacker/Makefile.common.in
index 6620f5b4d86..46eea656334 100644
--- a/stacker/Makefile.common.in
+++ b/stacker/Makefile.common.in
@@ -1,3 +1,11 @@
+#===-- projects/llvm-stacker/Makefile.common.in -------------*- Makefile -*-===#
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file was developed by Reid Spencer and is distributed under the 
+# University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+#===------------------------------------------------------------------------===#
 # Set the name of the project here
 PROJECT_NAME := Stacker
 
diff --git a/stacker/lib/Makefile b/stacker/lib/Makefile
index 3a9a470a108..7c6d403e40a 100644
--- a/stacker/lib/Makefile
+++ b/stacker/lib/Makefile
@@ -1,8 +1,15 @@
-##===- projects/Stacker/lib/Makefile -----------------------*- Makefile -*-===##
+#===-- projects/llvm-stacker/lib/Makefile -------------------*- Makefile -*-===#
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file was developed by Reid Spencer and is distributed under the 
+# University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+#===------------------------------------------------------------------------===#
 #
 # Compile Stacker libraries
 #
-##===----------------------------------------------------------------------===##
+#===------------------------------------------------------------------------===#
 
 LEVEL = ..
 DIRS = compiler runtime
@@ -13,4 +20,3 @@ include $(LEVEL)/Makefile.common
 ifeq ($(strip $(LLVMGCC)),)
   DIRS := $(filter-out runtime, $(DIRS))
 endif
-
diff --git a/stacker/lib/compiler/Makefile b/stacker/lib/compiler/Makefile
index 11276c1517c..a982a658140 100644
--- a/stacker/lib/compiler/Makefile
+++ b/stacker/lib/compiler/Makefile
@@ -1,4 +1,11 @@
-##===- projects/Stacker/lib/compiler/Makefile --------------*- Makefile -*-===##
+#===-- projects/llvm-stacker/lib/compiler/Makefile ----------*- Makefile -*-===#
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file was developed by Reid Spencer and is distributed under the 
+# University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+#===------------------------------------------------------------------------===#
 
 LEVEL := ../..
 LIBRARYNAME := stkr_compiler
diff --git a/stacker/lib/runtime/Makefile b/stacker/lib/runtime/Makefile
index d3ebf18fc55..8fed39a1e5b 100644
--- a/stacker/lib/runtime/Makefile
+++ b/stacker/lib/runtime/Makefile
@@ -1,11 +1,11 @@
-##===- projects/Stacker/lib/runtime/Makefile ---------------*- Makefile -*-===##
-# 
+#===-- projects/llvm-stacker/lib/runtime/Makefile -----------*- Makefile -*-===#
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file was developed by Reid Spencer and is distributed under the 
 # University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
-##===----------------------------------------------------------------------===##
+#===------------------------------------------------------------------------===#
 
 LEVEL = ../..
 DONT_BUILD_RELINKED = 1
diff --git a/stacker/samples/Makefile b/stacker/samples/Makefile
index e885eb99e82..40073ce76dc 100644
--- a/stacker/samples/Makefile
+++ b/stacker/samples/Makefile
@@ -1,12 +1,17 @@
-##===- projects/sample/Makefile ----------------------------*- Makefile -*-===##
+#===-- projects/llvm-stacker/samples/Makefile ---------------*- Makefile -*-===#
 #
-# This is a sample Makefile for a project that uses LLVM.
+#                     The LLVM Compiler Infrastructure
 #
-##===----------------------------------------------------------------------===##
-
+# This file was developed by Reid Spencer and is distributed under the 
+# University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+#===------------------------------------------------------------------------===#
 #
-# Indicates our relative path to the top of the project's root directory.
+# This makefile builds some sample stacker programs.
 #
+#===------------------------------------------------------------------------===#
+
+# Indicates our relative path to the top of the project's root directory.
 LEVEL = ../../..
 DIRS = 
 
diff --git a/stacker/test/Makefile b/stacker/test/Makefile
index 52112cba200..57b1838a37f 100644
--- a/stacker/test/Makefile
+++ b/stacker/test/Makefile
@@ -1,22 +1,23 @@
-##===- projects/Stacker/test/Makefile ----------------------*- Makefile -*-===##
+#===-- projects/llvm-stacker/test/Makefile ------------------*- Makefile -*-===#
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file was developed by Reid Spencer and is distributed under the 
+# University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+#===------------------------------------------------------------------------===#
 #
 # This is the makefile that tests the various facilities of the Stacker language
 #
-##===----------------------------------------------------------------------===##
+#===------------------------------------------------------------------------===#
 
-#
 # Indicates our relative path to the top of the project's root directory.
-#
 LEVEL = ../
 
-#
 # Directories that need to be built.
-#
 DIRS =
 
-#
 # Include the Master Makefile that knows how to build all.
-#
 include $(LEVEL)/Makefile.common
 
 LOGIC_TESTS = eq ne le ge gt lt false true
diff --git a/stacker/tools/Makefile b/stacker/tools/Makefile
index 39d33dc0831..2051c90785f 100644
--- a/stacker/tools/Makefile
+++ b/stacker/tools/Makefile
@@ -1,20 +1,16 @@
-##===- projects/Stacker/tools/Makefile ---------------------*- Makefile -*-===##
+#===-- projects/llvm-stacker/tools/Makefile -----------------*- Makefile -*-===#
 #
-# This is the stacker tools makefile
+#                     The LLVM Compiler Infrastructure
 #
-##===----------------------------------------------------------------------===##
+# This file was developed by Reid Spencer and is distributed under the 
+# University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+#===------------------------------------------------------------------------===#
 
-#
 # Indicates our relative path to the top of the project's root directory.
-#
 LEVEL = ..
 
-#
-# Directories that needs to be built.
-#
+# Directories that need to be built.
 DIRS = stkrc
 
-#
-# Include the Master Makefile that knows how to build all.
-#
 include $(LEVEL)/Makefile.common
diff --git a/stacker/tools/stkrc/Makefile b/stacker/tools/stkrc/Makefile
index 643e5d2471f..57ed5eff95c 100644
--- a/stacker/tools/stkrc/Makefile
+++ b/stacker/tools/stkrc/Makefile
@@ -1,22 +1,29 @@
-##===- projects/Stacker/lib/stkrc/Makefile -----------------*- Makefile -*-===##
-
+#===-- projects/llvm-stacker/tools/stkrc/Makefile -----------*- Makefile -*-===#
 #
-# Indicate where we are relative to the top of the source tree.
+#                     The LLVM Compiler Infrastructure
 #
+# This file was developed by Reid Spencer and is distributed under the 
+# University of Illinois Open Source License. See LICENSE.TXT for details.
+# 
+#===------------------------------------------------------------------------===#
+
+# Indicate where we are relative to the top of the source tree.
 LEVEL=../..
 
-#
 # Give the name of a library.  This will build a dynamic version.
-#
 TOOLNAME = stkrc
-LLVMLIBS = LLVMAsmParser.a LLVMBCWriter.a LLVMipo.a LLVMScalarOpts.a \
-	  LLVMTransforms.a LLVMTransformUtils.a LLVMipa.a LLVMAnalysis.a \
-	  LLVMTarget.a LLVMCore.a LLVMSupport.a LLVMbzip2.a LLVMSystem.a 
+
+# Define the link components
+USEDLIBS=stkr_compiler 
+LINK_COMPONENTS = asmparser bcwriter ipo scalaropts \
+		  transformutils ipa analysis target $(TARGETS_TO_BUILD) core
+
+# Define our configuration files
 CONFIG_FILES = st
 EXTRA_DIST = st
-USEDLIBS=stkr_compiler 
-REQUIRES_EH := 1
 
+# We need exception handling
+REQUIRES_EH := 1
 
 ifdef PARSE_DEBUG
 CPPFLAGS = -DPARSE_DEBUG=1
@@ -26,8 +33,4 @@ ifdef FLEX_DEBUG
 CPPFLAGS += -DFLEX_DEBUG=1
 endif
 
-#
-# Include Makefile.common so we know what to do.
-#
 include $(LEVEL)/Makefile.common
-