X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.common;h=afe6990256a26320f0da9adf76ffaa94f7cf34cb;hb=43234493ded1abf9cdfa4071589f7a7a82dd368a;hp=0197af2226028ea0c170e348e27719623662e243;hpb=794fcd2ef8b8155faab218584ca46801d75c0161;p=oota-llvm.git

diff --git a/Makefile.common b/Makefile.common
index 0197af22260..afe6990256a 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -30,75 +30,150 @@
 #    are in, if they are not in the current directory.  This should include a
 #    trailing / character.
 #
-# 6. PROJ_COMPILE - If set to 1, then this makefile can also be used to
-#    compile other projects using llvm. Note if this option is set then the
-#    following *must* hold
-#    PROJLEVEL should be set to the top of the source directory for the
-#               project files 
-#    LEVEL should be set to the top of LLVM source tree
-#    LLVM_LIB_DIR should be set to the top of the LLVM build tree
-#
-#    
+# 6. LLVM_SRC_ROOT - If specified, points to the top of the LLVM source tree.
+#
+# 7. LLVM_OBJ_ROOT - If specified, points to the top directory where LLVM
+#    object files are placed.
+#
+# 8. BUILD_SRC_DIR - The directory which contains the current set of Makefiles
+#    and usually the source code too (unless SourceDir is set).
+#
+# 9. BUILD_SRC_ROOT - The root directory of the source code being compiled.
+#
+# 10. BUILD_OBJ_DIR - The directory where object code should be placed.
+#
+# 11. BUILD_OBJ_ROOT - The root directory for where object code should be
+#     placed.
+#
+# For building,
+# 	LLVM, LLVM_SRC_ROOT = BUILD_SRC_ROOT, and
+# 	LLVM_OBJ_ROOT = BUILD_OBJ_ROOT.
 #===-----------------------------------------------------------------------====
 
+#
 # Configuration file to set paths specific to local installation of LLVM
 # 
 include $(LEVEL)/Makefile.config
 
-# Figure out how to do platform specific stuff on this platform.  This is really
-# gross and should be autoconfiscated (automake actually), but should hopefully
-# work on Linux and solaris (SunOS).
+###########################################################################
+# Directory Configuration
+#	This section of the Makefile determines what is where.  To be
+#	specific, there are several locations that need to be defined:
+#
+#	o LLVM_SRC_ROOT  : The root directory of the LLVM source code.
+#	o LLVM_OBJ_ROOT  : The root directory containing the built LLVM code.
+#
+#	o BUILD_SRC_DIR  : The directory containing the code to build.
+#	o BUILD_SRC_ROOT : The root directory of the code to build.
 #
-UNAME := $(shell uname)
-include $(LEVEL)/Makefile.$(UNAME)
+#	o BUILD_OBJ_DIR  : The directory in which compiled code will be placed.
+#	o BUILD_OBJ_ROOT : The root directory in which compiled code is placed.
+#
+###########################################################################
 
-ifdef SHARED_LIBRARY
-# if SHARED_LIBRARY is specified, the default is to build the dynamic lib
-dynamic ::
+#
+# Set the source build directory.  That is almost always the current directory.
+#
+ifndef BUILD_SRC_DIR
+BUILD_SRC_DIR = $(shell pwd)
 endif
 
-# Default Rule:  Make sure it's also a :: rule
-all ::
-
-# Default for install is to at least build everything...
-install ::
-
-
-# Figure out which directory to build stuff into.  We want to build into the
-# /shared directory by default because it is guaranteed to be local to the
-# current machine.
 #
+# Set the source root directory.
+#
+ifndef BUILD_SRC_ROOT
+BUILD_SRC_ROOT = $(shell cd $(BUILD_SRC_DIR)/$(LEVEL); pwd)
+endif
 
-ifeq ($(LLVM_OBJ_DIR),.)
-BUILD_ROOT     = $(LLVM_OBJ_DIR)
+#
+# Determine the path of the source tree relative from $HOME (the mythical
+# home directory).
+#
+HOME_OBJ_ROOT := $(OBJ_ROOT)$(patsubst $(HOME)%,%,$(BUILD_SRC_ROOT))
 
-ifdef PROJ_COMPILE
-BUILD_ROOT_TOP = $(PROJLEVEL)
+#
+# Set the object build directory.  Its location depends upon the source path
+# and where object files should go.
+#
+ifndef BUILD_OBJ_DIR
+ifeq ($(OBJ_ROOT),.)
+BUILD_OBJ_DIR = $(BUILD_SRC_DIR)
 else
-BUILD_ROOT_TOP = $(LEVEL)
-endif 
+BUILD_OBJ_DIR := $(HOME_OBJ_ROOT)$(patsubst $(BUILD_SRC_ROOT)%,%,$(BUILD_SRC_DIR))
+endif
+endif
 
+#
+# Set the root of the object directory.
+#
+ifndef BUILD_OBJ_ROOT
+ifeq ($(OBJ_ROOT),.)
+BUILD_OBJ_ROOT = $(BUILD_SRC_ROOT)
 else
+BUILD_OBJ_ROOT := $(HOME_OBJ_ROOT)
+endif
+endif
 
-BUILD_ROOT := $(LLVM_OBJ_DIR)$(patsubst $(HOME)%,%,$(shell pwd))
+#
+# Set the LLVM source directory.
+# It is typically the root directory of what we're compiling now.
+#
+ifndef LLVM_SRC_ROOT
+LLVM_SRC_ROOT = $(BUILD_SRC_ROOT)
+endif
 
-# Calculate the BUILD_ROOT_TOP variable, which is the top of the llvm/ tree.
-# Note that although this is just equal to $(BUILD_ROOT)/$(LEVEL), we cannot use
-# this expression because some of the directories on the source tree may not
-# exist in the build tree (for example the test/ heirarchy).  Thus we evaluate
-# the directory to eliminate the ../'s
 #
-ifdef PROJ_COMPILE
-TOP_DIRECTORY := $(shell cd $(PROJLEVEL); pwd)
-else 
-TOP_DIRECTORY := $(shell cd $(LEVEL); pwd)
+# Set the LLVM object directory.
+#
+ifndef LLVM_OBJ_ROOT
+LLVM_OBJ_ROOT = $(BUILD_OBJ_ROOT)
 endif
 
-BUILD_ROOT_TOP := $(LLVM_OBJ_DIR)$(patsubst $(HOME)%,%,$(TOP_DIRECTORY))
+###########################################################################
+# Default Targets:
+#	The following targets are the standard top level targets for
+#	building.
+###########################################################################
+
+ifdef SHARED_LIBRARY
+# if SHARED_LIBRARY is specified, the default is to build the dynamic lib
+all:: dynamic
 endif
 
+# Default Rule:  Make sure it's also a :: rule
+all ::
 
+# Default for install is to at least build everything...
+install ::
 
+# Default rule for test.  It ensures everything has a test rule
+test::
+
+# Default rule for building only bytecode.
+bytecode::
+
+# Print out the directories used for building
+prdirs::
+	echo "Home Offset      : " $(HOME_OBJ_ROOT);
+	echo "Build Source Root: " $(BUILD_SRC_ROOT);
+	echo "Build Source Dir : " $(BUILD_SRC_DIR);
+	echo "Build Object Root: " $(BUILD_OBJ_ROOT);
+	echo "Build Object Dir : " $(BUILD_OBJ_DIR);
+	echo "LLVM  Source Root: " $(LLVM_SRC_ROOT);
+	echo "LLVM  Object Root: " $(LLVM_OBJ_ROOT);
+
+#
+# Mark all of these targets as phony.  This will hopefully speed up builds
+# slightly since GNU Make will not try to find implicit rules for targets
+# which are marked as Phony.
+#
+.PHONY: all dynamic clean distclean install test bytecode prdirs
+
+###########################################################################
+# Miscellaneous paths and commands:
+#	This section defines various configuration macros, such as where
+#	to find burg, tblgen, and libtool.
+###########################################################################
 
 #--------------------------------------------------------------------
 # Variables derived from configuration options... 
@@ -110,7 +185,7 @@ endif
 
 BURG_OPTS = -I
 
-PURIFY := $(PURIFY) -cache-dir="$(BUILD_ROOT_TOP)/../purifycache" -chain-length="30" -messages=all 
+PURIFY := $(PURIFY) -cache-dir="$(BUILD_OBJ_ROOT)/../purifycache" -chain-length="30" -messages=all 
 
 ifdef ENABLE_PROFILING
   ENABLE_OPTIMIZED = 1
@@ -123,127 +198,194 @@ else
   endif
 endif
 
-# Shorthand for commonly accessed directories
-# DESTLIBXYZ indicates destination for the libraries built
-DESTLIBDEBUG    := $(BUILD_ROOT_TOP)/lib/Debug
-DESTLIBRELEASE  := $(BUILD_ROOT_TOP)/lib/Release
-DESTLIBPROFILE  := $(BUILD_ROOT_TOP)/lib/Profile
-DESTLIBCURRENT  := $(BUILD_ROOT_TOP)/lib/$(CONFIGURATION)
-
-ifdef PROJ_COMPILE
-#get the llvm libraries from LLVM_LIB_DIR
-LLVMLIBDEBUGSOURCE    := $(LLVM_LIB_DIR)/lib/Debug
-LLVMLIBRELEASESOURCE  := $(LLVM_LIB_DIR)/lib/Release
-LLVMLIBPROFILESOURCE  := $(LLVM_LIB_DIR)/lib/Profile
-LLVMLIBCURRENTSOURCE  := $(LLVM_LIB_DIR)/lib/$(CONFIGURATION)
-
-PROJLIBDEBUGSOURCE    := $(BUILD_ROOT_TOP)/lib/Debug
-PROJLIBRELEASESOURCE  := $(BUILD_ROOT_TOP)/lib/Release
-PROJLIBPROFILESOURCE  := $(BUILD_ROOT_TOP)/lib/Profile
-PROJLIBCURRENTSOURCE  := $(BUILD_ROOT_TOP)/lib/$(CONFIGURATION)
-
-else 
-#when we are building llvm, destination is same as source
-LLVMLIBDEBUGSOURCE    := $(BUILD_ROOT_TOP)/lib/Debug
-LLVMLIBRELEASESOURCE  := $(BUILD_ROOT_TOP)/lib/Release
-LLVMLIBPROFILESOURCE  := $(BUILD_ROOT_TOP)/lib/Profile
-LLVMLIBCURRENTSOURCE  := $(BUILD_ROOT_TOP)/lib/$(CONFIGURATION)
+#
+# Enable this for profiling support with 'gprof'
+# This automatically enables optimized builds.
+#
+ifdef ENABLE_PROFILING
+  PROFILE = -pg
 endif
 
+#
+# Suffixes for library compilation rules
+#
+.SUFFIXES: .so
 
-TOOLDEBUG   := $(BUILD_ROOT_TOP)/tools/Debug
-TOOLRELEASE := $(BUILD_ROOT_TOP)/tools/Release
-TOOLPROFILE := $(BUILD_ROOT_TOP)/tools/Profile
-TOOLCURRENT := $(BUILD_ROOT_TOP)/tools/$(CONFIGURATION)
+###########################################################################
+# Library Locations:
+#	These variables describe various library locations:
+#
+#	DEST* = Location of where libraries that are built will be placed.
+#	LLVM* = Location of LLVM libraries used for linking.
+#	PROJ* = Location of previously built libraries used for linking.
+###########################################################################
+
+# Libraries that are being built
+DESTLIBDEBUG    := $(BUILD_OBJ_ROOT)/lib/Debug
+DESTLIBRELEASE  := $(BUILD_OBJ_ROOT)/lib/Release
+DESTLIBPROFILE  := $(BUILD_OBJ_ROOT)/lib/Profile
+DESTLIBCURRENT  := $(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION)
+
+# LLVM libraries used for linking
+LLVMLIBDEBUGSOURCE    := $(LLVM_OBJ_ROOT)/lib/Debug
+LLVMLIBRELEASESOURCE  := $(LLVM_OBJ_ROOT)/lib/Release
+LLVMLIBPROFILESOURCE  := $(LLVM_OBJ_ROOT)/lib/Profile
+LLVMLIBCURRENTSOURCE  := $(LLVM_OBJ_ROOT)/lib/$(CONFIGURATION)
+
+# Libraries that were built that will now be used for linking
+PROJLIBDEBUGSOURCE    := $(BUILD_OBJ_ROOT)/lib/Debug
+PROJLIBRELEASESOURCE  := $(BUILD_OBJ_ROOT)/lib/Release
+PROJLIBPROFILESOURCE  := $(BUILD_OBJ_ROOT)/lib/Profile
+PROJLIBCURRENTSOURCE  := $(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION)
+
+###########################################################################
+# Tool Locations
+#	These variables describe various tool locations:
+#
+#	DEST* = Location of where tools that are built will be placed.
+#	LLVM* = Location of LLVM tools used for building.
+#	PROJ* = Location of previously built tools used for linking.
+###########################################################################
+
+DESTTOOLDEBUG   := $(BUILD_OBJ_ROOT)/tools/Debug
+DESTTOOLRELEASE := $(BUILD_OBJ_ROOT)/tools/Release
+DESTTOOLPROFILE := $(BUILD_OBJ_ROOT)/tools/Profile
+DESTTOOLCURRENT := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)
+
+LLVMTOOLDEBUG   := $(LLVM_OBJ_ROOT)/tools/Debug
+LLVMTOOLRELEASE := $(LLVM_OBJ_ROOT)/tools/Release
+LLVMTOOLPROFILE := $(LLVM_OBJ_ROOT)/tools/Profile
+LLVMTOOLCURRENT := $(LLVM_OBJ_ROOT)/tools/$(CONFIGURATION)
+
+PROJTOOLDEBUG   := $(BUILD_OBJ_ROOT)/tools/Debug
+PROJTOOLRELEASE := $(BUILD_OBJ_ROOT)/tools/Release
+PROJTOOLPROFILE := $(BUILD_OBJ_ROOT)/tools/Profile
+PROJTOOLCURRENT := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)
 
+#
+# Libtool is found in the current directory.
+#
+ifdef VERBOSE
+LIBTOOL=$(LLVM_SRC_ROOT)/libtool
+else
+LIBTOOL=$(LLVM_SRC_ROOT)/libtool --silent
+endif
+
+#
 # Verbosity levels
+#
 ifndef VERBOSE
 VERB := @
 endif
 
-#---------------------------------------------------------
-# Compilation options...
-#---------------------------------------------------------
-
-# Special tools used while building the LLVM tree.  Burg is built as part of the
-# utils directory.
-#
-BURG    := $(TOOLCURRENT)/burg
+###########################################################################
+# Miscellaneous paths and commands (part deux):
+#	This section defines various configuration macros, such as where
+#	to find burg, tblgen, and libtool.
+###########################################################################
+
+#--------------------------------------------------------------------------
+# Special tools used while building the LLVM tree.  Burg is built as part
+# of the utils directory.
+#--------------------------------------------------------------------------
+BURG    := $(LLVMTOOLCURRENT)/burg
 RunBurg := $(BURG) $(BURG_OPTS)
 
-TBLGEN  := $(TOOLCURRENT)/tblgen
+TBLGEN  := $(LLVMTOOLCURRENT)/tblgen
 
-# Enable this for profiling support with 'gprof'
-# This automatically enables optimized builds.
-ifdef ENABLE_PROFILING
-  PROFILE = -pg
-endif
 
-#if PROJDIR is defined then we include project include directory
-ifndef PROJ_COMPILE
-PROJ_INCLUDE = .
-else
-PROJ_INCLUDE = $(TOP_DIRECTORY)/include
-endif 
+###########################################################################
+# Compile Time Flags
+###########################################################################
+
+#
+# Include both the project headers and the LLVM headers for compilation and
+# dependency computation.
+#
+CPPFLAGS += -I$(BUILD_SRC_ROOT)/include -I$(LLVM_SRC_ROOT)/include
 
 # By default, strip symbol information from executable
 ifndef KEEP_SYMBOLS
 STRIP = $(PLATFORMSTRIPOPTS)
-STRIP_WARN_MSG = "(without symbols) "
+STRIP_WARN_MSG = "(without symbols)"
 endif
 
 # Allow gnu extensions...
 CPPFLAGS += -D_GNU_SOURCE
 
 # -Wno-unused-parameter
-CompileCommonOpts := -Wall -W  -Wwrite-strings -Wno-unused -I$(LEVEL)/include -I$(PROJ_INCLUDE)
+CompileCommonOpts := -Wall -W  -Wwrite-strings -Wno-unused -I$(LEVEL)/include
 CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions -fshort-enums
 
+#
+# Compile commands with libtool.
+#
+Compile  := $(LIBTOOL) --mode=compile $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
+CompileC  := $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CompileCommonOpts)
+
+#
+# Add the LLVM specific "-only-static" option so that we only compile .o files
+# once when not building a shared library.
+#
+# For shared libraries, we will end up building twice, but that doesn't happen
+# very often, so we'll let it go.
+#
+ifndef SHARED_LIBRARY
+Compile  := $(Compile)  -only-static
+CompileC := $(CompileC) -only-static
+endif
+
 # Compile a cpp file, don't link...
-Compile  := $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(CompileCommonOpts)
 CompileG := $(Compile) -g  -D_DEBUG
 CompileO := $(Compile) $(CompileOptimizeOpts) -felide-constructors -fomit-frame-pointer
 CompileP := $(Compile) $(CompileOptimizeOpts) -felide-constructors $(PROFILE)
 
 # Compile a c file, don't link...
-CompileC  := $(CC) -c $(CPPFLAGS) $(CCFLAGS) $(CompileCommonOpts)
 CompileCG := $(CompileC) -g  -D_DEBUG
 CompileCO := $(CompileC) $(CompileOptimizeOpts) -fomit-frame-pointer
 CompileCP := $(CompileC) $(CompileOptimizeOpts) $(PROFILE)
 
+###########################################################################
+# Link Time Options
+###########################################################################
 
+#
 # Link final executable
-
+#	(Note that we always link with the C++ compiler).
+#
 ifdef ENABLE_PURIFY # To enable purify, build with 'gmake ENABLE_PURIFY=1'
-Link     := $(PURIFY) $(CXX) -static
+Link     := $(PURIFY) $(LIBTOOL) --mode=link $(CXX) -static
 else
-Link     := $(CXX)
+Link     := $(LIBTOOL) --mode=link $(CXX)
 endif
 
-ifdef PROJ_COMPILE
-# include both projlib source and llvmlib source
+# link both projlib and llvmlib libraries
 LinkG    := $(Link) -g -L$(PROJLIBDEBUGSOURCE)  -L$(LLVMLIBDEBUGSOURCE) $(STRIP)
 LinkO    := $(Link) -O3 -L$(PROJLIBRELEASESOURCE) -L$(LLVMLIBRELEASESOURCE)
 LinkP    := $(Link) -O3 -L$(PROJLIBPROFILESOURCE) -L$(LLVMLIBPROFILESOURCE) $(PROFILE)
-else
-LinkG    := $(Link) -g  -L$(LLVMLIBDEBUGSOURCE) $(STRIP)
-LinkO    := $(Link) -O3 -L$(LLVMLIBRELEASESOURCE)
-LinkP    := $(Link) -O3 -L$(LLVMLIBPROFILESOURCE) $(PROFILE)
-endif
-
-
 
 # Create one .o file from a bunch of .o files...
-Relink = ${LD} -r
+Relink = ${LIBTOOL} --mode=link $(CXX)
 
 # MakeSO - Create a .so file from a .o files...
-MakeSO   := $(CXX) $(MakeSharedObjectOption)
-MakeSOO  := $(MakeSO) -O3
-MakeSOP  := $(MakeSOO) $(PROFILE)
+#MakeSO   := $(LIBTOOL) --mode=link $(CXX) $(MakeSharedObjectOption)
+#MakeSOO  := $(MakeSO) -O3
+#MakeSOP  := $(MakeSOO) $(PROFILE)
+
+#
+# Configure where the item being compiled should go.
+#
+ifdef SHARED_LIBRARY
+Link := $(Link) -rpath $(DESTLIBCURRENT)
+endif
+
+ifdef TOOLNAME
+Link := $(Link) -rpath $(DESTTOOLCURRENT)
+endif
 
 # Create dependancy file from CPP file, send to stdout.
-Depend   := $(CXX) -MM -I$(LEVEL)/include -I$(PROJ_INCLUDE) $(CPPFLAGS) 
-DependC  := $(CC)  -MM -I$(LEVEL)/include -I$(PROJ_INCLUDE) $(CPPFLAGS) 
+Depend   := $(CXX) -MM -I$(LEVEL)/include $(CPPFLAGS) 
+DependC  := $(CC)  -MM -I$(LEVEL)/include $(CPPFLAGS) 
 
 # Archive a bunch of .o files into a .a file...
 AR       = ${AR_PATH} cq 
@@ -258,18 +400,17 @@ ifndef Source
 Source  := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l)
 endif
 
-Objs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(notdir $(basename $(Source))))))
-ObjectsO := $(addprefix $(BUILD_ROOT)/Release/,$(Objs))
-ObjectsP := $(addprefix $(BUILD_ROOT)/Profile/,$(Objs))
-ObjectsG := $(addprefix $(BUILD_ROOT)/Debug/,$(Objs))
-
+Objs := $(sort $(patsubst Debug/%.lo, %.lo, $(addsuffix .lo,$(notdir $(basename $(Source))))))
+ObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(Objs))
+ObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(Objs))
+ObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(Objs))
 
 #---------------------------------------------------------
 # Handle the DIRS and PARALLEL_DIRS options
 #---------------------------------------------------------
 
 ifdef DIRS
-all install clean test ::
+all install clean test bytecode ::
 	$(VERB) for dir in ${DIRS}; do \
 		(cd $$dir; $(MAKE) $@) || exit 1; \
 	done
@@ -277,15 +418,30 @@ endif
 
 # Handle PARALLEL_DIRS
 ifdef PARALLEL_DIRS
-all     :: $(addsuffix /.makeall    , $(PARALLEL_DIRS))
-install :: $(addsuffix /.makeinstall, $(PARALLEL_DIRS))
-clean   :: $(addsuffix /.makeclean  , $(PARALLEL_DIRS))
-test    :: $(addsuffix /.maketest   , $(PARALLEL_DIRS))
+all      :: $(addsuffix /.makeall     , $(PARALLEL_DIRS))
+install  :: $(addsuffix /.makeinstall , $(PARALLEL_DIRS))
+clean    :: $(addsuffix /.makeclean   , $(PARALLEL_DIRS))
+test     :: $(addsuffix /.maketest    , $(PARALLEL_DIRS))
+bytecode :: $(addsuffix /.makebytecode, $(PARALLEL_DIRS))
 
-%/.makeall %/.makeinstall %/.makeclean %/.maketest:
+%/.makeall %/.makeinstall %/.makeclean %/.maketest %/.makebytecode:
 	$(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@)
 endif
 
+# Handle directories that may or may not exist
+ifdef OPTIONAL_DIRS
+all install clean test bytecode ::
+	$(VERB) for dir in ${OPTIONAL_DIRS}; do \
+		if [ -d $$dir ]; \
+		then\
+			(cd $$dir; $(MAKE) $@) || exit 1; \
+		fi \
+	done
+endif
+
+###########################################################################
+# Library Build Rules:
+#
 #---------------------------------------------------------
 # Handle the LIBRARYNAME option - used when building libs...
 #---------------------------------------------------------
@@ -302,6 +458,7 @@ endif
 #  it's built as a .o file, then all of the constituent .o files in it will be
 #  linked into tools (for example gccas) even if they only use one of the parts
 #  of it.  For this reason, sometimes it's useful to use libraries as .a files.
+###########################################################################
 
 ifdef LIBRARYNAME
 
@@ -318,6 +475,11 @@ LIBNAME_OBJO := $(DESTLIBRELEASE)/$(LIBRARYNAME).o
 LIBNAME_OBJP := $(DESTLIBPROFILE)/$(LIBRARYNAME).o
 LIBNAME_OBJG := $(DESTLIBDEBUG)/$(LIBRARYNAME).o
 
+#--------------------------------------------------------------------
+# Library Targets
+#	Modify the top level targets to build the desired libraries.
+#--------------------------------------------------------------------
+
 # dynamic target builds a shared object version of the library...
 dynamic:: $(DESTLIBCURRENT)/lib$(LIBRARYNAME).so
 
@@ -331,33 +493,49 @@ ifdef BUILD_ARCHIVE
 all:: $(DESTLIBCURRENT)/lib$(LIBRARYNAME).a
 endif
 
+#--------------------------------------------------------------------
+# Rules for building libraries
+#--------------------------------------------------------------------
+
+#
+# Rules for building dynamically linked libraries.
+#
 $(LIBNAME_O): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
-	@echo ======= Linking $(LIBRARYNAME) release library =======
-	$(VERB) $(MakeSOO) -o $@ $(ObjectsO) $(LibSubDirs) $(LibLinkOpts)
+	@echo ======= Linking $(LIBRARYNAME) dynamic release library =======
+	$(VERB) $(Link) -o $*.la $(ObjectsO) $(LibSubDirs) $(LibLinkOpts);
+	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT);
 
 $(LIBNAME_P): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
-	@echo ======= Linking $(LIBRARYNAME) profile library =======
-	$(VERB) $(MakeSOP) -o $@ $(ObjectsP) $(LibSubDirs) $(LibLinkOpts)
+	@echo ======= Linking $(LIBRARYNAME) dynamic profile library =======
+	$(VERB) $(Link) -o $*.la $(ObjectsP) $(LibSubDirs) $(LibLinkOpts);
+	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT);
 
 $(LIBNAME_G): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
-	@echo ======= Linking $(LIBRARYNAME) debug library =======
-	$(VERB) $(MakeSO) -g -o $@ $(ObjectsG) $(LibSubDirs) $(LibLinkOpts)
+	@echo ======= Linking $(LIBRARYNAME) dynamic debug library =======
+	$(VERB) $(Link) -o $*.la $(ObjectsG) $(LibSubDirs) $(LibLinkOpts);
+	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT);
 
+#
+# Rules for building static archive libraries.
+#
 $(LIBNAME_AO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
-	@echo ======= Linking $(LIBRARYNAME) release library =======
-	@rm -f $@
-	$(VERB) $(AR) $@ $(ObjectsO) $(LibSubDirs)
+	@echo ======= Linking $(LIBRARYNAME) archive release library =======
+	@$(RM) -f $@
+	$(VERB) $(Link) -03 -o $@ $(ObjectsO) $(LibSubDirs) -static
 
 $(LIBNAME_AP): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
-	@echo ======= Linking $(LIBRARYNAME) profile library =======
-	@rm -f $@
-	$(VERB) $(AR) $@ $(ObjectsP) $(LibSubDirs)
+	@echo ======= Linking $(LIBRARYNAME) archive profile library =======
+	@$(RM) -f $@
+	$(VERB) $(Link) -03 $(PROFILE) -o $@ $(ObjectsP) $(LibSubDirs) -static
 
 $(LIBNAME_AG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
-	@echo ======= Linking $(LIBRARYNAME) debug library =======
-	@rm -f $@
-	$(VERB) $(AR) $@ $(ObjectsG) $(LibSubDirs)
+	@echo ======= Linking $(LIBRARYNAME) archive debug library =======
+	@$(RM) -f $@
+	$(VERB) $(Link) -g $(STRIP) -o $@ $(ObjectsG) $(LibSubDirs) -static
 
+#
+# Rules for building .o libraries.
+#
 $(LIBNAME_OBJO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
 	@echo "Linking $@"
 	$(VERB) $(Relink) -o $@ $(ObjectsO) $(LibSubDirs)
@@ -376,11 +554,16 @@ endif
 # Create a TAGS database for emacs
 #------------------------------------------------------------------------
 
+ifdef ETAGS
 ifeq ($(LEVEL), .)
 tags:
-	etags -l c++ `find include lib tools -name '*.cpp' -o -name '*.h'`
+	$(ETAGS) -l c++ `find include lib tools -name '*.cpp' -o -name '*.h'`
 all:: tags
 endif
+else
+tags:
+	${ECHO} "Cannot build $@: The program etags is not installed"
+endif
 
 #------------------------------------------------------------------------
 # Handle the TOOLNAME option - used when building tool executables...
@@ -394,14 +577,12 @@ endif
 ifdef TOOLNAME
 
 # TOOLEXENAME* - These compute the output filenames to generate...
-TOOLEXENAME_G := $(BUILD_ROOT_TOP)/tools/Debug/$(TOOLNAME)
-TOOLEXENAME_O := $(BUILD_ROOT_TOP)/tools/Release/$(TOOLNAME)
-TOOLEXENAME_P := $(BUILD_ROOT_TOP)/tools/Profile/$(TOOLNAME)
-TOOLEXENAMES  := $(BUILD_ROOT_TOP)/tools/$(CONFIGURATION)/$(TOOLNAME)
+TOOLEXENAME_G := $(DESTTOOLDEBUG)/$(TOOLNAME)
+TOOLEXENAME_O := $(DESTTOOLRELEASE)/$(TOOLNAME)
+TOOLEXENAME_P := $(DESTTOOLPROFILE)/$(TOOLNAME)
+TOOLEXENAMES  := $(DESTTOOLCURRENT)/$(TOOLNAME)
 
 # USED_LIBS_OPTIONS - Compute the options line that add -llib1 -llib2, etc.
-ifdef PROJ_COMPILE
-
 PROJ_LIBS_OPTIONS   := $(patsubst %.a.o, -l%, $(addsuffix .o, $(USEDLIBS)))
 PROJ_LIBS_OPTIONS_G := $(patsubst %.o, $(PROJLIBDEBUGSOURCE)/%.o,  $(PROJ_LIBS_OPTIONS))
 PROJ_LIBS_OPTIONS_O := $(patsubst %.o, $(PROJLIBRELEASESOURCE)/%.o,$(PROJ_LIBS_OPTIONS))
@@ -413,36 +594,25 @@ LLVM_LIBS_OPTIONS_O := $(patsubst %.o, $(LLVMLIBRELEASESOURCE)/%.o,$(LLVM_LIBS_O
 LLVM_LIBS_OPTIONS_P := $(patsubst %.o, $(LLVMLIBPROFILESOURCE)/%.o,$(LLVM_LIBS_OPTIONS))
 
 LIB_OPTS_G :=  $(LLVM_LIBS_OPTIONS_G) $(PROJ_LIBS_OPTIONS_G)
-LIB_OPTS_O :=  $(LLVM_LIBS_OPTIONS_O) $(PROJ_LIBS_OPTIONS_P)
+LIB_OPTS_O :=  $(LLVM_LIBS_OPTIONS_O) $(PROJ_LIBS_OPTIONS_O)
 LIB_OPTS_P :=  $(LLVM_LIBS_OPTIONS_P) $(PROJ_LIBS_OPTIONS_P)
 
-else
-
-LLVM_LIBS_OPTIONS   := $(patsubst %.a.o, -l%, $(addsuffix .o, $(USEDLIBS)))
-LLVM_LIBS_OPTIONS_G := $(patsubst %.o, $(LLVMLIBDEBUGSOURCE)/%.o,  $(LLVM_LIBS_OPTIONS))
-LLVM_LIBS_OPTIONS_O := $(patsubst %.o, $(LLVMLIBRELEASESOURCE)/%.o,$(LLVM_LIBS_OPTIONS))
-LLVM_LIBS_OPTIONS_P := $(patsubst %.o, $(LLVMLIBPROFILESOURCE)/%.o,$(LLVM_LIBS_OPTIONS))
-
-LIB_OPTS_G :=  $(LLVM_LIBS_OPTIONS_G) 
-LIB_OPTS_O :=  $(LLVM_LIBS_OPTIONS_O) 
-LIB_OPTS_P :=  $(LLVM_LIBS_OPTIONS_P)
-endif
-
-
-
-
-
-
 # USED_LIB_PATHS - Compute the path of the libraries used so that tools are
 # rebuilt if libraries change.  This has to make sure to handle .a/.so and .o
-# files seperately.
+# files separately.
 #
 STATICUSEDLIBS   := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(USEDLIBS)))
 USED_LIB_PATHS_G := $(addprefix $(DESTLIBDEBUG)/, $(STATICUSEDLIBS))
 USED_LIB_PATHS_O := $(addprefix $(DESTLIBRELEASE)/, $(STATICUSEDLIBS))
 USED_LIB_PATHS_P := $(addprefix $(DESTLIBPROFILE)/, $(STATICUSEDLIBS))
-LINK_OPTS        := $(TOOLLINKOPTS) $(PLATFORMLINKOPTS)
+#LINK_OPTS        := $(TOOLLINKOPTS) $(PLATFORMLINKOPTS)
 
+#
+# Libtool link options:
+#	Ensure that all binaries have their symbols exported so that they can
+#	by dlsym'ed.
+#
+LINK_OPTS := -export-dynamic $(TOOLLINKOPTS)
 
 
 
@@ -454,50 +624,99 @@ $(USED_LIB_PATHS_G) $(USED_LIB_PATHS_O) $(USED_LIB_PATHS_P): \
         $(addsuffix /.makeall, $(PARALLEL_DIRS))
 
 all::   $(TOOLEXENAMES)
+
 clean::
-	$(VERB) rm -f $(TOOLEXENAMES)
+	$(VERB) $(RM) -f $(TOOLEXENAMES)
 
-$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(TOOLDEBUG)/.dir
-	@echo ======= Linking $(TOOLNAME) debug executable $(STRIP_WARN_MSG)=======
-	$(VERB) $(LinkG) -o $@ $(ObjectsG) $(LIB_OPTS_G) $(LINK_OPTS)
+$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(DESTTOOLDEBUG)/.dir
+	@echo ======= Linking $(TOOLNAME) debug executable $(STRIP_WARN_MSG) =======
+	$(VERB) $(LinkG) -o $@ $(ObjectsG) $(LIB_OPTS_G) $(LINK_OPTS) $(LIBS)
 
-$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(TOOLRELEASE)/.dir
+$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(DESTTOOLRELEASE)/.dir
 	@echo ======= Linking $(TOOLNAME) release executable =======
-	$(VERB) $(LinkO) -o $@ $(ObjectsO) $(LIB_OPTS_O) $(LINK_OPTS)
+	$(VERB) $(LinkO) -o $@ $(ObjectsO) $(LIB_OPTS_O) $(LINK_OPTS) $(LIBS)
 
-$(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(TOOLPROFILE)/.dir
+$(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(DESTTOOLPROFILE)/.dir
 	@echo ======= Linking $(TOOLNAME) profile executable =======
-	$(VERB) $(LinkP) -o $@ $(ObjectsP) $(LIB_OPTS_P) $(LINK_OPTS)
+	$(VERB) $(LinkP) -o $@ $(ObjectsP) $(LIB_OPTS_P) $(LINK_OPTS) $(LIBS)
 
 endif
 
 
 
 #---------------------------------------------------------
-.PRECIOUS: $(BUILD_ROOT)/Depend/.dir
-.PRECIOUS: $(BUILD_ROOT)/Debug/.dir $(BUILD_ROOT)/Release/.dir
+.PRECIOUS: $(BUILD_OBJ_DIR)/Depend/.dir
+.PRECIOUS: $(BUILD_OBJ_DIR)/Debug/.dir $(BUILD_OBJ_DIR)/Release/.dir
 
 # Create .o files in the ObjectFiles directory from the .cpp and .c files...
-$(BUILD_ROOT)/Release/%.o: $(SourceDir)%.cpp $(BUILD_ROOT)/Release/.dir
+#$(BUILD_OBJ_DIR)/Release/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir
+	#@echo "Compiling $<"
+	#$(VERB) $(CompileO) $< -o $@
+
+#$(BUILD_OBJ_DIR)/Release/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir
+	#$(VERB) $(CompileCO) $< -o $@
+
+#$(BUILD_OBJ_DIR)/Profile/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir
+	#@echo "Compiling $<"
+	#$(VERB) $(CompileP) $< -o $@
+
+#$(BUILD_OBJ_DIR)/Profile/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir
+	#@echo "Compiling $<"
+	#$(VERB) $(CompileCP) $< -o $@
+
+#$(BUILD_OBJ_DIR)/Debug/%.o: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir
+	#@echo "Compiling $<"
+	#$(VERB) $(CompileG) $< -o $@
+
+#$(BUILD_OBJ_DIR)/Debug/%.o: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir 
+	#$(VERB) $(CompileCG) $< -o $@
+
+# Create .lo files in the ObjectFiles directory from the .cpp and .c files...
+$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir
 	@echo "Compiling $<"
 	$(VERB) $(CompileO) $< -o $@
 
-$(BUILD_ROOT)/Release/%.o: $(SourceDir)%.c $(BUILD_ROOT)/Release/.dir
+$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir
+	@echo "Compiling $<"
 	$(VERB) $(CompileCO) $< -o $@
 
-$(BUILD_ROOT)/Profile/%.o: $(SourceDir)%.cpp $(BUILD_ROOT)/Profile/.dir
+$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir
 	@echo "Compiling $<"
 	$(VERB) $(CompileP) $< -o $@
 
-$(BUILD_ROOT)/Profile/%.o: $(SourceDir)%.c $(BUILD_ROOT)/Profile/.dir
+$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir
 	@echo "Compiling $<"
 	$(VERB) $(CompileCP) $< -o $@
 
-$(BUILD_ROOT)/Debug/%.o: $(SourceDir)%.cpp $(BUILD_ROOT)/Debug/.dir
+$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir
 	@echo "Compiling $<"
 	$(VERB) $(CompileG) $< -o $@
 
-$(BUILD_ROOT)/Debug/%.o: $(SourceDir)%.c $(BUILD_ROOT)/Debug/.dir 
+$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir 
+	@echo "Compiling $<"
+	$(VERB) $(CompileCG) $< -o $@
+
+# Create .lo files in the ObjectFiles directory from the .cpp and .c files...
+$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Release/.dir
+	@echo "Compiling $<"
+	$(VERB) $(CompileO) $< -o $@
+
+$(BUILD_OBJ_DIR)/Release/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Release/.dir
+	$(VERB) $(CompileCO) $< -o $@
+
+$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Profile/.dir
+	@echo "Compiling $<"
+	$(VERB) $(CompileP) $< -o $@
+
+$(BUILD_OBJ_DIR)/Profile/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Profile/.dir
+	@echo "Compiling $<"
+	$(VERB) $(CompileCP) $< -o $@
+
+$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Debug/.dir
+	@echo "Compiling $<"
+	$(VERB) $(CompileG) $< -o $@
+
+$(BUILD_OBJ_DIR)/Debug/%.lo: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Debug/.dir 
 	$(VERB) $(CompileCG) $< -o $@
 
 #
@@ -518,10 +737,10 @@ YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output)
 # FIXME.  (f.e. char Buffer[10000]; )
 #
 %.cpp: %.l
-	$(FLEX) -t $< | sed '/^find_rule/d' | \
-                     sed 's/void yyunput/inline void yyunput/' | \
-          sed 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \
-          sed 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' > $@
+	$(FLEX) -t $< | $(SED) '/^find_rule/d' | \
+                     $(SED) 's/void yyunput/inline void yyunput/' | \
+          $(SED) 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \
+          $(SED) 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' > $@
 
 # Rule for building the bison parsers...
 %.c: %.y     # Cancel built-in rules for yacc
@@ -529,40 +748,70 @@ YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output)
 %.cpp %.h : %.y
 	@echo Bison\'ing $<...
 	$(VERB) $(BISON) -v -d -p $(<:%Parser.y=%) $*.y
-	$(VERB) mv -f $*.tab.c $*.cpp
-	$(VERB) mv -f $*.tab.h $*.h
+	$(VERB) ${MV} -f $*.tab.c $*.cpp
+	$(VERB) ${MV} -f $*.tab.h $*.h
 
 # To create the directories...
 %/.dir:
-	$(VERB) mkdir -p $*
-	@date > $@
+	$(VERB) ${MKDIR} $* > /dev/null
+	@$(DATE) > $@
 
 # To create postscript files from dot files...
+ifdef DOT
 %.ps: %.dot
-	dot -Tps < $< > $@
+	${DOT} -Tps < $< > $@
+else
+%.ps: %.dot
+	${ECHO} "Cannot build $@: The program dot is not installed"
+endif
 
 # 'make clean' nukes the tree
 clean::
-	$(VERB) rm -rf $(BUILD_ROOT)/Debug $(BUILD_ROOT)/Release $(BUILD_ROOT)/Profile $(BUILD_ROOT)/Depend
-	$(VERB) rm -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc
-	$(VERB) rm -f $(LEX_OUTPUT) $(YACC_OUTPUT)
+	$(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Debug $(BUILD_OBJ_DIR)/Release $(BUILD_OBJ_DIR)/Profile $(BUILD_OBJ_DIR)/Depend
+	$(VERB) $(RM) -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc
+	$(VERB) $(RM) -f $(LEX_OUTPUT) $(YACC_OUTPUT)
+
+distclean:: clean
+	$(VERB) (cd $(LLVM_SRC_ROOT); $(RM) -rf $(LEVEL)/Makefile.config \
+	            $(LEVEL)/include/Config/config.h \
+	            $(LEVEL)/autom4te.cache \
+	            $(LEVEL)/config.log)
+
+###########################################################################
+# C/C++ Dependencies
+#	Define variables and rules that generate header file dependencies
+#	from C/C++ source files.
+###########################################################################
 
 # If dependencies were generated for the file that included this file,
 # include the dependancies now...
 #
 SourceBaseNames := $(basename $(notdir $(filter-out Debug/%, $(Source))))
-SourceDepend := $(SourceBaseNames:%=$(BUILD_ROOT)/Depend/%.d)
+SourceDepend := $(SourceBaseNames:%=$(BUILD_OBJ_DIR)/Depend/%.d)
+
+#
+# Depend target:
+#	This allows a user to manually ask for an update in the dependencies
+#
+depend: $(SourceDepend)
+
 
 # Create dependencies for the *.cpp files...
 #$(SourceDepend): \x
-$(BUILD_ROOT)/Depend/%.d: $(SourceDir)%.cpp $(BUILD_ROOT)/Depend/.dir
-	$(VERB) $(Depend) $< | sed 's|$*\.o *|$(BUILD_ROOT)/Release/& $(BUILD_ROOT)/Profile/& $(BUILD_ROOT)/Debug/& $(BUILD_ROOT)/Depend/$(@F)|g' > $@
+$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Depend/.dir
+	$(VERB) $(Depend) $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
 
 # Create dependencies for the *.c files...
 #$(SourceDepend): \x
-$(BUILD_ROOT)/Depend/%.d: $(SourceDir)%.c $(BUILD_ROOT)/Depend/.dir
-	$(VERB) $(DependC) $< | sed 's|$*\.o *|Release/& Profile/& Debug/& Depend/$(@F)|g' > $@
+$(BUILD_OBJ_DIR)/Depend/%.d: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Depend/.dir
+	$(VERB) $(DependC) -o $@ $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
 
+#
+# Include dependencies generated from C/C++ source files, but not if we
+# are cleaning (this example taken from the GNU Make Manual).
+#
+ifneq ($(MAKECMDGOALS),clean)
 ifneq ($(SourceDepend),)
 -include $(SourceDepend)
 endif
+endif