All directory targets now install the Makefile only if it is missing.

Directory targets no longer check for existance of the directory in the
object tree; if the Makefile doesn't exist, we will re-create the directory.
This seems to be a pretty good assumption and saves us from checking
directory existance each time.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10211 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index 380910818a3698ba1dd22fe8a7532ee57349483b..48dfe35bf72eb04eb2419934bef688fed40b4b45 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -395,9 +395,9 @@ RObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(RObjs))
 ifdef DIRS
 all install clean test bytecode ::
        $(VERB) for dir in ${DIRS}; do \
 ifdef DIRS
 all install clean test bytecode ::
        $(VERB) for dir in ${DIRS}; do \

-               $(MKDIR) $$dir; \

                if [ ! -f $$dir/Makefile ]; \
                then \
                if [ ! -f $$dir/Makefile ]; \
                then \

+                       $(MKDIR) $$dir; \

                        cp $(SourceDir)/$$dir/Makefile $$dir/Makefile; \
                fi; \
                ($(MAKE) -C $$dir $@) || exit 1; \
                        cp $(SourceDir)/$$dir/Makefile $$dir/Makefile; \
                fi; \
                ($(MAKE) -C $$dir $@) || exit 1; \


@@ -413,7 +413,12 @@ test     :: $(addsuffix /.maketest    , $(PARALLEL_DIRS))
 bytecode :: $(addsuffix /.makebytecode, $(PARALLEL_DIRS))
 
 %/.makeall %/.makeinstall %/.makeclean %/.maketest %/.makebytecode:
 bytecode :: $(addsuffix /.makebytecode, $(PARALLEL_DIRS))
 
 %/.makeall %/.makeinstall %/.makeclean %/.maketest %/.makebytecode:

-       $(VERB) $(MKDIR) $(@D); cp $(SourceDir)/$(@D)/Makefile $(@D); $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@)
+       $(VERB) if [ ! -f $(@D)/Makefile ]; \
+       then \
+               $(MKDIR) $(@D); \
+               cp $(SourceDir)/$(@D)/Makefile $(@D)/Makefile; \
+       fi; \
+       $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@)

 endif
 
 # Handle directories that may or may not exist
 endif
 
 # Handle directories that may or may not exist


@@ -422,9 +427,9 @@ all install clean test bytecode ::
        $(VERB) for dir in ${OPTIONAL_DIRS}; do \
                if [ -d $(SourceDir)/$$dir ]; \
                then\
        $(VERB) for dir in ${OPTIONAL_DIRS}; do \
                if [ -d $(SourceDir)/$$dir ]; \
                then\

-                       $(MKDIR) $$dir; \

                        if [ ! -f $$dir/Makefile ]; \
                        then \
                        if [ ! -f $$dir/Makefile ]; \
                        then \

+                               $(MKDIR) $$dir; \

                                cp $(SourceDir)/$$dir/Makefile $$dir/Makefile; \
                        fi; \
                        ($(MAKE) -C$$dir $@) || exit 1; \
                                cp $(SourceDir)/$$dir/Makefile $$dir/Makefile; \
                        fi; \
                        ($(MAKE) -C$$dir $@) || exit 1; \


@@ -830,6 +835,7 @@ $(LLVM_OBJ_ROOT)/config.status:: $(LLVM_SRC_ROOT)/configure
 # build tree.
 Makefile :: $(BUILD_SRC_DIR)/Makefile
        @${ECHO} "===== Updating Makefile from source dir: `dirname $<` ====="
 # build tree.
 Makefile :: $(BUILD_SRC_DIR)/Makefile
        @${ECHO} "===== Updating Makefile from source dir: `dirname $<` ====="

+       $(MKDIR) $(@D)

        cp -f $< $@
 
 #
        cp -f $< $@
 
 #