X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile.rules;h=724554272a97d3063c90a1f3969156e96f75ce88;hb=004e19e38d810c3146c77b68a9274210ee008b1d;hp=e88823c85f0ed5bfd35f2f2f004b101aece6b129;hpb=b0ea864bbd1e3feb4f47ab5f896df8f9b2da18b4;p=oota-llvm.git

diff --git a/Makefile.rules b/Makefile.rules
index e88823c85f0..724554272a9 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -19,10 +19,11 @@
 #--------------------------------------------------------------------
 # Define the various target sets
 #--------------------------------------------------------------------
-RecursiveTargets := all clean clean-all check install uninstall
+RecursiveTargets := all clean clean-all install uninstall install-bytecode
 LocalTargets     := all-local clean-local clean-all-local check-local \
-                    install-local printvars uninstall-local
-TopLevelTargets  := dist dist-check dist-clean tags dist-gzip dist-bzip2 \
+                    install-local printvars uninstall-local \
+		    install-bytecode-local
+TopLevelTargets  := check dist dist-check dist-clean tags dist-gzip dist-bzip2 \
                     dist-zip
 UserTargets      := $(RecursiveTargets) $(LocalTargets) $(TopLevelTargets)
 InternalTargets  := preconditions distdir dist-hook
@@ -34,13 +35,13 @@ InternalTargets  := preconditions distdir dist-hook
 #--------------------------------------------------------------------
 # Set the VPATH so that we can find source files.
 #--------------------------------------------------------------------
-VPATH=$(BUILD_SRC_DIR)
+VPATH=$(PROJ_SRC_DIR)
 
 #--------------------------------------------------------------------
 # Reset the list of suffixes we know how to build
 #--------------------------------------------------------------------
 .SUFFIXES:
-.SUFFIXES: .c .cpp .h .hpp .y .l .lo .o .a .bc .td .ps .dot 
+.SUFFIXES: .c .cpp .cc .h .hpp .y .l .lo .o .a .bc .td .ps .dot 
 .SUFFIXES: $(SHLIBEXT) $(SUFFIXES)
 
 #--------------------------------------------------------------------
@@ -59,67 +60,116 @@ $(UserTargets)::
 # PRECONDITIONS: that which must be built/checked first
 ################################################################################
 
-SrcMakefiles       := $(filter %Makefile %Makefile.tests %Makefile.JIT,\
-                      $(wildcard $(BUILD_SRC_DIR)/Makefile*))
-ObjMakefiles       := $(subst $(BUILD_SRC_DIR),$(BUILD_OBJ_DIR),$(SrcMakefiles))
-ConfigureScript    := $(LLVM_SRC_ROOT)/configure
-ConfigStatusScript := $(LLVM_OBJ_ROOT)/config.status
-MakefileConfigIn   := $(LLVM_SRC_ROOT)/Makefile.config.in
-MakefileConfig     := $(LLVM_OBJ_ROOT)/Makefile.config
-PreConditions      := $(ConfigStatusScript) $(MakefileConfig) $(ObjMakefiles)
+SrcMakefiles       := $(filter %Makefile %Makefile.tests,\
+                      $(wildcard $(PROJ_SRC_DIR)/Makefile*))
+ObjMakefiles       := $(subst $(PROJ_SRC_DIR),$(PROJ_OBJ_DIR),$(SrcMakefiles))
+ConfigureScript    := $(PROJ_SRC_ROOT)/configure
+ConfigStatusScript := $(PROJ_OBJ_ROOT)/config.status
+MakefileConfigIn   := $(strip $(wildcard $(PROJ_SRC_ROOT)/Makefile.config.in))
+MakefileCommonIn   := $(strip $(wildcard $(PROJ_SRC_ROOT)/Makefile.common.in))
+MakefileConfig     := $(PROJ_OBJ_ROOT)/Makefile.config
+MakefileCommon     := $(PROJ_OBJ_ROOT)/Makefile.common
+PreConditions      := $(ConfigStatusScript) $(ObjMakefiles)
+ifneq ($(MakefileCommonIn),)
+PreConditions      += $(MakefileCommon)
+endif
+ifneq ($(MakefileConfigIn),)
+PreConditions      += $(MakefileConfig)
+endif
 
 preconditions : $(PreConditions)
 
 #------------------------------------------------------------------------
 # Make sure the BUILT_SOURCES are built first
 #------------------------------------------------------------------------
-$(filter-out clean clean-local,UserTargets):: $(BUILT_SOURCES)
+$(filter-out clean clean-local,$(UserTargets)):: $(BUILT_SOURCES)
 
 clean-local::
 ifneq ($(strip $(BUILT_SOURCES)),)
 	-$(Verb) $(RM) -f $(BUILT_SOURCES)
 endif
 
+ifneq ($(PROJ_OBJ_ROOT),$(PROJ_SRC_ROOT))
+spotless:
+	$(Verb) if test -x config.status ; then \
+	  $(EchoCmd) Wiping out $(PROJ_OBJ_ROOT) ; \
+	  $(MKDIR) .spotless.save ; \
+	  $(MV) config.status .spotless.save ; \
+	  $(MV) mklib  .spotless.save ; \
+	  $(MV) projects  .spotless.save ; \
+	  $(RM) -rf * ; \
+	  $(MV) .spotless.save/config.status . ; \
+	  $(MV) .spotless.save/mklib . ; \
+	  $(MV) .spotless.save/projects . ; \
+	  $(RM) -rf .spotless.save ; \
+	  $(EchoCmd) Rebuilding configuration of $(PROJ_OBJ_ROOT) ; \
+	  $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \
+	  $(ConfigStatusScript) ; \
+	else \
+	  $(EchoCmd) "make spotless" can only be run from $(PROJ_OBJ_ROOT); \
+	fi
+endif
+
 $(BUILT_SOURCES) : $(ObjMakefiles)
 
 #------------------------------------------------------------------------
 # Make sure we're not using a stale configuration
 #------------------------------------------------------------------------
+reconfigure:
+	$(Echo) Reconfiguring $(PROJ_OBJ_ROOT)
+	$(Verb) cd $(PROJ_OBJ_ROOT) && \
+	  if test -w $(PROJ_OBJ_ROOT)/config.cache ; then \
+	    $(RM) $(PROJ_OBJ_ROOT)/config.cache ; \
+	  fi ; \
+	  $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \
+	  $(ConfigStatusScript)
+
 .PRECIOUS: $(ConfigStatusScript)
 $(ConfigStatusScript): $(ConfigureScript)
 	$(Echo) Reconfiguring with $<
-	$(Verb) cd $(BUILD_OBJ_ROOT) && \
+	$(Verb) cd $(PROJ_OBJ_ROOT) && \
+	  if test -w $(PROJ_OBJ_ROOT)/config.cache ; then \
+	    $(RM) $(PROJ_OBJ_ROOT)/config.cache ; \
+	  fi ; \
 	  $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \
 	  $(ConfigStatusScript)
 
 #------------------------------------------------------------------------
 # Make sure the configuration makefile is up to date
 #------------------------------------------------------------------------
+ifneq ($(MakefileConfigIn),)
 $(MakefileConfig): $(MakefileConfigIn) $(ConfigStatusScript)
 	$(Echo) Regenerating $@
-	$(Verb) cd $(LLVM_OBJ_ROOT) ; $(ConfigStatusScript) Makefile.config
+	$(Verb) cd $(PROJ_OBJ_ROOT) ; $(ConfigStatusScript) Makefile.config
+endif
+
+ifneq ($(MakefileCommonIn),)
+$(MakefileCommon): $(MakefileCommonIn) $(ConfigStatusScript)
+	$(Echo) Regenerating $@
+	$(Verb) cd $(PROJ_OBJ_ROOT) ; $(ConfigStatusScript) Makefile.common
+endif
 
 #------------------------------------------------------------------------
 # If the Makefile in the source tree has been updated, copy it over into the
 # build tree. But, only do this if the source and object makefiles differ
 #------------------------------------------------------------------------
-ifneq ($(BUILD_OBJ_DIR),$(BUILD_SRC_DIR))
+ifneq ($(PROJ_OBJ_DIR),$(PROJ_SRC_DIR))
 
-Makefile: $(BUILD_SRC_DIR)/Makefile
+Makefile: $(PROJ_SRC_DIR)/Makefile
 	$(Echo) "Updating Makefile"
 	$(Verb) $(MKDIR) $(@D)
-	$(Verb) cp -f $< $@
+	$(Verb) $(CP) -f $< $@
 
 # Copy the Makefile.* files unless we're in the root directory which avoids
 # the copying of Makefile.config.in or other things that should be explicitly
 # taken care of.
-$(BUILD_OBJ_DIR)/Makefile% : $(BUILD_SRC_DIR)/Makefile%
+$(PROJ_OBJ_DIR)/Makefile% : $(PROJ_SRC_DIR)/Makefile%
 	@case '$?' in \
           *Makefile.rules) ;; \
           *.in) ;; \
           *) $(Echo) "Updating $(@F)" ; \
 	     $(MKDIR) $(@D) ; \
-	     cp -f $< $@ ;; \
+	     $(CP) -f $< $@ ;; \
 	esac
          
 endif
@@ -130,13 +180,12 @@ endif
 $(UserTargets):: $(PreConditions)
 
 all:: all-local
-check:: check-local
 clean:: clean-local 
 clean-all:: clean-local clean-all-local
 install:: install-local
 uninstall:: uninstall-local
-check-local:: all-local
 install-local:: all-local 
+install-bytecode:: install-bytecode-local
 
 ###############################################################################
 # VARIABLES: Set up various variables based on configuration data
@@ -146,6 +195,7 @@ install-local:: all-local
 # Variables derived from configuration we are building
 #--------------------------------------------------------------------
 
+
 ifdef ENABLE_PROFILING
   BuildMode := Profile
   CXX.Flags := -O3 -DNDEBUG -felide-constructors -finline-functions -pg
@@ -154,12 +204,17 @@ ifdef ENABLE_PROFILING
 else
   ifdef ENABLE_OPTIMIZED
     BuildMode := Release
-    CXX.Flags  := -O3 -DNDEBUG -finline-functions -felide-constructors -fomit-frame-pointer
-    C.Flags    := -O3 -DNDEBUG -fomit-frame-pointer
+    # Don't use -fomit-frame-pointer on FreeBSD
+    ifneq ($(OS),FreeBSD)
+      OmitFramePointer := -fomit-frame-pointer
+    endif
+    CXX.Flags  := -O3 -DNDEBUG -finline-functions -felide-constructors \
+                  $(OmitFramePointer)
+    C.Flags    := -O3 -DNDEBUG $(OmitFramePointer)
     LD.Flags   := -O3 -DNDEBUG 
   else
     BuildMode := Debug
-    CXX.Flags := -g -D_DEBUG 
+    CXX.Flags := -g -D_DEBUG
     C.Flags   := -g -D_DEBUG
     LD.Flags  := -g -D_DEBUG 
     KEEP_SYMBOLS := 1
@@ -173,22 +228,29 @@ LD.Flags  += $(LDFLAGS)
 AR.Flags  := cru
 LibTool.Flags := --tag=CXX
 
+#Make Floating point ieee complient on alpha
+ifeq ($(ARCH),Alpha)
+  CXX.Flags += -mieee
+  CPP.Flags += -mieee
+endif
+
 #--------------------------------------------------------------------
 # Directory locations
 #--------------------------------------------------------------------
-ObjDir      := $(BUILD_OBJ_DIR)/$(BuildMode)
-LibDir      := $(BUILD_OBJ_ROOT)/$(BuildMode)/lib
-ToolDir     := $(BUILD_OBJ_ROOT)/$(BuildMode)/bin
-ExmplDir    := $(BUILD_OBJ_ROOT)/$(BuildMode)/examples
+ObjDir      := $(PROJ_OBJ_DIR)/$(BuildMode)
+LibDir      := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib
+ToolDir     := $(PROJ_OBJ_ROOT)/$(BuildMode)/bin
+ExmplDir    := $(PROJ_OBJ_ROOT)/$(BuildMode)/examples
 LLVMLibDir  := $(LLVM_OBJ_ROOT)/$(BuildMode)/lib
 LLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/bin
-LExmplDir   := $(LLVM_OBJ_ROOT)/$(BuildMode)/examples
+LLVMExmplDir:= $(LLVM_OBJ_ROOT)/$(BuildMode)/examples
+CFERuntimeLibDir := $(LLVMGCCDIR)/lib
 
 #--------------------------------------------------------------------
 # Full Paths To Compiled Tools and Utilities
 #--------------------------------------------------------------------
-EchoCmd  := $(ECHO) llvm[$(MAKELEVEL)]:
-Echo     := @$(EchoCmd)
+EchoCmd  = $(ECHO) llvm[$(MAKELEVEL)]:
+Echo     = @$(EchoCmd)
 ifndef LIBTOOL
 LIBTOOL  := $(LLVM_OBJ_ROOT)/mklib
 endif
@@ -207,25 +269,36 @@ endif
 ifndef GCCLD
 GCCLD    := $(LLVMToolDir)/gccld$(EXEEXT)
 endif
-ifndef LLVMGCC
-LLVMGCC  := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCCDIR)/bin/gcc
+ifndef LDIS
+LLVMDIS  := $(LLVMToolDir)/llvm-dis$(EXEEXT)
+endif
+ifndef LLI
+LLI      := $(LLVMToolDir)/lli$(EXEEXT)
 endif
-ifndef LLVMGXX
-LLVMGXX  := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCCDIR)/bin/g++
+ifndef LOPT
+LOPT     := $(LLVMToolDir)/opt$(EXEEXT)
+endif
+ifndef LBUGPOINT
+LBUGPOINT := $(LLVMToolDir)/bugpoint$(EXEEXT)
 endif
 
-# Need a better way to compute this.
-LLVMGCCLibDir := $(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a))/
+LLVMGCCWITHPATH  := PATH="$(LLVMToolDir):$(PATH)" $(LLVMGCC)
+LLVMGXXWITHPATH  := PATH="$(LLVMToolDir):$(PATH)" $(LLVMGXX)
 
 #--------------------------------------------------------------------
 # Adjust to user's request
 #--------------------------------------------------------------------
 
-# Adjust LIBTOOL flags for shared libraries, or not.
-ifndef SHARED_LIBRARY
-  LibTool.Flags += --tag=disable-shared
-else
+# Adjust LD.Flags and Libtool.Flags depending on the kind of library that is
+# to be built. Note that if LOADABLE_MODULE is specified then the resulting
+# shared library can be opened with dlopen
+ifdef SHARED_LIBRARY
   LD.Flags += -rpath $(LibDir)
+  ifdef LOADABLE_MODULE
+    LD.Flags += -module
+  endif
+else
+  LibTool.Flags += --tag=disable-shared
 endif
 
 ifdef TOOL_VERBOSE
@@ -233,7 +306,6 @@ ifdef TOOL_VERBOSE
   CXX.Flags += -v
   LD.Flags += -v
   VERBOSE := 1
-else
 endif
 
 # Adjust settings for verbose mode
@@ -241,7 +313,7 @@ ifndef VERBOSE
   Verb := @
   LibTool.Flags += --silent
   AR.Flags += >/dev/null 2>/dev/null
-  ConfigureScriptFLAGS += >$(BUILD_OBJ_DIR)/configure.out 2>&1
+  ConfigureScriptFLAGS += >$(PROJ_OBJ_DIR)/configure.out 2>&1
 else
   ConfigureScriptFLAGS := 
 endif
@@ -267,28 +339,29 @@ endif
 
 CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused
 
-LD.Flags  += -L$(LibDir) -L$(LLVMLibDir)
-CPP.Flags += -I$(BUILD_OBJ_DIR) \
-	    -I$(BUILD_SRC_DIR) \
-	    -I$(BUILD_SRC_ROOT)/include \
-	    -I$(BUILD_OBJ_ROOT)/include \
-	    -I$(LLVM_OBJ_ROOT)/include \
-	    -I$(LLVM_SRC_ROOT)/include \
-	    -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
+LD.Flags  += -L$(LibDir) -L$(LLVMLibDir) $(LIBS)
+CPP.Flags += -I$(PROJ_OBJ_DIR) -I$(PROJ_SRC_DIR) \
+	     -I$(PROJ_OBJ_ROOT)/include \
+	     -I$(PROJ_SRC_ROOT)/include \
+	     -I$(LLVM_OBJ_ROOT)/include \
+	     -I$(LLVM_SRC_ROOT)/include \
+	     -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
 
 Compile.C     = $(CC) $(CPP.Flags) $(CompileCommonOpts) -c $(C.Flags)
 LTCompile.C   = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.C)
-BCCompile.C   = $(LLVMGCC) $(CPP.Flags) $(CompileCommonOpts) $(C.Flags) -c
+BCCompile.C   = $(LLVMGCCWITHPATH) $(CPP.Flags) $(CompileCommonOpts) \
+                $(C.Flags) -c
 Compile.CXX   = $(CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -c
 LTCompile.CXX = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.CXX)
-BCCompile.CXX = $(LLVMGXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -c
+BCCompile.CXX = $(LLVMGXXWITHPATH) $(CPP.Flags) $(CompileCommonOpts) \
+                $(CXX.Flags) -c
 Link          = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \
 	        $(CompileCommonOpts) $(LD.Flags) $(Strip)
 Relink        = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \
                 $(CompileCommonOpts)
 LTInstall     = $(LIBTOOL) $(LibTool.Flags) --mode=install $(INSTALL)
-Burg          = $(BURG) -I $(BUILD_SRC_DIR)
-TableGen      = $(TBLGEN) -I $(BUILD_SRC_DIR)
+Burg          = $(BURG) -I $(PROJ_SRC_DIR)
+TableGen      = $(TBLGEN) -I $(PROJ_SRC_DIR)
 Archive       = $(AR) $(AR.Flags)
 LArchive      = $(LLVMToolDir)/llvm-ar rcsf
 ifdef RANLIB
@@ -298,27 +371,37 @@ Ranlib        = ranlib
 endif
 
 #----------------------------------------------------------
-# Get the list of source files
+# Get the list of source files and compute object file 
+# names from them. 
 #----------------------------------------------------------
-ifndef SOURCES
-  Sources := $(notdir $(wildcard $(BUILD_SRC_DIR)/*.cpp \
-             $(BUILD_SRC_DIR)/*.cc $(BUILD_SRC_DIR)/*.c $(BUILD_SRC_DIR)/*.y \
-             $(BUILD_SRC_DIR)/*.l))
+ifdef FAKE_SOURCES
+  Sources :=
+  FakeSources := $(FAKE_SOURCES)
+  ifdef BUILT_SOURCES
+  FakeSources += $(filter %.cpp %.c %.cc %.y %.l,$(BUILT_SOURCES))
+  endif
+  BaseNameSources := $(sort $(basename $(FakeSources)))
+  ObjectsO  := $(BaseNameSources:%=$(ObjDir)/%.o)
+  ObjectsLO := $(BaseNameSources:%=$(ObjDir)/%.lo)
+  ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc)
 else
-  Sources := $(SOURCES)
-endif
+  ifndef SOURCES
+    Sources := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp \
+               $(PROJ_SRC_DIR)/*.cc $(PROJ_SRC_DIR)/*.c $(PROJ_SRC_DIR)/*.y \
+               $(PROJ_SRC_DIR)/*.l))
+  else
+    Sources := $(SOURCES)
+  endif 
 
-ifdef BUILT_SOURCES
-Sources += $(filter %.cpp %.c %.cc %.y %.l,$(BUILT_SOURCES))
-endif
+  ifdef BUILT_SOURCES
+  Sources += $(filter %.cpp %.c %.cc %.y %.l,$(BUILT_SOURCES))
+  endif
 
-#----------------------------------------------------------
-# Types of objects that can be built from sources
-#----------------------------------------------------------
-BaseNameSources := $(sort $(basename $(Sources)))
-ObjectsO  := $(BaseNameSources:%=$(ObjDir)/%.o)
-ObjectsLO := $(BaseNameSources:%=$(ObjDir)/%.lo)
-ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc)
+  BaseNameSources := $(sort $(basename $(Sources)))
+  ObjectsO  := $(BaseNameSources:%=$(ObjDir)/%.o)
+  ObjectsLO := $(BaseNameSources:%=$(ObjDir)/%.lo)
+  ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc)
+endif
 
 ###############################################################################
 # DIRECTORIES: Handle recursive descent of directory structure
@@ -329,17 +412,17 @@ ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc)
 # in the file so they get built before dependencies
 #---------------------------------------------------------
 
-$(bindir):
-	$(Verb) $(MKDIR) $(bindir)
+$(PROJ_bindir):
+	$(Verb) $(MKDIR) $(PROJ_bindir)
 
-$(libdir):
-	$(Verb) $(MKDIR) $(libdir)
+$(PROJ_libdir):
+	$(Verb) $(MKDIR) $(PROJ_libdir)
 
-$(bytecode_libdir):
-	$(Verb) $(MKDIR) $(bytecode_libdir)
+$(PROJ_includedir):
+	$(Verb) $(MKDIR) $(PROJ_includedir)
 
-$(sysconfdir):
-	$(Verb) $(MKDIR) $(sysconfdir)
+$(PROJ_etcdir):
+	$(Verb) $(MKDIR) $(PROJ_etcdir)
 
 # To create other directories, as needed, and timestamp their creation
 %/.dir:
@@ -360,9 +443,11 @@ $(RecursiveTargets)::
 	$(Verb) for dir in $(DIRS); do \
 	  if [ ! -f $$dir/Makefile ]; then \
 	    $(MKDIR) $$dir; \
-	    cp $(BUILD_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
+	    $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
 	  fi; \
-	  ($(MAKE) -C $$dir $@ ) || exit 1; \
+	  if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
+	    ($(MAKE) -C $$dir $@ ) || exit 1; \
+	  fi ; \
 	done
 endif
 
@@ -375,9 +460,11 @@ $(RecursiveTargets)::
 	$(Verb) for dir in $(EXPERIMENTAL_DIRS); do \
 	  if [ ! -f $$dir/Makefile ]; then \
 	    $(MKDIR) $$dir; \
-	    cp $(BUILD_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
+	    $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
 	  fi; \
-	  ($(MAKE) -C $$dir $@ ) || exit 0; \
+	  if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
+	    ($(MAKE) -C $$dir $@ ) || exit 0; \
+	  fi ; \
 	done
 endif
 
@@ -388,23 +475,24 @@ ifdef PARALLEL_DIRS
 
 SubDirs += $(PARALLEL_DIRS)
 
-# Unfortunately, this list must be maintained if new 
-# recursive targets are added.
+# Unfortunately, this list must be maintained if new recursive targets are added
 all      :: $(addsuffix /.makeall      ,$(PARALLEL_DIRS))
 clean    :: $(addsuffix /.makeclean    ,$(PARALLEL_DIRS))
 clean-all:: $(addsuffix /.makeclean-all,$(PARALLEL_DIRS))
-check    :: $(addsuffix /.makecheck    ,$(PARALLEL_DIRS))
 install  :: $(addsuffix /.makeinstall  ,$(PARALLEL_DIRS))
 uninstall:: $(addsuffix /.makeuninstall,$(PARALLEL_DIRS))
+install-bytecode  :: $(addsuffix /.makeinstall-bytecode,$(PARALLEL_DIRS))
 
-Parallel_Targets := $(foreach T,$(RecursiveTargets),%/.make$(T))
+ParallelTargets := $(foreach T,$(RecursiveTargets),%/.make$(T))
 
-$(Parallel_Targets) :
+$(ParallelTargets) :
 	$(Verb) if [ ! -f $(@D)/Makefile ]; then \
 	  $(MKDIR) $(@D); \
-	  cp $(BUILD_SRC_DIR)/$(@D)/Makefile $(@D)/Makefile; \
+	  $(CP) $(PROJ_SRC_DIR)/$(@D)/Makefile $(@D)/Makefile; \
 	fi; \
-	$(MAKE) -C $(@D) $(subst $(@D)/.make,,$@)
+	if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
+	  $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) ; \
+	fi
 endif
 
 #---------------------------------------------------------
@@ -417,12 +505,14 @@ SubDirs += $(OPTIONAL_DIRS)
 
 $(RecursiveTargets)::
 	$(Verb) for dir in $(OPTIONAL_DIRS); do \
-	  if [ -d $(BUILD_SRC_DIR)/$$dir ]; then\
+	  if [ -d $(PROJ_SRC_DIR)/$$dir ]; then\
 	    if [ ! -f $$dir/Makefile ]; then \
 	      $(MKDIR) $$dir; \
-	      cp $(BUILD_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
+	      $(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
 	    fi; \
-	    ($(MAKE) -C$$dir $@ ) || exit 1; \
+	    if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
+	      ($(MAKE) -C$$dir $@ ) || exit 1; \
+	    fi ; \
 	  fi \
 	done
 endif
@@ -432,22 +522,22 @@ endif
 #---------------------------------------------------------
 ifdef CONFIG_FILES
 
-install-local:: $(sysconfdir) $(CONFIG_FILES)
-	$(Echo) Installing Configuration Files To $(sysconfdir)
+install-local:: $(PROJ_etcdir) $(CONFIG_FILES)
+	$(Echo) Installing Configuration Files To $(PROJ_etcdir)
 	$(Verb)for file in $(CONFIG_FILES); do \
-          if test -f $(BUILD_OBJ_DIR)/$${file} ; then \
-            $(INSTALL) $(BUILD_OBJ_DIR)/$${file} $(sysconfdir) ; \
-          elif test -f $(BUILD_SRC_DIR)/$${file} ; then \
-            $(INSTALL) $(BUILD_SRC_DIR)/$${file} $(sysconfdir) ; \
+          if test -f $(PROJ_OBJ_DIR)/$${file} ; then \
+            $(INSTALL) $(PROJ_OBJ_DIR)/$${file} $(PROJ_etcdir) ; \
+          elif test -f $(PROJ_SRC_DIR)/$${file} ; then \
+            $(INSTALL) $(PROJ_SRC_DIR)/$${file} $(PROJ_etcdir) ; \
           else \
             $(ECHO) Error: cannot find config file $${file}. ; \
           fi \
 	done
 
 uninstall-local::
-	$(Echo) Uninstalling Configuration Files From $(sysconfdir)
+	$(Echo) Uninstalling Configuration Files From $(PROJ_etcdir)
 	$(Verb)for file in $(CONFIG_FILES); do \
-	  $(RM) -f $(sysconfdir)/$${file} ; \
+	  $(RM) -f $(PROJ_etcdir)/$${file} ; \
 	done
 
 endif
@@ -456,13 +546,65 @@ endif
 # Library Build Rules: Four ways to build a library
 ###############################################################################
 
+#---------------------------------------------------------
+# Bytecode Module Targets:
+#   If the user set MODULE_NAME then they want to build a
+#   bytecode module from the sources. We compile all the
+#   sources and link it together into a single bytecode
+#   module.
+#---------------------------------------------------------
+
+ifdef MODULE_NAME
+
+Module     := $(LibDir)/$(MODULE_NAME).bc
+LinkModule := $(LLVMGCCWITHPATH) -shared -nostdlib
+
+ifdef EXPORTED_SYMBOL_FILE
+LinkModule += -Xlinker -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
+endif
+
+$(Module): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir $(GCCLD)
+	$(Echo) Building $(BuildMOde) Bytecode Module $(notdir $@)
+	$(Verb) $(LinkModule) -o $@ $(ObjectsBC)
+
+all-local:: $(Module)
+
+clean-local::
+ifneq ($(strip $(Module)),)
+	-$(Verb) $(RM) -f $(Module)
+endif
+
+ifdef BYTECODE_DESTINATION
+ModuleDestDir := $(BYTECODE_DESTINATION)
+else
+ModuleDestDir := $(PROJ_libdir)
+endif
+
+DestModule := $(ModuleDestDir)/$(MODULE_NAME).bc
+
+install-module:: $(DestModule)
+install-local:: $(DestModule)
+
+$(DestModule): $(ModuleDestDir) $(Module) 
+	$(Echo) Installing $(BuildMode) Bytecode Module $(DestModule)
+	$(Verb) $(INSTALL) $(Module) $@
+
+uninstall-local::
+	$(Echo) Uninstalling $(BuildMode) Bytecode Module $(DestModule)
+	-$(Verb) $(RM) -f $(DestModule)
+
+endif
 
 # if we're building a library ...
 ifdef LIBRARYNAME
 
 # Make sure there isn't any extranous whitespace on the LIBRARYNAME option
 LIBRARYNAME := $(strip $(LIBRARYNAME))
+ifdef LOADABLE_MODULE
+LibName.LA := $(LibDir)/$(LIBRARYNAME).la
+else
 LibName.LA := $(LibDir)/lib$(LIBRARYNAME).la
+endif
 LibName.A  := $(LibDir)/lib$(LIBRARYNAME).a
 LibName.O  := $(LibDir)/$(LIBRARYNAME).o
 LibName.BCA:= $(LibDir)/lib$(LIBRARYNAME).bca
@@ -477,7 +619,7 @@ ifdef SHARED_LIBRARY
 
 all-local:: $(LibName.LA)
 
-$(LibName.LA): $(BUILT_SOURCES) $(ObjectsLO) $(LibDir)/.dir
+$(LibName.LA): $(ObjectsLO) $(LibDir)/.dir
 	$(Echo) Linking $(BuildMode) Shared Library $(LIBRARYNAME)$(SHLIBEXT)
 	$(Verb) $(Link) -o $@ $(ObjectsLO)
 	$(Verb) $(LTInstall) $@ $(LibDir)
@@ -487,18 +629,18 @@ ifneq ($(strip $(LibName.LA)),)
 	-$(Verb) $(RM) -f $(LibName.LA)
 endif
 
-DestSharedLib = $(libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
+DestSharedLib = $(PROJ_libdir)/lib$(LIBRARYNAME)$(SHLIBEXT)
 
 install-local:: $(DestSharedLib)
 
-$(DestSharedLib): $(libdir) $(LibName.LA)
+$(DestSharedLib): $(PROJ_libdir) $(LibName.LA)
 	$(Echo) Installing $(BuildMode) Shared Library $(DestSharedLib)
 	$(Verb) $(LTInstall) $(LibName.LA) $(DestSharedLib)
-	$(Verb) $(LIBTOOL) --finish $(libdir)
+	$(Verb) $(LIBTOOL) --finish $(PROJ_libdir)
 
 uninstall-local:: 
 	$(Echo) Uninstalling $(BuildMode) Shared Library $(DestSharedLib)
-	-$(Verb) $(RM) -f $(libdir)/lib$(LIBRARYNAME).*
+	-$(Verb) $(RM) -f $(PROJ_libdir)/lib$(LIBRARYNAME).*
 
 endif
 
@@ -510,20 +652,28 @@ endif
 #---------------------------------------------------------
 ifdef BYTECODE_LIBRARY
 
+# make the C and C++ compilers strip debug info out of bytecode libraries.
+BCCompile.C += -Wa,-strip-debug
+BCCompile.CXX += -Wa,-strip-debug
+
 all-local:: $(LibName.BCA)
 
 ifdef EXPORTED_SYMBOL_FILE
-BCLinkLib = $(LLVMGCC) -shared -nostdlib -Xlinker \
+BCLinkLib = $(LLVMGCCWITHPATH) -shared -nostdlib -Xlinker \
 	    -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
 
-$(LibName.BCA): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir $(GCCLD)
+$(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(GCCLD) \
+                $(LLVMToolDir)/llvm-ar
 	$(Echo) Building $(BuildMode) Bytecode Archive $(notdir $@) \
 	  "(internalize)"
 	$(Verb) $(BCLinkLib) -o $(ObjDir)/$(LIBRARYNAME).o $(ObjectsBC)
+	$(Verb) $(RM) -f $@
 	$(Verb) $(LArchive) $@ $(ObjDir)/$(LIBRARYNAME).o
 else
-$(LibName.BCA): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir $(GCCLD)
+$(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir \
+                $(LLVMToolDir)/llvm-ar
 	$(Echo) Building $(BuildMode) Bytecode Archive $(notdir $@)
+	$(Verb) $(RM) -f $@
 	$(Verb) $(LArchive) $@ $(ObjectsBC)
 
 endif
@@ -533,13 +683,19 @@ ifneq ($(strip $(LibName.BCA)),)
 	-$(Verb) $(RM) -f $(LibName.BCA)
 endif
 
-DestBytecodeLib = $(bytecode_libdir)/lib$(LIBRARYNAME).a
+ifdef BYTECODE_DESTINATION
+BytecodeDestDir := $(BYTECODE_DESTINATION)
+else
+BytecodeDestDir := $(PROJ_libdir)
+endif
+
+DestBytecodeLib = $(BytecodeDestDir)/lib$(LIBRARYNAME).a
 
-install-bytecode: $(DestBytecodeLib)
+install-bytecode-local:: $(DestBytecodeLib)
 
 install-local:: $(DestBytecodeLib)
 
-$(DestBytecodeLib): $(bytecode_libdir) $(LibName.BCA) 
+$(DestBytecodeLib): $(BytecodeDestDir) $(LibName.BCA) 
 	$(Echo) Installing $(BuildMode) Bytecode Archive $(DestBytecodeLib)
 	$(Verb) $(INSTALL) $(LibName.BCA) $@
 
@@ -558,7 +714,7 @@ ifndef DONT_BUILD_RELINKED
 
 all-local:: $(LibName.O)
 
-$(LibName.O): $(BUILT_SOURCES) $(ObjectsO) $(LibDir)/.dir
+$(LibName.O): $(ObjectsO) $(LibDir)/.dir
 	$(Echo) Linking $(BuildMode) Object Library $(notdir $@)
 	$(Verb) $(Relink) -o $@ $(ObjectsO)
 
@@ -567,11 +723,11 @@ ifneq ($(strip $(LibName.O)),)
 	-$(Verb) $(RM) -f $(LibName.O)
 endif
 
-DestRelinkedLib = $(libdir)/$(LIBRARYNAME).o
+DestRelinkedLib = $(PROJ_libdir)/$(LIBRARYNAME).o
 
 install-local:: $(DestRelinkedLib)
 
-$(DestRelinkedLib): $(libdir) $(LibName.O)
+$(DestRelinkedLib): $(PROJ_libdir) $(LibName.O)
 	$(Echo) Installing $(BuildMode) Object Library $(DestRelinkedLib)
 	$(Verb) $(LTInstall) $(LibName.O) $(DestRelinkedLib)
 
@@ -590,7 +746,7 @@ ifdef BUILD_ARCHIVE
 
 all-local:: $(LibName.A)
 
-$(LibName.A): $(BUILT_SOURCES) $(ObjectsO) $(LibDir)/.dir
+$(LibName.A): $(ObjectsO) $(LibDir)/.dir
 	$(Echo) Building $(BuildMode) Archive Library $(notdir $@)
 	-$(Verb) $(RM) -f $@
 	$(Verb) $(Archive) $@ $(ObjectsO)
@@ -601,13 +757,13 @@ ifneq ($(strip $(LibName.A)),)
 	-$(Verb) $(RM) -f $(LibName.A)
 endif
 
-DestArchiveLib := $(libdir)/lib$(LIBRARYNAME).a
+DestArchiveLib := $(PROJ_libdir)/lib$(LIBRARYNAME).a
 
 install-local:: $(DestArchiveLib)
 
-$(DestArchiveLib): $(libdir) $(LibName.A)
+$(DestArchiveLib): $(PROJ_libdir) $(LibName.A)
 	$(Echo) Installing $(BuildMode) Archive Library $(DestArchiveLib)
-	$(Verb) $(MKDIR) $(libdir)
+	$(Verb) $(MKDIR) $(PROJ_libdir)
 	$(Verb) $(LTInstall) $(LibName.A) $(DestArchiveLib)
 
 uninstall-local::
@@ -722,17 +878,17 @@ else
 $(ToolBuildPath): $(ToolDir)/.dir
 endif
 
-$(ToolBuildPath): $(BUILT_SOURCES) $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
+$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)
 	$(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg)
 	$(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \
           $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB)
 	$(Echo) ======= Finished Linking $(BuildMode) Executable $(TOOLNAME) $(StripWarnMsg) 
 
-DestTool = $(bindir)/$(TOOLNAME)
+DestTool = $(PROJ_bindir)/$(TOOLNAME)
 
 install-local:: $(DestTool)
 
-$(DestTool): $(bindir) $(ToolBuildPath)
+$(DestTool): $(PROJ_bindir) $(ToolBuildPath)
 	$(Echo) Installing $(BuildMode) $(DestTool)
 	$(Verb) $(INSTALL) $(ToolBuildPath) $(DestTool)
 
@@ -754,13 +910,19 @@ ifndef DISABLE_AUTO_DEPENDENCIES
 #---------------------------------------------------------
 ifdef SHARED_LIBRARY
 
-$(ObjDir)/%.lo $(ObjDir)/%.o: %.cpp $(ObjDir)/.dir
+$(ObjDir)/%.lo $(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES)
 	$(Echo) "Compiling $*.cpp for $(BuildMode) build (PIC)"
 	$(Verb) if $(LTCompile.CXX) -MD -MT $@ -MP -MF $(ObjDir)/$*.LACXXd $< -o $@ ; \
 	then $(MV) -f "$(ObjDir)/$*.LACXXd" "$(ObjDir)/$*.d"; \
 	else $(RM) -f "$(ObjDir)/$*.LACXXd"; exit 1; fi
 
-$(ObjDir)/%.lo $(ObjDir)/%.o: %.c $(ObjDir)/.dir 
+$(ObjDir)/%.lo $(ObjDir)/%.o: %.cc $(ObjDir)/.dir $(BUILT_SOURCES)
+	$(Echo) "Compiling $*.cc for $(BuildMode) build (PIC)"
+	$(Verb) if $(LTCompile.CXX) -MD -MT $@ -MP -MF $(ObjDir)/$*.LACXXd $< -o $@ ; \
+	then $(MV) -f "$(ObjDir)/$*.LACXXd" "$(ObjDir)/$*.d"; \
+	else $(RM) -f "$(ObjDir)/$*.LACXXd"; exit 1; fi
+
+$(ObjDir)/%.lo $(ObjDir)/%.o: %.c $(ObjDir)/.dir $(BUILT_SOURCES)
 	$(Echo) "Compiling $*.c for $(BuildMode) build (PIC)"
 	$(Verb) if $(LTCompile.C) -MD -MT $@ -MP -MF $(ObjDir)/$*.LACd $< -o $@ ; \
 	then $(MV) -f "$(ObjDir)/$*.LACd" "$(ObjDir)/$*.d"; \
@@ -771,13 +933,19 @@ $(ObjDir)/%.lo $(ObjDir)/%.o: %.c $(ObjDir)/.dir
 #---------------------------------------------------------
 else
 
-$(ObjDir)/%.o: %.cpp $(ObjDir)/.dir
+$(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES)
 	$(Echo) "Compiling $*.cpp for $(BuildMode) build"
 	$(Verb) if $(Compile.CXX) -MD -MT $@ -MP -MF $(ObjDir)/$*.CXXd $< -o $@ ; \
 	then $(MV) -f "$(ObjDir)/$*.CXXd" "$(ObjDir)/$*.d"; \
 	else $(RM) -f "$(ObjDir)/$*.CXXd"; exit 1; fi
 
-$(ObjDir)/%.o: %.c $(ObjDir)/.dir
+$(ObjDir)/%.o: %.cc $(ObjDir)/.dir $(BUILT_SOURCES)
+	$(Echo) "Compiling $*.cc for $(BuildMode) build"
+	$(Verb) if $(Compile.CXX) -MD -MT $@ -MP -MF $(ObjDir)/$*.CXXd $< -o $@ ; \
+	then $(MV) -f "$(ObjDir)/$*.CXXd" "$(ObjDir)/$*.d"; \
+	else $(RM) -f "$(ObjDir)/$*.CXXd"; exit 1; fi
+
+$(ObjDir)/%.o: %.c $(ObjDir)/.dir $(BUILT_SOURCES)
 	$(Echo) "Compiling $*.c for $(BuildMode) build"
 	$(Verb) if $(Compile.C) -MD -MT $@ -MP -MF $(ObjDir)/$*.Cd $< -o $@ ; \
 	then $(MV) -f "$(ObjDir)/$*.Cd" "$(ObjDir)/$*.d"; \
@@ -786,15 +954,21 @@ $(ObjDir)/%.o: %.c $(ObjDir)/.dir
 endif
 
 #---------------------------------------------------------
-# Create .bc files in the ObjDir directory from .cpp and .c files...
+# Create .bc files in the ObjDir directory from .cpp .cc and .c files...
 #---------------------------------------------------------
-$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir $(GCCAS)
+$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir $(GCCAS) $(BUILT_SOURCES)
 	$(Echo) "Compiling $*.cpp for $(BuildMode) build (bytecode)"
 	$(Verb) if $(BCCompile.CXX) -MD -MT $@ -MP -MF "$(ObjDir)/$*.BCCXXd" $< -o $@ ; \
 	then $(MV) -f "$(ObjDir)/$*.BCCXXd" "$(ObjDir)/$*.d"; \
 	else $(RM) -f "$(ObjDir)/$*.BCCXXd"; exit 1; fi
 
-$(ObjDir)/%.bc: %.c $(ObjDir)/.dir $(GCCAS)
+$(ObjDir)/%.bc: %.cc $(ObjDir)/.dir $(GCCAS) $(BUILT_SOURCES)
+	$(Echo) "Compiling $*.cc for $(BuildMode) build (bytecode)"
+	$(Verb) if $(BCCompile.CXX) -MD -MT $@ -MP -MF "$(ObjDir)/$*.BCCXXd" $< -o $@ ; \
+	then $(MV) -f "$(ObjDir)/$*.BCCXXd" "$(ObjDir)/$*.d"; \
+	else $(RM) -f "$(ObjDir)/$*.BCCXXd"; exit 1; fi
+
+$(ObjDir)/%.bc: %.c $(ObjDir)/.dir $(GCCAS) $(BUILT_SOURCES)
 	$(Echo) "Compiling $*.c for $(BuildMode) build (bytecode)"
 	$(Verb) if $(BCCompile.C) -MD -MT $@ -MP -MF "$(ObjDir)/$*.BCCd" $< -o $@ ; \
 	then $(MV) -f "$(ObjDir)/$*.BCCd" "$(ObjDir)/$*.d"; \
@@ -805,30 +979,42 @@ else
 
 ifdef SHARED_LIBRARY
 
-$(ObjDir)/%.lo $(ObjDir)/%.o: %.cpp $(ObjDir)/.dir 
+$(ObjDir)/%.lo $(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES)
 	$(Echo) "Compiling $*.cpp for $(BuildMode) build (PIC)"
 	$(LTCompile.CXX) $< -o $@ 
 
-$(ObjDir)/%.lo $(ObjDir)/%.o: %.c $(ObjDir)/.dir 
-	$(Echo) "Compiling $*.cpp for $(BuildMode) build (PIC)"
+$(ObjDir)/%.lo $(ObjDir)/%.o: %.cc $(ObjDir)/.dir $(BUILT_SOURCES)
+	$(Echo) "Compiling $*.cc for $(BuildMode) build (PIC)"
+	$(LTCompile.CXX) $< -o $@ 
+
+$(ObjDir)/%.lo $(ObjDir)/%.o: %.c $(ObjDir)/.dir $(BUILT_SOURCES)
+	$(Echo) "Compiling $*.c for $(BuildMode) build (PIC)"
 	$(LTCompile.C) $< -o $@ 
 
 else
 
-$(ObjDir)/%.o: %.cpp $(ObjDir)/.dir
+$(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES)
 	$(Echo) "Compiling $*.cpp for $(BuildMode) build"
 	$(Compile.CXX) $< -o $@ 
 
-$(ObjDir)/%.o: %.c $(ObjDir)/.dir
-	$(Echo) "Compiling $*.cpp for $(BuildMode) build"
+$(ObjDir)/%.o: %.cc $(ObjDir)/.dir $(BUILT_SOURCES)
+	$(Echo) "Compiling $*.cc for $(BuildMode) build"
+	$(Compile.CXX) $< -o $@ 
+
+$(ObjDir)/%.o: %.c $(ObjDir)/.dir $(BUILT_SOURCES)
+	$(Echo) "Compiling $*.c for $(BuildMode) build"
 	$(Compile.C) $< -o $@ 
 endif
 
-$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir $(GCCAS)
+$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir $(GCCAS) $(BUILT_SOURCES)
 	$(Echo) "Compiling $*.cpp for $(BuildMode) build (bytecode)"
 	$(BCCompile.CXX) $< -o $@ 
 
-$(ObjDir)/%.bc: %.c $(ObjDir)/.dir $(GCCAS)
+$(ObjDir)/%.bc: %.cc $(ObjDir)/.dir $(GCCAS) $(BUILT_SOURCES)
+	$(Echo) "Compiling $*.cc for $(BuildMode) build (bytecode)"
+	$(BCCompile.CXX) $< -o $@ 
+
+$(ObjDir)/%.bc: %.c $(ObjDir)/.dir $(GCCAS) $(BUILT_SOURCES)
 	$(Echo) "Compiling $*.c for $(BuildMode) build (bytecode)"
 	$(BCCompile.C) $< -o $@
 
@@ -848,48 +1034,60 @@ $(ObjDir)/%.bc: %.ll $(ObjDir)/.dir $(LLVMAS)
 
 ifdef TARGET
 
-TDFiles := $(strip $(wildcard $(BUILD_SRC_DIR)/*.td) $(LLVM_SRC_ROOT)/lib/Target/Target.td)
+TDFiles := $(strip $(wildcard $(PROJ_SRC_DIR)/*.td) $(LLVM_SRC_ROOT)/lib/Target/Target.td)
 INCFiles := $(filter %.inc,$(BUILT_SOURCES))
-
-$(INCFiles) : $(TBLGEN) $(TDFiles)
-
-%GenRegisterNames.inc : %.td 
+INCTMPFiles := $(INCFiles:%=$(ObjDir)/%.tmp)
+.PRECIOUS: $(INCTMPFiles) $(INCFiles)
+
+# All of these files depend on tblgen and the .td files.
+$(INCTMPFiles) : $(TBLGEN) $(TDFiles)
+
+# INCFiles rule: All of the tblgen generated files are emitted to 
+# $(ObjDir)/%.inc.tmp, instead of emitting them directly to %.inc.  This allows
+# us to only "touch" the real file if the contents of it change.  IOW, if
+# tblgen is modified, all of the .inc.tmp files are regereated, but no
+# dependencies of the .inc files are, unless the contents of the .inc file
+# changes.
+$(INCFiles) : %.inc : $(ObjDir)/%.inc.tmp
+	$(Verb) $(CMP) -s $@ $< || $(CP) $< $@
+
+$(TARGET:%=$(ObjDir)/%GenRegisterNames.inc.tmp): \
+$(ObjDir)/%GenRegisterNames.inc.tmp : %.td $(ObjDir)/.dir
 	$(Echo) "Building $(<F) register names with tblgen"
 	$(Verb) $(TableGen) -gen-register-enums -o $@ $<
 
-%GenRegisterInfo.h.inc : %.td 
+$(TARGET:%=$(ObjDir)/%GenRegisterInfo.h.inc.tmp): \
+$(ObjDir)/%GenRegisterInfo.h.inc.tmp : %.td $(ObjDir)/.dir
 	$(Echo) "Building $(<F) register information header with tblgen"
 	$(Verb) $(TableGen) -gen-register-desc-header -o $@ $<
 
-%GenRegisterInfo.inc : %.td
+$(TARGET:%=$(ObjDir)/%GenRegisterInfo.inc.tmp): \
+$(ObjDir)/%GenRegisterInfo.inc.tmp : %.td $(ObjDir)/.dir
 	$(Echo) "Building $(<F) register info implementation with tblgen"
 	$(Verb) $(TableGen) -gen-register-desc -o $@ $<
 
-%GenInstrNames.inc : %.td
+$(TARGET:%=$(ObjDir)/%GenInstrNames.inc.tmp): \
+$(ObjDir)/%GenInstrNames.inc.tmp : %.td $(ObjDir)/.dir
 	$(Echo) "Building $(<F) instruction names with tblgen"
 	$(Verb) $(TableGen) -gen-instr-enums -o $@ $<
 
-%GenInstrInfo.inc : %.td
+$(TARGET:%=$(ObjDir)/%GenInstrInfo.inc.tmp): \
+$(ObjDir)/%GenInstrInfo.inc.tmp : %.td $(ObjDir)/.dir
 	$(Echo) "Building $(<F) instruction information with tblgen"
 	$(Verb) $(TableGen) -gen-instr-desc -o $@ $<
 
-%GenAsmWriter.inc : %.td
+$(TARGET:%=$(ObjDir)/%GenAsmWriter.inc.tmp): \
+$(ObjDir)/%GenAsmWriter.inc.tmp : %.td $(ObjDir)/.dir
 	$(Echo) "Building $(<F) assembly writer with tblgen"
 	$(Verb) $(TableGen) -gen-asm-writer -o $@ $<
 
-%GenATTAsmWriter.inc : %.td
-	$(Echo) "Building $(<F) AT&T assembly writer with tblgen"
-	$(Verb) $(TableGen) -gen-asm-writer -o $@ $< 
-
-%GenIntelAsmWriter.inc : %.td
-	$(Echo) "Building $(<F) Intel assembly writer with tblgen"
+$(TARGET:%=$(ObjDir)/%GenAsmWriter1.inc.tmp): \
+$(ObjDir)/%GenAsmWriter1.inc.tmp : %.td $(ObjDir)/.dir
+	$(Echo) "Building $(<F) assembly writer #1 with tblgen"
 	$(Verb) $(TableGen) -gen-asm-writer -asmwriternum=1 -o $@ $< 
 
-%GenInstrSelector.inc: %.td
-	$(Echo) "Building $(<F) instruction selector with tblgen"
-	$(Verb) $(TableGen) -gen-instr-selector -o $@ $< 
-
-%GenCodeEmitter.inc:: %.td
+$(TARGET:%=$(ObjDir)/%GenCodeEmitter.inc.tmp): \
+$(ObjDir)/%GenCodeEmitter.inc.tmp: %.td $(ObjDir)/.dir
 	$(Echo) "Building $(<F) code emitter with tblgen"
 	$(Verb) $(TableGen) -gen-emitter -o $@ $<
 
@@ -922,7 +1120,7 @@ LexOutput := $(strip $(patsubst %.l,%.cpp,$(LexFiles)))
 # this is a hack around it.
 # FIXME.  (f.e. char Buffer[10000] )
 %.cpp: %.l
-	$(Echo) Flexing $<
+	$(Echo) Flexing $*.l
 	$(Verb) $(FLEX) -t $< | \
 	$(SED) 's/void yyunput/inline void yyunput/' | \
 	$(SED) 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \
@@ -980,6 +1178,7 @@ endif
 # which they can be "generated."  This allows make to ignore them and
 # reproduce the dependency lists.
 %.h:: ;
+%.hpp:: ;
 
 # Define clean-local to clean the current directory. Note that this uses a
 # very conservative approach ensuring that empty variables do not cause 
@@ -1000,20 +1199,20 @@ clean-all-local::
 tags:: TAGS CTAGS
 
 TAGS: 
-	find $(BUILD_SRC_ROOT)/include $(BUILD_SRC_ROOT)/lib \
-          $(BUILD_SRC_ROOT)/tools $(BUILD_SRC_ROOT)/examples \
-          $(BUILD_OBJ_ROOT)/include $(BUILD_OBJ_ROOT)/lib \
-          $(BUILD_OBJ_ROOT)/tools $(BUILD_OBJ_ROOT)/examples \
+	find $(PROJ_SRC_ROOT)/include $(PROJ_SRC_ROOT)/lib \
+          $(PROJ_SRC_ROOT)/tools $(PROJ_SRC_ROOT)/examples \
+          $(PROJ_OBJ_ROOT)/include $(PROJ_OBJ_ROOT)/lib \
+          $(PROJ_OBJ_ROOT)/tools $(PROJ_OBJ_ROOT)/examples \
         -name '*.cpp' -o -name '*.h' | \
         $(ETAGS) $(ETAGSFLAGS) -
 
 CTAGS:
-	find $(BUILD_SRC_ROOT)/include $(BUILD_SRC_ROOT)/lib \
-          $(BUILD_SRC_ROOT)/tools $(BUILD_SRC_ROOT)/examples \
-          $(BUILD_OBJ_ROOT)/include $(BUILD_OBJ_ROOT)/lib \
-          $(BUILD_OBJ_ROOT)/tools $(BUILD_OBJ_ROOT)/examples \
+	find $(PROJ_SRC_ROOT)/include $(PROJ_SRC_ROOT)/lib \
+          $(PROJ_SRC_ROOT)/tools $(PROJ_SRC_ROOT)/examples \
+          $(PROJ_OBJ_ROOT)/include $(PROJ_OBJ_ROOT)/lib \
+          $(PROJ_OBJ_ROOT)/tools $(PROJ_OBJ_ROOT)/examples \
           \( -name '*.cpp' -o -name '*.h' \) -print | \
-          ctags -ImtT -o $(BUILD_OBJ_ROOT)/CTAGS -L -
+          ctags -ImtT -o $(PROJ_OBJ_ROOT)/CTAGS -L -
 
 
 ###############################################################################
@@ -1026,7 +1225,7 @@ ifneq ($strip($(filter-out clean clean-local dist-clean,$(MAKECMDGOALS))),)
 
 # Get the list of dependency files
 DependFiles := $(basename $(filter %.cpp %.c %.cc, $(Sources)))
-DependFiles := $(patsubst %,$(BUILD_OBJ_DIR)/$(BuildMode)/%.d,$(DependFiles))
+DependFiles := $(patsubst %,$(PROJ_OBJ_DIR)/$(BuildMode)/%.d,$(DependFiles))
 
 -include /dev/null $(DependFiles)
 
@@ -1034,6 +1233,23 @@ endif
 
 endif 
 
+###############################################################################
+# CHECK: Running the test suite
+###############################################################################
+
+check::
+	$(Verb) if test -d "$(PROJ_OBJ_ROOT)/test" ; then \
+	  if test -f "$(PROJ_OBJ_ROOT)/test/Makefile" ; then \
+	    $(EchoCmd) Running test suite ; \
+	    $(MAKE) -C $(PROJ_OBJ_ROOT)/test check-local \
+	      TESTSUITE=$(TESTSUITE) ; \
+	  else \
+	    $(EchoCmd) No Makefile in test directory ; \
+	  fi ; \
+	else \
+	  $(EchoCmd) No test directory ; \
+	fi
+
 ###############################################################################
 # DISTRIBUTION: Handle construction of a distribution tarball
 ###############################################################################
@@ -1041,21 +1257,21 @@ endif
 #------------------------------------------------------------------------
 # Define distribution related variables
 #------------------------------------------------------------------------
-DistName    := $(LLVM_TARBALL_NAME)
-DistDir     := $(BUILD_OBJ_ROOT)/$(DistName)
-TopDistDir  := $(BUILD_OBJ_ROOT)/$(DistName)
-DistTarGZip := $(BUILD_OBJ_ROOT)/$(DistName).tar.gz
-DistZip     := $(BUILD_OBJ_ROOT)/$(DistName).zip
-DistTarBZ2  := $(BUILD_OBJ_ROOT)/$(DistName).tar.bz2
+DistName    := $(PROJECT_NAME)-$(PROJ_VERSION)
+DistDir     := $(PROJ_OBJ_ROOT)/$(DistName)
+TopDistDir  := $(PROJ_OBJ_ROOT)/$(DistName)
+DistTarGZip := $(PROJ_OBJ_ROOT)/$(DistName).tar.gz
+DistZip     := $(PROJ_OBJ_ROOT)/$(DistName).zip
+DistTarBZ2  := $(PROJ_OBJ_ROOT)/$(DistName).tar.bz2
 DistAlways  := CREDITS.TXT LICENSE.TXT README.txt README AUTHORS COPYING \
 	       ChangeLog INSTALL NEWS Makefile Makefile.common Makefile.rules \
 	       Makefile.config.in configure autoconf
 DistOther   := $(notdir $(wildcard \
-               $(BUILD_SRC_DIR)/*.h \
-               $(BUILD_SRC_DIR)/*.td \
-               $(BUILD_SRC_DIR)/*.def \
-               $(BUILD_SRC_DIR)/*.ll \
-               $(BUILD_SRC_DIR)/*.in))
+               $(PROJ_SRC_DIR)/*.h \
+               $(PROJ_SRC_DIR)/*.td \
+               $(PROJ_SRC_DIR)/*.def \
+               $(PROJ_SRC_DIR)/*.ll \
+               $(PROJ_SRC_DIR)/*.in))
 DistSubDirs := $(SubDirs)
 DistSources  = $(Sources) $(EXTRA_DIST)
 DistFiles    = $(DistAlways) $(DistSources) $(DistOther)
@@ -1063,30 +1279,18 @@ DistFiles    = $(DistAlways) $(DistSources) $(DistOther)
 #------------------------------------------------------------------------
 # We MUST build distribution with OBJ_DIR != SRC_DIR
 #------------------------------------------------------------------------
-ifeq ($(BUILD_SRC_DIR),$(BUILD_OBJ_DIR))
+ifeq ($(PROJ_SRC_DIR),$(PROJ_OBJ_DIR))
 dist dist-check dist-clean dist-gzip dist-bzip2 dist-zip ::
 	$(Echo) ERROR: Target $@ only available with OBJ_DIR != SRC_DIR
 
-DistCheckTop := 
 else
 
-DistCheckTop := check
-
-#------------------------------------------------------------------------
-# Prevent catastrophic remove
-#------------------------------------------------------------------------
-ifeq ($(LLVM_TARBALL_NAME),)
-$(error LLVM_TARBALL_NAME is empty.  Please rerun configure)
-endif
-
 #------------------------------------------------------------------------
 # Prevent attempt to run dist targets from anywhere but the top level
 #------------------------------------------------------------------------
 ifneq ($(LEVEL),.)
-
 dist dist-check dist-clean dist-gzip dist-bzip2 dist-zip ::
-	$(Echo) ERROR: You must run $@ from $(BUILD_OBJ_ROOT)
-
+	$(Echo) ERROR: You must run $@ from $(PROJ_OBJ_ROOT)
 else
 
 #------------------------------------------------------------------------
@@ -1095,31 +1299,31 @@ else
 
 dist-gzip:: $(DistTarGZip)
 
-$(DistTarGZip) : distdir
+$(DistTarGZip) : $(TopDistDir)/.makedistdir
 	$(Echo) Packing gzipped distribution tar file.
-	$(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - "$(DistName)" | \
+	$(Verb) cd $(PROJ_OBJ_ROOT) ; $(TAR) chf - "$(DistName)" | \
 	  $(GZIP) -c > "$(DistTarGZip)"
 
 dist-bzip2:: $(DistTarBZ2)
 
-$(DistTarBZ2) : distdir
+$(DistTarBZ2) : $(TopDistDir)/.makedistdir
 	$(Echo) Packing bzipped distribution tar file.
-	$(Verb) cd $(BUILD_OBJ_ROOT) ; $(TAR) chf - $(DistName) | \
+	$(Verb) cd $(PROJ_OBJ_ROOT) ; $(TAR) chf - $(DistName) | \
 	  $(BZIP2) -c >$(DistTarBZ2)
 
 dist-zip:: $(DistZip)
 
-$(DistZip) : distdir
+$(DistZip) : $(TopDistDir)/.makedistdir
 	$(Echo) Packing zipped distribution file.
 	$(Verb) rm -f $(DistZip)
-	$(Verb) cd $(BUILD_OBJ_ROOT) ; $(ZIP) -rq $(DistZip) $(DistName)
+	$(Verb) cd $(PROJ_OBJ_ROOT) ; $(ZIP) -rq $(DistZip) $(DistName)
 
 dist :: $(DistTarGZip) $(DistTarBZ2) $(DistZip) 
 	$(Echo) ===== DISTRIBUTION PACKAGING SUCESSFUL =====
 
-DistCheckDir := $(LLVM_OBJ_ROOT)/_distcheckdir
+DistCheckDir := $(PROJ_OBJ_ROOT)/_distcheckdir
 
-dist-check:: $(DistCheckTop) $(DistTarGZip)
+dist-check:: $(DistTarGZip)
 	$(Echo) Checking distribution tar file.
 	$(Verb) if test -d $(DistCheckDir) ; then \
 	  $(RM) -rf $(DistCheckDir) ; \
@@ -1131,7 +1335,8 @@ dist-check:: $(DistCheckTop) $(DistTarGZip)
 	  gunzip -c $(DistTarGZip) | $(TAR) xf - && \
 	  cd build && \
 	  ../$(DistName)/configure --prefix="$(DistCheckDir)/install" \
-	    --srcdir=../$(DistName) --with-llvmgccdir="$(LLVMGCCDIR)" && \
+	    --srcdir=../$(DistName) && \
+	  $(MAKE) all && \
 	  $(MAKE) check && \
 	  $(MAKE) install && \
 	  $(MAKE) uninstall && \
@@ -1142,37 +1347,47 @@ dist-check:: $(DistCheckTop) $(DistTarGZip)
 
 dist-clean::
 	$(Echo) Cleaning distribution files
-	-$(Verb) $(RM) -rf $(DistTarGZip) $(DistTarBZ2) $(DistZip) $(DistName) $(DistCheckDir)
+	-$(Verb) $(RM) -rf $(DistTarGZip) $(DistTarBZ2) $(DistZip) $(DistName) \
+	  $(DistCheckDir)
 
 endif
 
 #------------------------------------------------------------------------
 # Provide the recursive distdir target for building the distribution directory
 #------------------------------------------------------------------------
-distdir : $(DistSources)
+distdir: $(DistDir)/.makedistdir
+$(DistDir)/.makedistdir: $(DistSources)
 	$(Verb) if test "$(DistDir)" = "$(TopDistDir)" ; then \
 	  if test -d "$(DistDir)" ; then \
 	    find $(DistDir) -type d ! -perm -200 -exec chmod u+w {} ';'  || \
 	      exit 1 ; \
 	  fi ; \
-	  $(EchoCmd) Removing $(DistDir) ; \
+	  $(EchoCmd) Removing old $(DistDir) ; \
 	  $(RM) -rf $(DistDir); \
+	  $(EchoCmd) Making 'all' to verify build ; \
+	  $(MAKE) all ; \
 	fi
 	$(Echo) Building Distribution Directory $(DistDir)
 	$(Verb) $(MKDIR) $(DistDir) 
-	$(Verb) srcdirstrip=`echo "$(BUILD_SRC_DIR)" | sed 's|.|.|g'`; \
-	srcrootstrip=`echo "$(BUILD_SRC_ROOT)" | sed 's|.|.|g'`; \
+	$(Verb) srcdirstrip=`echo "$(PROJ_SRC_DIR)" | sed 's|.|.|g'`; \
+	srcrootstrip=`echo "$(PROJ_SRC_ROOT)" | sed 's|.|.|g'`; \
 	for file in $(DistFiles) ; do \
 	  case "$$file" in \
-	    $(BUILD_SRC_DIR)/*) file=`echo "$$file" | sed "s#^$$srcdirstrip/##"`;; \
-	    $(BUILD_SRC_ROOT)/*) file=`echo "$$file" | sed "s#^$$srcrootstrip/#$(BUILD_OBJ_ROOT)/#"`;; \
+	    $(PROJ_SRC_DIR)/*) \
+	      file=`echo "$$file" | sed "s#^$$srcdirstrip/##"` \
+	      ;; \
+	    $(PROJ_SRC_ROOT)/*) \
+	      file=`echo "$$file" | \
+		sed "s#^$$srcrootstrip/##"` \
+	      ;; \
 	  esac; \
-	  if test -f "$$file" || test -d "$$file" ; then \
+	  if test -f "$(PROJ_SRC_DIR)/$$file" || \
+	     test -d "$(PROJ_SRC_DIR)/$$file" ; then \
+	    from_dir="$(PROJ_SRC_DIR)" ; \
+	  elif test -f "$$file" || test -d "$$file" ; then \
 	    from_dir=. ; \
-	  else \
-	    from_dir=$(BUILD_SRC_DIR); \
-	  fi; \
-	  to_dir=`echo "$$file" | sed -e 's#/[^/]*$$##'`; \
+	  fi ; \
+	  to_dir=`echo "$$file" | sed -e 's#/[^/]*$$##'` ; \
 	  if test "$$to_dir" != "$$file" && test "$$to_dir" != "."; then \
 	    to_dir="$(DistDir)/$$dir"; \
 	    $(MKDIR) "$$to_dir" ; \
@@ -1184,17 +1399,18 @@ distdir : $(DistSources)
             $(MKDIR) "$$to_dir/$$mid_dir" || exit 1; \
           fi ; \
 	  if test -d "$$from_dir/$$file"; then \
-	    if test -d "$(BUILD_SRC_DIR)/$$file" && \
-	       test "$$from_dir" != "$(BUILD_SRC_DIR)" ; then \
-	      cp -pR "$(BUILD_SRC_DIR)/$$file" "$$to_dir" || exit 1; \
+	    if test -d "$(PROJ_SRC_DIR)/$$file" && \
+	       test "$$from_dir" != "$(PROJ_SRC_DIR)" ; then \
+	      $(CP) -pR "$(PROJ_SRC_DIR)/$$file" "$$to_dir" || exit 1; \
 	    fi; \
-	    cp -pR $$from_dir/$$file $$to_dir || exit 1; \
+	    $(CP) -pR $$from_dir/$$file $$to_dir || exit 1; \
 	  elif test -f "$$from_dir/$$file" ; then \
-	    cp -p "$$from_dir/$$file" "$(DistDir)/$$file" || exit 1; \
+	    $(CP) -p "$$from_dir/$$file" "$(DistDir)/$$file" || exit 1; \
 	  elif test -L "$$from_dir/$$file" ; then \
-	    cp -pd "$$from_dir/$$file" $(DistDir)/$$file || exit 1; \
+	    $(CP) -pd "$$from_dir/$$file" $(DistDir)/$$file || exit 1; \
 	  elif echo "$(DistAlways)" | grep -v "$$file" >/dev/null ; then \
-	    $(EchoCmd) "===== WARNING: Distribution Source $$from_dir/$$file Not Found!" ; \
+	    $(EchoCmd) "===== WARNING: Distribution Source " \
+	      "$$from_dir/$$file Not Found!" ; \
 	  elif test "$(Verb)" != '@' ; then \
 	    $(EchoCmd) "Skipping non-existent $$from_dir/$$file" ; \
 	  fi; \
@@ -1203,15 +1419,21 @@ distdir : $(DistSources)
 	  if test "$$subdir" \!= "." ; then \
 	    new_distdir="$(DistDir)/$$subdir" ; \
 	    test -d "$$new_distdir" || $(MKDIR) "$$new_distdir" || exit 1; \
-	    ( cd $$subdir && $(MAKE) DistDir="$$new_distdir" distdir ) || exit 1; \
+	    ( cd $$subdir && $(MAKE) DistDir="$$new_distdir" distdir ) || \
+	    exit 1; \
 	  fi; \
 	done
-	$(Verb) $(MAKE) DistDir="$(DistDir)" dist-hook || exit 1
-	-$(Verb) find $(DistDir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(INSTALL_SH) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(DistDir)
+	$(Verb) if test "$(DistDir)" = "$(TopDistDir)" ; then \
+	  $(EchoCmd) Eliminating CVS directories from distribution ; \
+	  $(RM) -rf `find $(TopDistDir) -type d -name CVS -print` ;\
+	  $(MAKE) dist-hook ; \
+	  $(FIND) $(TopDistDir) -type d ! -perm -777 -exec chmod a+rwx {} \; \
+	    -o ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; \
+	    -o ! -type d ! -perm -400 -exec chmod a+r {} \; \
+	    -o ! -type d ! -perm -444 -exec \
+	      $(SHELL) $(INSTALL_SH) -c -m a+r {} {} \; \
+	    || chmod -R a+r $(DistDir) ; \
+	fi
 
 # This is invoked by distdir target, define it as a no-op to avoid errors if not
 # defined by user.
@@ -1226,26 +1448,34 @@ endif
 ifeq ($(LEVEL),.)
 
 #------------------------------------------------------------------------
-# Install support for project's include files:
+# Install support for the project's include files:
 #------------------------------------------------------------------------
 install-local::
 	$(Echo) Installing include files
-	$(Verb) $(MKDIR) $(includedir)
-	$(Verb) if [ -d "$(BUILD_SRC_ROOT)/include" ] ; then \
-	  cd $(BUILD_SRC_ROOT)/include && \
+	$(Verb) $(MKDIR) $(PROJ_includedir)
+	$(Verb) if [ -d "$(PROJ_SRC_ROOT)/include" ] ; then \
+	  cd $(PROJ_SRC_ROOT)/include && \
 	    find . -path '*/Internal' -prune -o '(' -type f \
-	      '!' '(' -name '*~' -o -name '.cvsignore' -o -name '.#*' ')' \
-	      -print ')' | grep -v CVS | pax -rwdvpe $(includedir) ; \
+	      '!' '(' -name '*~' -o -name '.cvsignore' -o -name '.#*' -o -name '*.in' ')' \
+	      -print ')' | grep -v CVS | pax -rwdvpe $(PROJ_includedir) ; \
+	fi
+	$(Verb) if [ -d "$(PROJ_OBJ_ROOT)/include" ] ; then \
+	  cd $(PROJ_OBJ_ROOT)/include && ( cd $(PROJ_SRC_ROOT)/include && \
+	    find . -path '*/Internal' -prune -o '(' -type f -name '*.in' -print ')' ) \
+	    | sed 's#.in$$##' | pax -rwdvpe $(PROJ_includedir) ; \
 	fi
 
 uninstall-local::
 	$(Echo) Uninstalling include files
-	$(Verb) if [ -d "$(BUILD_SRC_ROOT)/include" ] ; then \
-	  cd $(BUILD_SRC_ROOT)/include && \
+	$(Verb) if [ -d "$(PROJ_SRC_ROOT)/include" ] ; then \
+	  cd $(PROJ_SRC_ROOT)/include && \
 	    $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f \
-	      '!' '(' -name '*~' -o -name '.cvsignore' -o -name '.#*' ')' \
-	      -print ')' | grep -v CVS | sed 's#^#$(includedir)/#'` ; \
-	fi 
+	      '!' '(' -name '*~' -o -name '.cvsignore' -o -name '.#*' -o -name '*.in' ')' \
+	      -print ')' | grep -v CVS | sed 's#^#$(PROJ_includedir)/#'` ; \
+	  cd $(PROJ_SRC_ROOT)/include && \
+	    $(RM) -f `find . -path '*/Internal' -prune -o '(' -type f -name '*.in' -print ')' \
+	    | sed 's#\.in$$##;s#^#$(PROJ_includedir)/#'` ; \
+	fi
 
 endif
 
@@ -1253,28 +1483,32 @@ endif
 # Print out the directories used for building
 #------------------------------------------------------------------------
 printvars::
-	$(Echo) "BuildMode      : " '$(BuildMode)'
-	$(Echo) "BUILD_SRC_ROOT : " '$(BUILD_SRC_ROOT)'
-	$(Echo) "BUILD_SRC_DIR  : " '$(BUILD_SRC_DIR)'
-	$(Echo) "BUILD_OBJ_ROOT : " '$(BUILD_OBJ_ROOT)'
-	$(Echo) "BUILD_OBJ_DIR  : " '$(BUILD_OBJ_DIR)'
-	$(Echo) "LLVM_SRC_ROOT  : " '$(LLVM_SRC_ROOT)'
-	$(Echo) "LLVM_OBJ_ROOT  : " '$(LLVM_OBJ_ROOT)'
-	$(Echo) "libdir         : " '$(libdir)'
-	$(Echo) "bindir         : " '$(bindir)'
-	$(Echo) "sysconfdir     : " '$(sysconfdir)'
-	$(Echo) "bytecode_libdir: " '$(bytecode_libdir)'
-	$(Echo) "UserTargets    : " '$(UserTargets)'
-	$(Echo) "ObjMakefiles   : " '$(ObjMakefiles)'
-	$(Echo) "SrcMakefiles   : " '$(SrcMakefiles)'
-	$(Echo) "ObjDir         : " '$(ObjDir)'
-	$(Echo) "LibDir         : " '$(LibDir)'
-	$(Echo) "ToolDir        : " '$(ToolDir)'
-	$(Echo) "ExmplDir       : " '$(ExmplDir)'
-	$(Echo) "TDFiles        : " '$(TDFiles)'
-	$(Echo) "INCFiles       : " '$(INCFiles)'
-	$(Echo) "Compile.CXX    : " '$(Compile.CXX)'
-	$(Echo) "Compile.C      : " '$(Compile.C)'
-	$(Echo) "Archive        : " '$(Archive)'
-	$(Echo) "YaccFiles      : " '$(YaccFiles)'
-	$(Echo) "LexFiles       : " '$(LexFiles)'
+	$(Echo) "BuildMode    : " '$(BuildMode)'
+	$(Echo) "PROJ_SRC_ROOT: " '$(PROJ_SRC_ROOT)'
+	$(Echo) "PROJ_SRC_DIR : " '$(PROJ_SRC_DIR)'
+	$(Echo) "PROJ_OBJ_ROOT: " '$(PROJ_OBJ_ROOT)'
+	$(Echo) "PROJ_OBJ_DIR : " '$(PROJ_OBJ_DIR)'
+	$(Echo) "LLVM_SRC_ROOT: " '$(LLVM_SRC_ROOT)'
+	$(Echo) "LLVM_OBJ_ROOT: " '$(LLVM_OBJ_ROOT)'
+	$(Echo) "PROJ_prefix  : " '$(PROJ_prefix)'
+	$(Echo) "PROJ_bindir  : " '$(PROJ_bindir)'
+	$(Echo) "PROJ_libdir  : " '$(PROJ_libdir)'
+	$(Echo) "PROJ_etcdir  : " '$(PROJ_etcdir)'
+	$(Echo) "UserTargets  : " '$(UserTargets)'
+	$(Echo) "ObjMakefiles : " '$(ObjMakefiles)'
+	$(Echo) "SrcMakefiles : " '$(SrcMakefiles)'
+	$(Echo) "ObjDir       : " '$(ObjDir)'
+	$(Echo) "LibDir       : " '$(LibDir)'
+	$(Echo) "ToolDir      : " '$(ToolDir)'
+	$(Echo) "ExmplDir     : " '$(ExmplDir)'
+	$(Echo) "Sources      : " '$(Sources)'
+	$(Echo) "TDFiles      : " '$(TDFiles)'
+	$(Echo) "INCFiles     : " '$(INCFiles)'
+	$(Echo) "INCTMPFiles  : " '$(INCTMPFiles)'
+	$(Echo) "Preconditions: " '$(Preconditions)'
+	$(Echo) "Compile.CXX  : " '$(Compile.CXX)'
+	$(Echo) "Compile.C    : " '$(Compile.C)'
+	$(Echo) "Archive      : " '$(Archive)'
+	$(Echo) "YaccFiles    : " '$(YaccFiles)'
+	$(Echo) "LexFiles     : " '$(LexFiles)'
+	$(Echo) "Module       : " '$(Module)'