Make sure that Makefile.rules and Makefile.config.in are not candidates for
automatic makefile update.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17269 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Makefile.rules b/Makefile.rules
index 0e90ed7..3df4811 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -61,7 +61,8 @@
# PRECONDITIONS: that which must be built/checked first
################################################################################
-SRCMKFILES := $(wildcard $(BUILD_SRC_DIR)/Makefile*)
+SRCMKFILES := $(filter-out Makefile.rules %.in,\
+ $(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
@@ -106,18 +107,19 @@
@$(ECHO) "Updating Makefile"
$(VERB) $(MKDIR) $(@D)
$(VERB) cp -f $< $@
- $(VERB) $(MAKE) $(MAKECMDGOALS)
# 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.
-ifneq ($(BUILD_OBJ_DIR),$(BUILD_OBJ_ROOT))
$(BUILD_OBJ_DIR)/Makefile% : $(BUILD_SRC_DIR)/Makefile%
- @$(ECHO) "Updating $(@F)"
- $(VERB) $(MKDIR) $(@D)
- $(VERB) cp -f $< $@
- $(VERB) $(MAKE) $(MAKECMDGOALS)
-endif
+ @case '$?' in \
+ *Makefile.rules) ;; \
+ *.in) ;; \
+ *) $(ECHO) "Updating $(@F)" ; \
+ $(MKDIR) $(@D) ; \
+ cp -f $< $@ ;; \
+ esac
+
endif
#------------------------------------------------------------------------