diff options
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | Makefile.config.in | 2 | ||||
| -rw-r--r-- | Makefile.rules | 907 | ||||
| -rw-r--r-- | lib/Target/SparcV9/Makefile | 22 | ||||
| -rw-r--r-- | runtime/GCCLibraries/crtend/Makefile | 40 | ||||
| -rw-r--r-- | test/Makefile | 2 | ||||
| -rw-r--r-- | tools/llee/Makefile | 13 | ||||
| -rw-r--r-- | utils/Burg/Makefile | 35 | ||||
| -rw-r--r-- | utils/TableGen/Makefile | 4 |
9 files changed, 559 insertions, 478 deletions
@@ -20,10 +20,10 @@ EXTRA_DIST := test llvm.spec include include $(LEVEL)/Makefile.common dist-hook:: - @$(ECHO) Eliminating CVS directories from distribution - $(VERB) rm -rf `find $(TopDistDir) -type d -name CVS -print` - @$(ECHO) Eliminating files constructed by configure - $(VERB) rm -f \ + $(Echo) Eliminating CVS directories from distribution + $(Verb) $(RM) -rf `find $(TopDistDir) -type d -name CVS -print` + $(Echo) Eliminating files constructed by configure + $(Verb) $(RM) -f \ $(TopDistDir)/include/llvm/ADT/hash_map \ $(TopDistDir)/include/llvm/ADT/hash_set \ $(TopDistDir)/include/llvm/ADT/iterator \ @@ -31,7 +31,7 @@ dist-hook:: $(TopDistDir)/include/llvm/Support/DataTypes.h \ $(TopDistDir)/include/llvm/Support/ThreadSupport.h -test :: all - cd test; $(MAKE) +check :: + cd test; $(MAKE) tools-only: all diff --git a/Makefile.config.in b/Makefile.config.in index 8959a71aff..76ce51e22a 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -54,7 +54,7 @@ ETAGSFLAGS = @ETAGSFLAGS@ RPWD = pwd SED = sed RM = rm -ECHO = echo "llvm["$(MAKELEVEL)"]:" +ECHO = echo MKDIR = @abs_top_srcdir@/autoconf/mkinstalldirs INSTALL_SH = $(BUILD_SRC_ROOT)/autoconf/install-sh DATE = date diff --git a/Makefile.rules b/Makefile.rules index 49628f0b2f..54a4b458f9 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -12,89 +12,91 @@ # #===-----------------------------------------------------------------------==== -# -# Set the VPATH so that we can find source files. -# -VPATH=$(BUILD_SRC_DIR) - -############################################################################### +################################################################################ # TARGETS: Define standard targets that can be invoked -############################################################################### +################################################################################ #-------------------------------------------------------------------- # Define the various target sets #-------------------------------------------------------------------- -RECURSIVE_TARGETS := all clean check install uninstall -LOCAL_TARGETS := all-local clean-local check-local install-local \ - printvars uninstall-local -TOPLEV_TARGETS := dist dist-check dist-clean tags -USER_TARGETS := $(RECURSIVE_TARGETS) $(LOCAL_TARGETS) $(TOPLEV_TARGETS) -INTERNAL_TARGETS := preconditions +RecursiveTargets := all clean check install uninstall +LocalTargets := all-local clean-local check-local install-local printvars \ + uninstall-local +TopLevelTargets := dist dist-check dist-clean tags dist-gzip dist-bzip2 \ + dist-zip +UserTargets := $(RecursiveTargets) $(LocalTargets) $(TopLevelTargets) +InternalTargets := preconditions distdir dist-hook -############################################################################### +################################################################################ # INITIALIZATION: Basic things the makefile needs -############################################################################### +################################################################################ + +#-------------------------------------------------------------------- +# Set the VPATH so that we can find source files. +#-------------------------------------------------------------------- +VPATH=$(BUILD_SRC_DIR) #-------------------------------------------------------------------- # Reset the list of suffixes we know how to build #-------------------------------------------------------------------- .SUFFIXES: -.SUFFIXES: .c .cpp .h .hpp .y .l .lo .o .a $(SHLIBEXT) .bc .td .ps .dot $(SUFFIXES) +.SUFFIXES: .c .cpp .h .hpp .y .l .lo .o .a .bc .td .ps .dot +.SUFFIXES: $(SHLIBEXT) $(SUFFIXES) #-------------------------------------------------------------------- # Mark all of these targets as phony to avoid implicit rule search #-------------------------------------------------------------------- -.PHONY: $(USER_TARGETS) $(INTERNAL_TARGETS) +.PHONY: $(UserTargets) $(InternalTargets) #-------------------------------------------------------------------- # Make sure all the user-target rules are double colon rules and # they are defined first. #-------------------------------------------------------------------- -$(USER_TARGETS):: +$(UserTargets):: ################################################################################ # PRECONDITIONS: that which must be built/checked first ################################################################################ -SRCMKFILES := $(filter %Makefile %Makefile.rules %Makefile.tests \ - %Makefile.JIT,$(wildcard $(BUILD_SRC_DIR)/Makefile*)) -OBJMKFILES := $(subst $(BUILD_SRC_DIR),$(BUILD_OBJ_DIR),$(SRCMKFILES)) -CONFIGURE := $(LLVM_SRC_ROOT)/configure -CONFIG_STATUS := $(LLVM_OBJ_ROOT)/config.status -MAKE_CONFIG_IN:= $(LLVM_SRC_ROOT)/Makefile.config.in -MAKE_CONFIG := $(LLVM_OBJ_ROOT)/Makefile.config -PRECONDITIONS := $(CONFIG_STATUS) $(MAKE_CONFIG) $(OBJMKFILES) +SrcMakefiles := $(filter %Makefile %Makefile.rules %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) -preconditions : $(PRECONDITIONS) +preconditions : $(PreConditions) #------------------------------------------------------------------------ # Make sure the BUILT_SOURCES are built first #------------------------------------------------------------------------ -$(filter-out clean clean-local,USER_TARGETS):: $(BUILT_SOURCES) +$(filter-out clean clean-local,UserTargets):: $(BUILT_SOURCES) clean-local:: ifneq ($(strip $(BUILT_SOURCES)),) - $(VERB) $(RM) -f $(BUILT_SOURCES) + $(Verb) $(RM) -f $(BUILT_SOURCES) endif -$(BUILT_SOURCES) : $(BUILD_OBJ_ROOT)/Makefile +$(BUILT_SOURCES) : $(ObjMakefiles) #------------------------------------------------------------------------ # Make sure we're not using a stale configuration #------------------------------------------------------------------------ -.PRECIOUS: $(CONFIG_STATUS) -$(CONFIG_STATUS): $(CONFIGURE) - @$(ECHO) Reconfiguring with $< - $(VERB) $(CONFIG_STATUS) --recheck $(CONFIGUREFLAGS) - $(VERB) $(CONFIG_STATUS) +.PRECIOUS: $(ConfigStatusScript) +$(ConfigStatusScript): $(ConfigureScript) + $(Echo) Reconfiguring with $< + $(Verb) $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) + $(Verb) $(ConfigStatusScript) #------------------------------------------------------------------------ # Make sure the configuration makefile is up to date #------------------------------------------------------------------------ -$(MAKE_CONFIG): $(MAKE_CONFIG_IN) $(CONFIG_STATUS) - @$(ECHO) Regenerating $@ - $(VERB) cd $(LLVM_OBJ_ROOT) ; $(CONFIG_STATUS) Makefile.config +$(MakefileConfig): $(MakefileConfigIn) $(ConfigStatusScript) + $(Echo) Regenerating $@ + $(Verb) cd $(LLVM_OBJ_ROOT) ; $(ConfigStatusScript) Makefile.config #------------------------------------------------------------------------ # If the Makefile in the source tree has been updated, copy it over into the @@ -103,9 +105,9 @@ $(MAKE_CONFIG): $(MAKE_CONFIG_IN) $(CONFIG_STATUS) ifneq ($(BUILD_OBJ_DIR),$(BUILD_SRC_DIR)) $(BUILD_OBJ_DIR)/Makefile : $(BUILD_SRC_DIR)/Makefile - @$(ECHO) "Updating Makefile" - $(VERB) $(MKDIR) $(@D) - $(VERB) cp -f $< $@ + $(Echo) "Updating Makefile" + $(Verb) $(MKDIR) $(@D) + $(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 @@ -114,7 +116,7 @@ $(BUILD_OBJ_DIR)/Makefile% : $(BUILD_SRC_DIR)/Makefile% @case '$?' in \ *Makefile.rules) ;; \ *.in) ;; \ - *) $(ECHO) "Updating $(@F)" ; \ + *) $(Echo) "Updating $(@F)" ; \ $(MKDIR) $(@D) ; \ cp -f $< $@ ;; \ esac @@ -124,7 +126,7 @@ endif #------------------------------------------------------------------------ # Set up the basic dependencies #------------------------------------------------------------------------ -$(USER_TARGETS):: $(PRECONDITIONS) +$(UserTargets):: $(PreConditions) all:: all-local check:: check-local @@ -143,84 +145,101 @@ install-local:: all-local #-------------------------------------------------------------------- ifdef ENABLE_PROFILING - CONFIGURATION := Profile - LLVMCXXFLAGS := -O3 -DNDEBUG -felide-constructors -finline-functions -pg - LLVMCFLAGS := -O3 -DNDEBUG -pg - LLVMLDFLAGS := -O3 -DNDEBUG -pg + Configuration := Profile + CXX.Flags := -O3 -DNDEBUG -felide-constructors -finline-functions -pg + C.Flags := -O3 -DNDEBUG -pg + LD.Flags := -O3 -DNDEBUG -pg else ifdef ENABLE_OPTIMIZED - CONFIGURATION := Release - LLVMCXXFLAGS := -O3 -DNDEBUG -finline-functions -felide-constructors -fomit-frame-pointer - LLVMCFLAGS := -O3 -DNDEBUG -fomit-frame-pointer - LLVMLDFLAGS := -O3 -DNDEBUG + Configuration := Release + CXX.Flags := -O3 -DNDEBUG -finline-functions -felide-constructors -fomit-frame-pointer + C.Flags := -O3 -DNDEBUG -fomit-frame-pointer + LD.Flags := -O3 -DNDEBUG else - CONFIGURATION := Debug - LLVMCXXFLAGS := -g -D_DEBUG - LLVMCFLAGS := -g -D_DEBUG - LLVMLDFLAGS := -g -D_DEBUG + Configuration := Debug + CXX.Flags := -g -D_DEBUG + C.Flags := -g -D_DEBUG + LD.Flags := -g -D_DEBUG KEEP_SYMBOLS := 1 endif endif -LLVMCXXFLAGS += $(CXXFLAGS) -LLVMCFLAGS += $(CFLAGS) -LLVMCPPFLAGS += $(CPPFLAGS) -LLVMLDFLAGS += $(LDFLAGS) -LLVMARFLAGS := cru +CXX.Flags += $(CXXFLAGS) +C.Flags += $(CFLAGS) +CPP.Flags += $(CPPFLAGS) +LD.Flags += $(LDFLAGS) +AR.Flags := cru +LibTool.Flags := --tag=CXX #-------------------------------------------------------------------- # Directory locations #-------------------------------------------------------------------- -OBJDIR := $(BUILD_OBJ_DIR)/$(CONFIGURATION) -LIBDIR := $(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION) -TOOLDIR := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION) -LLVMLIBDIR := $(LLVM_OBJ_ROOT)/lib/$(CONFIGURATION) -LLVMTOOLDIR := $(LLVM_OBJ_ROOT)/tools/$(CONFIGURATION) +ObjDir := $(BUILD_OBJ_DIR)/$(Configuration) +LibDir := $(BUILD_OBJ_ROOT)/lib/$(Configuration) +ToolDir := $(BUILD_OBJ_ROOT)/tools/$(Configuration) +LLVMLibDir := $(LLVM_OBJ_ROOT)/lib/$(Configuration) +LLVMToolDir := $(LLVM_OBJ_ROOT)/tools/$(Configuration) #-------------------------------------------------------------------- # Full Paths To Compiled Tools and Utilities #-------------------------------------------------------------------- +EchoCmd := $(ECHO) llvm[$(MAKELEVEL)]: +Echo := @$(EchoCmd) +ifndef LIBTOOL LIBTOOL := $(LLVM_OBJ_ROOT)/mklib -LLVMAS := $(LLVMTOOLDIR)/llvm-as$(EXEEXT) -BURG := $(LLVMTOOLDIR)/burg$(EXEEXT) -TBLGEN := $(LLVMTOOLDIR)/tblgen$(EXEEXT) -GCCLD := $(LLVMTOOLDIR)/gccld$(EXEEXT) -LLVMGCC := PATH=$(LLVMTOOLDIR):$(PATH) $(LLVMGCCDIR)/bin/gcc -LLVMGXX := PATH=$(LLVMTOOLDIR):$(PATH) $(LLVMGCCDIR)/bin/g++ +endif +ifndef LLVMAS +LLVMAS := $(LLVMToolDir)/llvm-as$(EXEEXT) +endif +ifndef BURG +BURG := $(LLVMToolDir)/burg$(EXEEXT) +endif +ifndef TBLGEN +TBLGEN := $(LLVMToolDir)/tblgen$(EXEEXT) +endif +ifndef GCCLD +GCCLD := $(LLVMToolDir)/gccld$(EXEEXT) +endif +ifndef LLVMGCC +LLVMGCC := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCCDIR)/bin/gcc +endif +ifndef LLVMGXX +LLVMGXX := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCCDIR)/bin/g++ +endif # Need a better way to compute this. -LLVMGCCLIBDIR := $(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a))/ +LLVMGCCLibDir := $(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a))/ #-------------------------------------------------------------------- # Adjust to user's request #-------------------------------------------------------------------- -# Adjust LIBTOOL options for shared libraries, or not. +# Adjust LIBTOOL flags for shared libraries, or not. ifndef SHARED_LIBRARY - LIBTOOL += --tag=disable-shared + LibTool.Flags += --tag=disable-shared else - LLVMLDFLAGS += -rpath $(LIBDIR) + LD.Flags += -rpath $(LibDir) endif # Adjust settings for verbose mode ifndef VERBOSE - VERB := @ - LIBTOOL += --silent - AR += >/dev/null 2>/dev/null - CONFIGUREFLAGS += >$(BUILD_OBJ_DIR)/configure.out 2>&1 + Verb := @ + LibTool.Flags += --silent + AR.Flags += >/dev/null 2>/dev/null + ConfigureScriptFLAGS += >$(BUILD_OBJ_DIR)/configure.out 2>&1 else - CONFIGUREFLAGS := + ConfigureScriptFLAGS := endif # By default, strip symbol information from executable ifndef KEEP_SYMBOLS - STRIP = $(PLATFORMSTRIPOPTS) - STRIP_WARN_MSG = "(without symbols)" + Strip := $(PLATFORMSTRIPOPTS) + StripWarnMsg := "(without symbols)" endif # Adjust linker flags for building an executable ifdef TOOLNAME - LLVMLDFLAGS += -rpath $(TOOLDIR) -export-dynamic + LD.Flags += -rpath $(ToolDir) -export-dynamic endif #---------------------------------------------------------- @@ -229,8 +248,8 @@ endif CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused -LLVMLDFLAGS += -L$(LIBDIR) -L$(LLVMLIBDIR) -LLVMCPPFLAGS += -I$(BUILD_OBJ_DIR) \ +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 \ @@ -238,20 +257,21 @@ LLVMCPPFLAGS += -I$(BUILD_OBJ_DIR) \ -I$(LLVM_SRC_ROOT)/include \ -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -Compile.C = $(CC) $(LLVMCPPFLAGS) $(CompileCommonOpts) -c $(LLVMCFLAGS) -LTCompile.C = $(LIBTOOL) --mode=compile $(Compile.C) -BCCompile.C = $(LLVMGCC) $(LLVMCPPFLAGS) $(CompileCommonOpts) $(LLVMCFLAGS) -c -Compile.CXX = $(CXX) $(LLVMCPPFLAGS) $(CompileCommonOpts) $(LLVMCXXFLAGS) -c -LTCompile.CXX = $(LIBTOOL) --tag=CXX --mode=compile $(Compile.CXX) -BCCompile.CXX = $(LLVMGXX) $(LLVMCPPFLAGS) $(CompileCommonOpts) $(LLVMCXXFLAGS) -c -Link = $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LLVMCPPFLAGS) \ - $(CompileCommonOpts) $(LLVMLDFLAGS) $(STRIP) -Relink = $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LLVMCPPFLAGS) \ +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 +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 +Link = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \ + $(CompileCommonOpts) $(LD.Flags) $(Strip) +Relink = $(LIBTOOL) $(LibTool.Flags) --mode=link $(CXX) $(CPP.Flags) \ $(CompileCommonOpts) BCLinkLib = $(LLVMGCC) -shared -nostdlib +LTInstall = $(LIBTOOL) $(LibTool.Flags) --mode=install $(INSTALL) Burg = $(BURG) -I $(BUILD_SRC_DIR) TableGen = $(TBLGEN) -I $(BUILD_SRC_DIR) -Archive = $(AR) $(LLVMARFLAGS) +Archive = $(AR) $(AR.Flags) ifdef RANLIB Ranlib = $(RANLIB) else @@ -262,23 +282,24 @@ endif # Get the list of source files #---------------------------------------------------------- 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)) + Sources := $(notdir $(wildcard $(BUILD_SRC_DIR)/*.cpp \ + $(BUILD_SRC_DIR)/*.cc $(BUILD_SRC_DIR)/*.c $(BUILD_SRC_DIR)/*.y \ + $(BUILD_SRC_DIR)/*.l)) +else + Sources := $(SOURCES) endif ifdef BUILT_SOURCES -SOURCES += $(filter %.cpp %.c %.cc %.y %.l,$(BUILT_SOURCES)) +Sources += $(filter %.cpp %.c %.cc %.y %.l,$(BUILT_SOURCES)) endif #---------------------------------------------------------- # Types of objects that can be built from sources #---------------------------------------------------------- -BASENAME_SOURCES := $(sort $(basename $(SOURCES))) -ObjectsO := $(BASENAME_SOURCES:%=$(OBJDIR)/%.o) -ObjectsLO := $(BASENAME_SOURCES:%=$(OBJDIR)/%.lo) -ObjectsBC := $(BASENAME_SOURCES:%=$(OBJDIR)/%.bc) - +BaseNameSources := $(sort $(basename $(Sources))) +ObjectsO := $(BaseNameSources:%=$(ObjDir)/%.o) +ObjectsLO := $(BaseNameSources:%=$(ObjDir)/%.lo) +ObjectsBC := $(BaseNameSources:%=$(ObjDir)/%.bc) ############################################################################### # DIRECTORIES: Handle recursive descent of directory structure @@ -290,27 +311,34 @@ ObjectsBC := $(BASENAME_SOURCES:%=$(OBJDIR)/%.bc) #--------------------------------------------------------- $(bindir): - $(VERB) $(MKDIR) $(bindir) + $(Verb) $(MKDIR) $(bindir) $(libdir): - $(VERB) $(MKDIR) $(libdir) + $(Verb) $(MKDIR) $(libdir) $(bytecode_libdir): - $(VERB) $(MKDIR) $(bytecode_libdir) + $(Verb) $(MKDIR) $(bytecode_libdir) $(sysconfdir): - $(VERB) $(MKDIR) $(sysconfdir) + $(Verb) $(MKDIR) $(sysconfdir) +# To create other directories, as needed, and timestamp their creation +%/.dir: + $(Verb) $(MKDIR) $* > /dev/null + @$(DATE) > $@ + +.PRECIOUS: $(ObjDir)/.dir $(LibDir)/.dir $(ToolDir)/.dir $(LLVMLibDir)/.dir +.PRECIOUS: $(LLVMToolDir)/.dir #--------------------------------------------------------- # Handle the DIRS options for sequential construction #--------------------------------------------------------- -SUBDIRS := +SubDirs := ifdef DIRS -SUBDIRS += $(DIRS) -$(RECURSIVE_TARGETS):: - $(VERB) for dir in $(DIRS); do \ +SubDirs += $(DIRS) +$(RecursiveTargets):: + $(Verb) for dir in $(DIRS); do \ if [ ! -f $$dir/Makefile ]; then \ $(MKDIR) $$dir; \ cp $(BUILD_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \ @@ -324,8 +352,8 @@ endif # after each directory is built. #--------------------------------------------------------- ifdef EXPERIMENTAL_DIRS -$(RECURSIVE_TARGETS):: - $(VERB) for dir in $(EXPERIMENTAL_DIRS); do \ +$(RecursiveTargets):: + $(Verb) for dir in $(EXPERIMENTAL_DIRS); do \ if [ ! -f $$dir/Makefile ]; then \ $(MKDIR) $$dir; \ cp $(BUILD_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \ @@ -339,19 +367,20 @@ endif #--------------------------------------------------------- ifdef PARALLEL_DIRS -SUBDIRS += $(PARALLEL_DIRS) +SubDirs += $(PARALLEL_DIRS) + # Unfortunately, this list must be maintained if new # recursive targets are added. -all :: $(addsuffix /.makeall , $(PARALLEL_DIRS)) -clean :: $(addsuffix /.makeclean , $(PARALLEL_DIRS)) -check :: $(addsuffix /.makecheck , $(PARALLEL_DIRS)) -install :: $(addsuffix /.makeinstall , $(PARALLEL_DIRS)) +all :: $(addsuffix /.makeall ,$(PARALLEL_DIRS)) +clean :: $(addsuffix /.makeclean ,$(PARALLEL_DIRS)) +check :: $(addsuffix /.makecheck ,$(PARALLEL_DIRS)) +install :: $(addsuffix /.makeinstall ,$(PARALLEL_DIRS)) uninstall:: $(addsuffix /.makeuninstall,$(PARALLEL_DIRS)) -Parallel_Targets := $(foreach T,$(RECURSIVE_TARGETS),%/.make$(T)) +Parallel_Targets := $(foreach T,$(RecursiveTargets),%/.make$(T)) $(Parallel_Targets) : - $(VERB) if [ ! -f $(@D)/Makefile ]; then \ + $(Verb) if [ ! -f $(@D)/Makefile ]; then \ $(MKDIR) $(@D); \ cp $(BUILD_SRC_DIR)/$(@D)/Makefile $(@D)/Makefile; \ fi; \ @@ -364,10 +393,10 @@ endif #--------------------------------------------------------- ifdef OPTIONAL_DIRS -SUBDIRS += $(OPTIONAL_DIRS) +SubDirs += $(OPTIONAL_DIRS) -$(RECURSIVE_TARGETS):: - $(VERB) for dir in $(OPTIONAL_DIRS); do \ +$(RecursiveTargets):: + $(Verb) for dir in $(OPTIONAL_DIRS); do \ if [ -d $(BUILD_SRC_DIR)/$$dir ]; then\ if [ ! -f $$dir/Makefile ]; then \ $(MKDIR) $$dir; \ @@ -384,14 +413,14 @@ endif ifdef CONFIG_FILES install-local:: $(sysconfdir) $(CONFIG_FILES) - $(VERB)$(ECHO) Installing Configuration Files To $(sysconfdir) - $(VERB)for file in $(CONFIG_FILES); do \ + $(Echo) Installing Configuration Files To $(sysconfdir) + $(Verb)for file in $(CONFIG_FILES); do \ $(INSTALL) $(BUILD_SRC_DIR)/$${file} $(sysconfdir) ; \ done uninstall-local:: - $(VERB)$(ECHO) Uninstalling Configuration Files From $(sysconfdir) - $(VERB)for file in $(CONFIG_FILES); do \ + $(Echo) Uninstalling Configuration Files From $(sysconfdir) + $(Verb)for file in $(CONFIG_FILES); do \ $(RM) -f $(sysconfdir)/$${file} ; \ done @@ -407,10 +436,10 @@ ifdef LIBRARYNAME # Make sure there isn't any extranous whitespace on the LIBRARYNAME option LIBRARYNAME := $(strip $(LIBRARYNAME)) -LIBNAME_LA := $(LIBDIR)/lib$(LIBRARYNAME).la -LIBNAME_A := $(LIBDIR)/lib$(LIBRARYNAME).a -LIBNAME_O := $(LIBDIR)/$(LIBRARYNAME).o -LIBNAME_BC := $(LIBDIR)/lib$(LIBRARYNAME).bc +LibName.LA := $(LibDir)/lib$(LIBRARYNAME).la +LibName.A := $(LibDir)/lib$(LIBRARYNAME).a +LibName.O := $(LibDir)/$(LIBRARYNAME).o +LibName.BC := $(LibDir)/lib$(LIBRARYNAME).bc #--------------------------------------------------------- # Shared Library Targets: @@ -420,30 +449,30 @@ LIBNAME_BC := $(LIBDIR)/lib$(LIBRARYNAME).bc #--------------------------------------------------------- ifdef SHARED_LIBRARY -all-local:: $(LIBNAME_LA) +all-local:: $(LibName.LA) -$(LIBNAME_LA): $(BUILT_SOURCES) $(ObjectsLO) $(LIBDIR)/.dir - @$(ECHO) Linking $(CONFIGURATION) Shared Library $(notdir $@) - $(VERB) $(Link) -o $@ $(ObjectsLO) - $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $@ $(LIBDIR) +$(LibName.LA): $(BUILT_SOURCES) $(ObjectsLO) $(LibDir)/.dir + $(Echo) Linking $(Configuration) Shared Library $(notdir $@) + $(Verb) $(Link) -o $@ $(ObjectsLO) + $(Verb) $(LTInstall) $@ $(LibDir) clean-local:: -ifneq ($(strip $(LIBNAME_LA)),) - $(VERB) $(RM) -f $(LIBNAME_LA) +ifneq ($(strip $(LibName.LA)),) + $(Verb) $(RM) -f $(LibName.LA) endif DestSharedLib = $(libdir)/lib$(LIBRARYNAME)$(SHLIBEXT) install-local:: $(DestSharedLib) -$(DestSharedLib): $(libdir) $(LIBNAME_LA) - @$(ECHO) Installing $(CONFIGURATION) Shared Library $(DestSharedLib) - $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $(LIBNAME_LA) $(DestSharedLib) - $(VERB) $(LIBTOOL) --finish $(libdir) +$(DestSharedLib): $(libdir) $(LibName.LA) + $(Echo) Installing $(Configuration) Shared Library $(DestSharedLib) + $(Verb) $(LTInstall) $(LibName.LA) $(DestSharedLib) + $(Verb) $(LIBTOOL) --finish $(libdir) uninstall-local:: - @$(ECHO) Uninstalling $(CONFIGURATION) Shared Library $(DestSharedLib) - $(VERB) $(RM) -f $(DestSharedLib) + $(Echo) Uninstalling $(Configuration) Shared Library $(DestSharedLib) + $(Verb) $(RM) -f $(DestSharedLib) endif @@ -465,85 +494,95 @@ else endif endif -all-local:: $(LIBNAME_BC) +all-local:: $(LibName.BC) -$(LIBNAME_BC): $(BUILT_SOURCES) $(ObjectsBC) $(LIBDIR)/.dir - @$(ECHO) Linking $(CONFIGURATION) Bytecode Library $(notdir $@) - $(VERB) $(BCLinkLib) -o $@ $(ObjectsBC) +$(LibName.BC): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir + $(Echo) Linking $(Configuration) Bytecode Library $(notdir $@) + $(Verb) $(BCLinkLib) -o $@ $(ObjectsBC) clean-local:: -ifneq ($(strip $(LIBNAME_BC)),) - $(VERB) $(RM) -f $(LIBNAME_BC) +ifneq ($(strip $(LibName.BC)),) + $(Verb) $(RM) -f $(LibName.BC) endif DestBytecodeLib = $(bytecode_libdir)/lib$(LIBRARYNAME).bc install-local:: $(DestBytecodeLib) -$(DestBytecodeLib): $(bytecode_libdir) $(LIBNAME_BC) - @$(ECHO) Installing $(CONFIGURATION) Bytecode Library $(DestBytecodeLib) - $(VERB) $(INSTALL) $(LIBNAME_BC) $@ +$(DestBytecodeLib): $(bytecode_libdir) $(LibName.BC) + $(Echo) Installing $(Configuration) Bytecode Library $(DestBytecodeLib) + $(Verb) $(INSTALL) $(LibName.BC) $@ uninstall-local:: - @$(ECHO) Uninstalling $(CONFIGURATION) Bytecode Library $(DestBytecodeLib) - $(VERB) $(RM) -f $(DestBytecodeLib) + $(Echo) Uninstalling $(Configuration) Bytecode Library $(DestBytecodeLib) + $(Verb) $(RM) -f $(DestBytecodeLib) endif -# Does the library want a .o version built? +#--------------------------------------------------------- +# ReLinked Library Targets: +# If the user didn't explicitly forbid building a +# relinked then we provide targets for building them. +#--------------------------------------------------------- ifndef DONT_BUILD_RELINKED -all-local:: $(LIBNAME_O) -$(LIBNAME_O): $(BUILT_SOURCES) $(ObjectsO) $(LIBDIR)/.dir - @$(ECHO) Linking $(CONFIGURATION) Object Library $(notdir $@) - $(VERB) $(Relink) -o $@ $(ObjectsO) +all-local:: $(LibName.O) + +$(LibName.O): $(BUILT_SOURCES) $(ObjectsO) $(LibDir)/.dir + $(Echo) Linking $(Configuration) Object Library $(notdir $@) + $(Verb) $(Relink) -o $@ $(ObjectsO) clean-local:: -ifneq ($(strip $(LIBNAME_O)),) - $(VERB) $(RM) -f $(LIBNAME_O) +ifneq ($(strip $(LibName.O)),) + $(Verb) $(RM) -f $(LibName.O) endif DestRelinkedLib = $(libdir)/$(LIBRARYNAME).o install-local:: $(DestRelinkedLib) -$(DestRelinkedLib): $(libdir) $(LIBNAME_O) - @$(ECHO) Installing $(CONFIGURATION) Object Library $(DestRelinkedLib) - $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $(LIBNAME_O) $(DestRelinkedLib) +$(DestRelinkedLib): $(libdir) $(LibName.O) + $(Echo) Installing $(Configuration) Object Library $(DestRelinkedLib) + $(Verb) $(LTInstall) $(LibName.O) $(DestRelinkedLib) uninstall-local:: - @$(ECHO) Uninstalling $(CONFIGURATION) Object Library $(DestRelinkedLib) - $(VERB) $(RM) -f $(DestRelinkedLib) + $(Echo) Uninstalling $(Configuration) Object Library $(DestRelinkedLib) + $(Verb) $(RM) -f $(DestRelinkedLib) endif -# Does the library want an archive version built? +#--------------------------------------------------------- +# Archive Library Targets: +# If the user wanted a regular archive library built, +# then we provide targets for building them. +#--------------------------------------------------------- ifdef BUILD_ARCHIVE -all-local:: $(LIBNAME_A) -$(LIBNAME_A): $(BUILT_SOURCES) $(ObjectsO) $(LIBDIR)/.dir - @$(ECHO) Building $(CONFIGURATION) Archive Library $(notdir $@) - $(VERB)$(RM) -f $@ - $(VERB) $(Archive) $@ $(ObjectsO) - $(VERB) $(Ranlib) $@ +all-local:: $(LibName.A) + +$(LibName.A): $(BUILT_SOURCES) $(ObjectsO) $(LibDir)/.dir + $(Echo) Building $(Configuration) Archive Library $(notdir $@) + $(Verb)$(RM) -f $@ + $(Verb) $(Archive) $@ $(ObjectsO) + $(Verb) $(Ranlib) $@ clean-local:: -ifneq ($(strip $(LIBNAME_A)),) - $(VERB) $(RM) -f $(LIBNAME_A) +ifneq ($(strip $(LibName.A)),) + $(Verb) $(RM) -f $(LibName.A) endif DestArchiveLib := $(libdir)/lib$(LIBRARYNAME).a install-local:: $(DestArchiveLib) -$(DestArchiveLib): $(libdir) $(LIBNAME_A) - @$(ECHO) Installing $(CONFIGURATION) Archive Library $(DestArchiveLib) - $(VERB) $(MKDIR) $(libdir) - $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $(LIBNAME_A) $(DestArchiveLib) +$(DestArchiveLib): $(libdir) $(LibName.A) + $(Echo) Installing $(Configuration) Archive Library $(DestArchiveLib) + $(Verb) $(MKDIR) $(libdir) + $(Verb) $(LTInstall) $(LibName.A) $(DestArchiveLib) uninstall-local:: - @$(ECHO) Uninstalling $(CONFIGURATION) Archive Library $(DestArchiveLib) - $(VERB) $(RM) -f $(DestArchiveLib) + $(Echo) Uninstalling $(Configuration) Archive Library $(DestArchiveLib) + $(Verb) $(RM) -f $(DestArchiveLib) endif @@ -556,238 +595,284 @@ endif ifdef TOOLNAME -# TOOLEXENAME - This is the output filenames to generate -TOOLEXENAME := $(TOOLDIR)/$(TOOLNAME) - -# LIBS_OPTIONS - Compute the options lines that add -llib1 -llib2, etc. -PROJ_LIBS_OPTIONS := $(patsubst %.a.o, -l%, $(addsuffix .o, $(USEDLIBS))) -PROJ_LIBS_OPTIONS := $(patsubst %.o, $(LIBDIR)/%.o, $(PROJ_LIBS_OPTIONS)) -LLVM_LIBS_OPTIONS := $(patsubst %.a.o, -l%, $(addsuffix .o, $(LLVMLIBS))) -LLVM_LIBS_OPTIONS := $(patsubst %.o, $(LLVMLIBDIR)/%.o, $(LLVM_LIBS_OPTIONS)) - -# USED_LIBS/LIBS_PATHS - Compute dependent library file paths -PROJ_USED_LIBS := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(USEDLIBS))) -LLVM_USED_LIBS := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(LLVMLIBS))) -PROJ_LIBS_PATHS := $(addprefix $(LIBDIR)/,$(PROJ_USED_LIBS)) -LLVM_LIBS_PATHS := $(addprefix $(LLVMLIBDIR)/,$(LLVM_USED_LIBS)) +#--------------------------------------------------------- +# Set up variables for building a tool. +#--------------------------------------------------------- +ToolBuildPath := $(ToolDir)/$(TOOLNAME)$(EXEEXT) +ProjLibsOptions := $(patsubst %.a.o, -l%, $(addsuffix .o, $(USEDLIBS))) +ProjLibsOptions := $(patsubst %.o, $(LibDir)/%.o, $(ProjLibsOptions)) +LLVMLibsOptions := $(patsubst %.a.o, -l%, $(addsuffix .o, $(LLVMLIBS))) +LLVMLibsOptions := $(patsubst %.o, $(LLVMLibDir)/%.o, $(LLVMLibsOptions)) +ProjUsedLibs := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(USEDLIBS))) +LLVMUsedLibs := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(LLVMLIBS))) +ProjLibsPaths := $(addprefix $(LibDir)/,$(ProjUsedLibs)) +LLVMLibsPaths := $(addprefix $(LLVMLibDir)/,$(LLVMUsedLibs)) -# Handle compression libraries automatically +#--------------------------------------------------------- +# Handle optional compression libraries automatically +#--------------------------------------------------------- +ExtraLibs := $(LIBS) ifeq ($(HAVE_BZIP2),1) -LIBS += -lbz2 +ExtraLibs += -lbz2 endif ifeq ($(HAVE_ZLIB),1) -LIBS += -lz +ExtraLibs += -lz endif -# Tell make that we need to rebuild subdirectories before we can link the tool. -# This affects things like LLI which has library subdirectories. -$(TOOLEXENAME): $(addsuffix /.makeall, $(PARALLEL_DIRS)) +#--------------------------------------------------------- +# Tell make that we need to rebuild subdirectories before +# we can link the tool. This affects things like LLI which +# has library subdirectories. +#--------------------------------------------------------- +$(ToolBuildPath): $(addsuffix /.makeall, $(PARALLEL_DIRS)) -all-local:: $(TOOLEXENAME) +#--------------------------------------------------------- +# Provide targets for building the tools +#--------------------------------------------------------- +all-local:: $(ToolBuildPath) clean-local:: -ifneq ($(strip $(TOOLEXENAME)),) - $(VERB) $(RM) -f $(TOOLEXENAME) +ifneq ($(strip $(ToolBuildPath)),) + $(Verb) $(RM) -f $(ToolBuildPath) endif -$(TOOLEXENAME): $(BUILT_SOURCES) $(ObjectsO) $(PROJ_LIBS_PATHS) $(LLVM_LIBS_PATHS) $(TOOLDIR)/.dir - @$(ECHO) Linking $(CONFIGURATION) executable $(TOOLNAME) $(STRIP_WARN_MSG) - $(VERB) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(PROJ_LIBS_OPTIONS) \ - $(LLVM_LIBS_OPTIONS) $(LIBS) $(TOOLLINKOPTSB) - @$(ECHO) ======= Finished Linking $(CONFIGURATION) Executable $(TOOLNAME) $(STRIP_WARN_MSG) +$(ToolBuildPath): $(BUILT_SOURCES) $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths)\ + $(ToolDir)/.dir + $(Echo) Linking $(Configuration) executable $(TOOLNAME) $(StripWarnMsg) + $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ + $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) + $(Echo) ======= Finished Linking $(Configuration) Executable $(TOOLNAME) $(StripWarnMsg) DestTool = $(bindir)/$(TOOLNAME) install-local:: $(DestTool) -$(DestTool): $(bindir) $(TOOLEXENAME) - @$(ECHO) Installing $(CONFIGURATION) $(DestTool) - $(VERB) $(INSTALL) $(TOOLEXENAME) $(DestTool) +$(DestTool): $(bindir) $(ToolBuildPath) + $(Echo) Installing $(Configuration) $(DestTool) + $(Verb) $(INSTALL) $(ToolBuildPath) $(DestTool) uninstall-local:: - @$(ECHO) Uninstalling $(CONFIGURATION) $(DestTool) - $(VERB) $(RM) -f $(DestTool) + $(Echo) Uninstalling $(Configuration) $(DestTool) + $(Verb) $(RM) -f $(DestTool) endif +############################################################################### +# Object Build Rules: Build object files based on sources +############################################################################### + +# Provide rule sets for when dependency generation is enabled ifndef DISABLE_AUTO_DEPENDENCIES -# Create .lo files in the OBJDIR directory from the .cpp and .c files... +#--------------------------------------------------------- +# Create .lo files in the ObjDir directory from the .cpp and .c files... +#--------------------------------------------------------- ifdef SHARED_LIBRARY -$(OBJDIR)/%.lo $(OBJDIR)/%.o: %.cpp $(OBJDIR)/.dir - @$(ECHO) "Compiling $*.cpp (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: %.cpp $(ObjDir)/.dir + $(Echo) "Compiling $*.cpp (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 - @$(ECHO) "Compiling $*.c (PIC)" - $(VERB) if $(LTCompile.C) -MD -MT $@ -MP -MF $(OBJDIR)/$*.LACd $< -o $@ ; \ - then $(MV) -f "$(OBJDIR)/$*.LACd" "$(OBJDIR)/$*.d"; \ - else $(RM) -f "$(OBJDIR)/$*.LACd"; exit 1; fi +$(ObjDir)/%.lo $(ObjDir)/%.o: %.c $(ObjDir)/.dir + $(Echo) "Compiling $*.c (PIC)" + $(Verb) if $(LTCompile.C) -MD -MT $@ -MP -MF $(ObjDir)/$*.LACd $< -o $@ ; \ + then $(MV) -f "$(ObjDir)/$*.LACd" "$(ObjDir)/$*.d"; \ + else $(RM) -f "$(ObjDir)/$*.LACd"; exit 1; fi +#--------------------------------------------------------- +# Create .o files in the ObjDir directory from the .cpp and .c files... +#--------------------------------------------------------- else -$(OBJDIR)/%.o: %.cpp $(OBJDIR)/.dir - @$(ECHO) "Compiling $*.cpp" - $(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: %.cpp $(ObjDir)/.dir + $(Echo) "Compiling $*.cpp" + $(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 - @$(ECHO) "Compiling $*.c" - $(VERB) if $(Compile.C) -MD -MT $@ -MP -MF $(OBJDIR)/$*.Cd $< -o $@ ; \ - then $(MV) -f "$(OBJDIR)/$*.Cd" "$(OBJDIR)/$*.d"; \ - else $(RM) -f "$(OBJDIR)/$*.Cd"; exit 1; fi +$(ObjDir)/%.o: %.c $(ObjDir)/.dir + $(Echo) "Compiling $*.c" + $(Verb) if $(Compile.C) -MD -MT $@ -MP -MF $(ObjDir)/$*.Cd $< -o $@ ; \ + then $(MV) -f "$(ObjDir)/$*.Cd" "$(ObjDir)/$*.d"; \ + else $(RM) -f "$(ObjDir)/$*.Cd"; exit 1; fi endif -# Create .bc files in the OBJDIR directory from .cpp and .c files... -$(OBJDIR)/%.bc: %.cpp $(OBJDIR)/.dir - @$(ECHO) "Compiling $*.cpp (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 - @$(ECHO) "Compiling $*.c (bytecode)" - $(VERB) if $(BCCompile.C) -MD -MT $@ -MP -MF "$(OBJDIR)/$*.BCCd" $< -o $@ ; \ - then $(MV) -f "$(OBJDIR)/$*.BCCd" "$(OBJDIR)/$*.d"; \ - else $(RM) -f "$(OBJDIR)/$*.BCCd"; exit 1; fi - |