Implement eliminateCallFramePseudoInstr().

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index d0505643e316ab2f0a476943ce3e413360514514..393ce48d07b6ca60abf88b8e3500b869eebe37d6 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -463,8 +463,8 @@ $(sysconfdir):
        $(MKDIR) $(sysconfdir)
 
 install-config-files: $(sysconfdir) $(CONFIG_FILES)
-       $(VERB) echo Installing Configuration Files To $(sysconfdir)
-       $(VERB) for file in $(CONFIG_FILES); do \
+       $(VERB)$(ECHO) Installing Configuration Files To $(sysconfdir)
+       $(VERB)for file in $(CONFIG_FILES); do \
                $(INSTALL) $(SourceDir)/$${file} $(sysconfdir) ; \
        done
 endif
@@ -527,7 +527,7 @@ install-bytecode-library:: $(DESTDIR)$(bytecode_libdir)/lib$(LIBRARYNAME).bc
 
 $(DESTDIR)$(bytecode_libdir)/lib$(LIBRARYNAME).bc: $(LIBNAME_BC) $(DESTDIR)$(bytecode_libdir)
        @${ECHO} ======= Installing $(LIBRARYNAME) bytecode library =======
-       cp $< $@
+       $(VERB)cp $< $@
 
 # Does the library want a .o version built?
 ifndef DONT_BUILD_RELINKED
@@ -568,7 +568,7 @@ $(LIBNAME_BC): $(ObjectsBC) $(LibSubDirs) $(DESTLIBBYTECODE)/.dir
 $(LIBNAME_O): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
        @${ECHO} Linking $(LIBRARYNAME) dynamic release library
        $(VERB) $(Link) -o $@ $(ObjectsO) $(LibSubDirs) $(LibLinkOpts)
-       $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT)
+       $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $@ $(DESTLIBCURRENT)
        @${ECHO} ======= Finished building $(LIBRARYNAME) dynamic release library =======
 
 $(LIBNAME_P): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
@@ -593,7 +593,7 @@ install-dynamic-library: $(LIBNAME_CUR)
 #
 $(LIBNAME_AO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
        @${ECHO} Linking $(LIBRARYNAME) archive release library
-       @$(RM) -f $@
+       $(VERB)$(RM) -f $@
        $(VERB) $(Link) -03 -o $@ $(ObjectsO) $(LibSubDirs) -static
        @${ECHO} Finished building $(LIBRARYNAME) archive release library =======
 
@@ -656,6 +656,13 @@ endif
 #
 ifdef TOOLNAME
 
+# Handle compression libraries automatically
+ifeq ($(HAVE_BZIP2),1)
+TOOLLINKOPTS += -lbz2
+endif
+ifeq ($(HAVE_ZLIB),1)
+TOOLLINKOPTS += -lz
+endif
 # TOOLEXENAME* - These compute the output filenames to generate...
 TOOLEXENAME_G := $(DESTTOOLDEBUG)/$(TOOLNAME)
 TOOLEXENAME_O := $(DESTTOOLRELEASE)/$(TOOLNAME)
@@ -689,7 +696,7 @@ 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))
+LLVM_LIB_PATHS_P := $(addprefix $(LLVMLIBPROFILESOURCE)/, $(LLVMSTATICUSEDLIBS))
 
 #
 # Libtool link options:
@@ -728,8 +735,9 @@ $(TOOLEXENAME_P): $(ObjectsP) $(USED_LIB_PATHS_P) $(LLVM_LIB_PATHS_P) $(DESTTOOL
        @${ECHO} ======= Finished building $(TOOLNAME) profile executable =======
 
 install:: $(TOOLEXENAMES)
-       $(MKDIR) $(DESTDIR)$(bindir)
-       $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -c -m 0755 $(TOOLEXENAMES) $(DESTDIR)$(bindir)/$(TOOLNAME)
+       @${ECHO} Installing $(TOOLEXENAMES) to $(DESTDIR)$(bindir)
+       $(VERB)$(MKDIR) $(DESTDIR)$(bindir)
+       $(VERB)$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) -c -m 0755 $(TOOLEXENAMES) $(DESTDIR)$(bindir)/$(TOOLNAME)
 
 endif