When changing a function, make sure to update the CallGraphNode for the

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index b0624272087775030dbff205ea439daeefd3a80e..0ced78ef147961737fe8a45f8fac90012c670bcb 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -210,7 +210,7 @@ PROJTOOLCURRENT := $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)
 #
 # Libtool is found in the current directory.
 #
-LIBTOOL := $(LLVM_OBJ_ROOT)/mklib
+LIBTOOL := $(LLVM_OBJ_ROOT)/libtool
 
 #
 # If we're not building a shared library, use the disable-shared tag with
@@ -274,6 +274,7 @@ LLINK     = $(LLVMTOOLCURRENT)/llvm-link$(EXEEXT)
 LPROF     = $(LLVMTOOLCURRENT)/llvm-prof$(EXEEXT)
 LANALYZE  = $(LLVMTOOLCURRENT)/analyze$(EXEEXT)
 LBUGPOINT = $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT)
+LLVMC     = $(LLVMTOOLCURRENT)/llvmc$(EXEEXT)
 
 
 ###########################################################################
@@ -307,9 +308,6 @@ CPPFLAGS += -D_GNU_SOURCE
 # Pull in limit macros from stdint.h, even in C++:
 CPPFLAGS += -D__STDC_LIMIT_MACROS
 
-### FIXME: this is GCC specific
-CPPFLAGS += -DATTR_DEPRECATED='__attribute__ ((deprecated))'
-
 CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused
 CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions
 
@@ -455,6 +453,22 @@ all install clean test bytecode stripped-bytecode install-bytecode::
        done
 endif
 
+#---------------------------------------------------------
+# Handle the CONFIG_FILES options
+#---------------------------------------------------------
+ifdef CONFIG_FILES
+install:: install-config-files
+
+$(sysconfdir):
+       $(MKDIR) $(sysconfdir)
+
+install-config-files: $(sysconfdir) $(CONFIG_FILES)
+       $(VERB) echo Installing Configuration Files To $(sysconfdir)
+       $(VERB) for file in $(CONFIG_FILES); do \
+               $(INSTALL) $(SourceDir)/$${file} $(sysconfdir) ; \
+       done
+endif
+
 ###########################################################################
 # Library Build Rules:
 #
@@ -671,6 +685,11 @@ USED_LIB_PATHS_G := $(addprefix $(DESTLIBDEBUG)/, $(STATICUSEDLIBS))
 USED_LIB_PATHS_O := $(addprefix $(DESTLIBRELEASE)/, $(STATICUSEDLIBS))
 USED_LIB_PATHS_P := $(addprefix $(DESTLIBPROFILE)/, $(STATICUSEDLIBS))
 
+LLVMSTATICUSEDLIBS   := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(LLVMLIBS)))
+LLVM_LIB_PATHS_G := $(addprefix $(LLVMLIBDEBUGSOURCE)/, $(LLVMSTATICUSEDLIBS))
+LLVM_LIB_PATHS_O := $(addprefix $(LLVMLIBRELEASESOURCE)/, $(LLVMSTATICUSEDLIBS))
+LLVM_LIB_PATHS_P := $(addprefix $(LLVMLIBPROFILEOURCE)/, $(LLVMSTATICUSEDLIBS))
+
 #
 # Libtool link options:
 #      Ensure that all binaries have their symbols exported so that they can
@@ -692,17 +711,17 @@ all::   $(TOOLEXENAMES)
 clean::
        $(VERB) $(RM) -f $(TOOLEXENAMES)
 
-$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(DESTTOOLDEBUG)/.dir
+$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(LLVM_LIB_PATHS_G) $(DESTTOOLDEBUG)/.dir
        @${ECHO} Linking $(TOOLNAME) debug executable $(STRIP_WARN_MSG)
        $(VERB) $(LinkG) -o $@ $(ObjectsG) $(LIB_OPTS_G) $(LINK_OPTS) $(LIBS)
        @${ECHO} ======= Finished building $(TOOLNAME) debug executable $(STRIP_WARN_MSG) =======
 
-$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(DESTTOOLRELEASE)/.dir
+$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(LLVM_LIB_PATHS_O) $(DESTTOOLRELEASE)/.dir
        @${ECHO} Linking $(TOOLNAME) release executable
        $(VERB) $(LinkO) -o $@ $(ObjectsO) $(LIB_OPTS_O) $(LINK_OPTS) $(LIBS)
        @${ECHO} ======= Finished building $(TOOLNAME) release executable =======
 
-$(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(DESTTOOLPROFILE)/.dir
+$(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(LLVM_LIB_PATHS_P) $(DESTTOOLPROFILE)/.dir
        @${ECHO} Linking $(TOOLNAME) profile executable
        $(VERB) $(LinkP) -o $@ $(ObjectsP) $(LIB_OPTS_P) $(LINK_OPTS) $(LIBS)
        @${ECHO} ======= Finished building $(TOOLNAME) profile executable =======