Quote qmtest args in $(CONTEXT).

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index 9152f8edc60327c5c5bc8ff06740b9e2f8a50263..2cb9ea2b797c6cd0c161b59f35a03529761d85c8 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -58,6 +58,9 @@ VPATH=$(SourceDir)
 #      building.
 ###########################################################################
 
+# Ensure people re-run configure when it gets updated
+all::$(LLVM_OBJ_ROOT)/config.status
+
 ifdef SHARED_LIBRARY
 # if SHARED_LIBRARY is specified, the default is to build the dynamic lib
 all:: dynamic
@@ -533,15 +536,15 @@ $(LIBNAME_AG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
 #      I think that is safe.
 #
 $(LIBNAME_OBJO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
-       @echo "Linking $@"
+       @echo "Linking `basename $@`"
        $(VERB) $(Relink) -o $@ $(RObjectsO) $(LibSubDirs)
 
 $(LIBNAME_OBJP): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
-       @echo "Linking $@"
+       @echo "Linking `basename $@`"
        $(VERB) $(Relink) -o $@ $(RObjectsP) $(LibSubDirs)
 
 $(LIBNAME_OBJG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
-       @echo "Linking $@"
+       @echo "Linking `basename $@`"
        $(VERB) $(Relink) -o $@ $(RObjectsG) $(LibSubDirs)
 
 endif
@@ -647,39 +650,39 @@ endif
 
 # Create .lo files in the ObjectFiles directory from the .cpp and .c files...
 $(BUILD_OBJ_DIR)/Release/%.lo: %.cpp $(BUILD_OBJ_DIR)/Release/.dir
-       @echo "Compiling $<"
+       @echo "Compiling `basename $<`"
        $(VERB) $(CompileO) $< -o $@
 
 $(BUILD_OBJ_DIR)/Release/%.lo: %.c $(BUILD_OBJ_DIR)/Release/.dir
-       @echo "Compiling $<"
+       @echo "Compiling `basename $<`"
        $(VERB) $(CompileCO) $< -o $@
 
 $(BUILD_OBJ_DIR)/Profile/%.lo: %.cpp $(BUILD_OBJ_DIR)/Profile/.dir
-       @echo "Compiling $<"
+       @echo "Compiling `basename $<`"
        $(VERB) $(CompileP) $< -o $@
 
 $(BUILD_OBJ_DIR)/Profile/%.lo: %.c $(BUILD_OBJ_DIR)/Profile/.dir
-       @echo "Compiling $<"
+       @echo "Compiling `basename $<`"
        $(VERB) $(CompileCP) $< -o $@
 
 $(BUILD_OBJ_DIR)/Debug/%.lo: %.cpp $(BUILD_OBJ_DIR)/Debug/.dir
-       @echo "Compiling $<"
+       @echo "Compiling `basename $<`"
        $(VERB) $(CompileG) $< -o $@
 
 $(BUILD_OBJ_DIR)/Debug/%.lo: %.c $(BUILD_OBJ_DIR)/Debug/.dir 
-       @echo "Compiling $<"
+       @echo "Compiling `basename $<`"
        $(VERB) $(CompileCG) $< -o $@
 
 $(BUILD_OBJ_DIR)/BytecodeObj/%.bc: %.cpp $(BUILD_OBJ_DIR)/BytecodeObj/.dir $(LCC1XX)
-       @echo "Compiling $< to bytecode"
+       @echo "Compiling `basename $<` to bytecode"
        $(VERB) $(LLVMGXX) $(CompileWarnings) $(CPPFLAGS) -c $< -o $@
 
 $(BUILD_OBJ_DIR)/BytecodeObj/%.bc: %.c $(BUILD_OBJ_DIR)/BytecodeObj/.dir $(LCC1)
-       @echo "Compiling $< to bytecode"
+       @echo "Compiling `basename $<` to bytecode"
        $(VERB) $(LLVMGCC) $(CompileWarnings) $(CPPFLAGS) -c $< -o $@
 
 $(BUILD_OBJ_DIR)/BytecodeObj/%.bc: %.ll $(BUILD_OBJ_DIR)/BytecodeObj/.dir $(LLVMAS)
-       @echo "Compiling $< to bytecode"
+       @echo "Compiling `basename $<` to bytecode"
        $(VERB) $(LLVMAS) $< -f -o $@
 
 
@@ -774,6 +777,16 @@ $(BUILD_OBJ_DIR)/Depend/%.d: %.cpp $(BUILD_OBJ_DIR)/Depend/.dir
 $(BUILD_OBJ_DIR)/Depend/%.d: %.c $(BUILD_OBJ_DIR)/Depend/.dir
        $(VERB) $(DependC) -o $@ $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
 
+#
+# Autoconf Dependencies.
+#
+$(LLVM_OBJ_ROOT)/config.status:: $(LLVM_SRC_ROOT)/configure
+       @${ECHO} "****************************************************************"
+       @${ECHO} "   You need to re-run $(LLVM_SRC_ROOT)/configure"
+       @${ECHO} "   in directory $(LLVM_OBJ_ROOT)"
+       @${ECHO} "****************************************************************"
+       $(VERB) exit 1
+
 #
 # Include dependencies generated from C/C++ source files, but not if we
 # are cleaning (this example taken from the GNU Make Manual).