Make Stacker makefiles more compliant with LLVM standards.

Fix linkage problems after libLLVMTransforms.a was removed.

llvm-svn: 33887
This commit is contained in:
Reid Spencer 2007-02-04 22:25:16 +00:00
parent 1e86e65b83
commit 4087017e4f
9 changed files with 79 additions and 46 deletions

View File

@ -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
#

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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.
#
#===------------------------------------------------------------------------===#
#
# This makefile builds some sample stacker programs.
#
#===------------------------------------------------------------------------===#
#
# Indicates our relative path to the top of the project's root directory.
#
LEVEL = ../../..
DIRS =

View File

@ -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

View File

@ -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

View File

@ -1,22 +1,29 @@
##===- projects/Stacker/lib/stkrc/Makefile -----------------*- Makefile -*-===##
#===-- projects/llvm-stacker/tools/stkrc/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.
#
#===------------------------------------------------------------------------===#
#
# 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