Auto-confed ModuleMaker.

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index bdeb02838825cd89c4f5bc9c3d2876af1add42cd..48dfe35bf72eb04eb2419934bef688fed40b4b45 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -395,7 +395,12 @@ RObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(RObjs))
 ifdef DIRS
 all install clean test bytecode ::
        $(VERB) for dir in ${DIRS}; do \
-               (cd $$dir; $(MAKE) $@) || exit 1; \
+               if [ ! -f $$dir/Makefile ]; \
+               then \
+                       $(MKDIR) $$dir; \
+                       cp $(SourceDir)/$$dir/Makefile $$dir/Makefile; \
+               fi; \
+               ($(MAKE) -C $$dir $@) || exit 1; \
        done
 endif
 
@@ -408,16 +413,26 @@ test     :: $(addsuffix /.maketest    , $(PARALLEL_DIRS))
 bytecode :: $(addsuffix /.makebytecode, $(PARALLEL_DIRS))
 
 %/.makeall %/.makeinstall %/.makeclean %/.maketest %/.makebytecode:
-       $(VERB) cd $(@D); $(MAKE) $(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
 ifdef OPTIONAL_DIRS
 all install clean test bytecode ::
        $(VERB) for dir in ${OPTIONAL_DIRS}; do \
-               if [ -d $$dir ]; \
+               if [ -d $(SourceDir)/$$dir ]; \
                then\
-                       (cd $$dir; $(MAKE) $@) || exit 1; \
+                       if [ ! -f $$dir/Makefile ]; \
+                       then \
+                               $(MKDIR) $$dir; \
+                               cp $(SourceDir)/$$dir/Makefile $$dir/Makefile; \
+                       fi; \
+                       ($(MAKE) -C$$dir $@) || exit 1; \
                fi \
        done
 endif
@@ -501,43 +516,50 @@ endif
 
 # Rule for building bytecode libraries.
 $(LIBNAME_BC): $(ObjectsBC) $(LibSubDirs) $(DESTLIBBYTECODE)/.dir
-       @${ECHO} ======= Linking $(LIBRARYNAME) bytecode library =======
+       @${ECHO} Linking $(LIBRARYNAME) bytecode library
        $(VERB) $(LinkBCLib) -o $@ $(ObjectsBC) $(LibSubDirs) $(LibLinkOpts)
+       @${ECHO} ======= Finished building $(LIBRARYNAME) bytecode library =======
 #
 # Rules for building dynamically linked libraries.
 #
 $(LIBNAME_O): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
-       @${ECHO} ======= Linking $(LIBRARYNAME) dynamic release library =======
+       @${ECHO} Linking $(LIBRARYNAME) dynamic release library
        $(VERB) $(Link) -o $*.la $(ObjectsO) $(LibSubDirs) $(LibLinkOpts)
        $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT)
+       @${ECHO} ======= Finished building $(LIBRARYNAME) dynamic release library =======
 
 $(LIBNAME_P): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
-       @${ECHO} ======= Linking $(LIBRARYNAME) dynamic profile library =======
+       @${ECHO} Linking $(LIBRARYNAME) dynamic profile library
        $(VERB) $(Link) -o $*.la $(ObjectsP) $(LibSubDirs) $(LibLinkOpts)
        $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT)
+       @${ECHO} ======= Finished building $(LIBRARYNAME) dynamic profile library =======
 
 $(LIBNAME_G): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
-       @${ECHO} ======= Linking $(LIBRARYNAME) dynamic debug library =======
+       @${ECHO} Linking $(LIBRARYNAME) dynamic debug library
        $(VERB) $(Link) -o $*.la $(ObjectsG) $(LibSubDirs) $(LibLinkOpts)
        $(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT)
+       @${ECHO} ======= Finished building $(LIBRARYNAME) dynamic debug library =======
 
 #
 # Rules for building static archive libraries.
 #
 $(LIBNAME_AO): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
-       @${ECHO} ======= Linking $(LIBRARYNAME) archive release library =======
+       @${ECHO} Linking $(LIBRARYNAME) archive release library
        @$(RM) -f $@
        $(VERB) $(Link) -03 -o $@ $(ObjectsO) $(LibSubDirs) -static
+       @${ECHO} Finished building $(LIBRARYNAME) archive release library =======
 
 $(LIBNAME_AP): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
-       @${ECHO} ======= Linking $(LIBRARYNAME) archive profile library =======
+       @${ECHO} Linking $(LIBRARYNAME) archive profile library
        @$(RM) -f $@
        $(VERB) $(Link) -03 $(PROFILE) -o $@ $(ObjectsP) $(LibSubDirs) -static
+       @${ECHO} ======= Finished building $(LIBRARYNAME) archive profile library =======
 
 $(LIBNAME_AG): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
-       @${ECHO} ======= Linking $(LIBRARYNAME) archive debug library =======
+       @${ECHO} Linking $(LIBRARYNAME) archive debug library
        @$(RM) -f $@
        $(VERB) $(Link) -g $(STRIP) -o $@ $(ObjectsG) $(LibSubDirs) -static
+       @${ECHO} ======= Finished building $(LIBRARYNAME) archive debug library =======
 
 
 #
@@ -648,16 +670,19 @@ clean::
        $(VERB) $(RM) -f $(TOOLEXENAMES)
 
 $(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(DESTTOOLDEBUG)/.dir
-       @${ECHO} ======= Linking $(TOOLNAME) debug executable $(STRIP_WARN_MSG) =======
+       @${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
-       @${ECHO} ======= Linking $(TOOLNAME) release executable =======
+       @${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
-       @${ECHO} ======= Linking $(TOOLNAME) profile executable =======
+       @${ECHO} Linking $(TOOLNAME) profile executable
        $(VERB) $(LinkP) -o $@ $(ObjectsP) $(LIB_OPTS_P) $(LINK_OPTS) $(LIBS)
+       @${ECHO} ======= Finished building $(TOOLNAME) profile executable =======
 
 endif
 
@@ -738,7 +763,7 @@ YACC_OUTPUT = $(addprefix $(YACC_FILES:%.y=%), .h .cpp .output)
 %.c: %.y     # Cancel built-in rules for yacc
 %.h: %.y     # Cancel built-in rules for yacc
 %.cpp %.h : %.y
-       @${ECHO} Bisoning $<
+       @${ECHO} "Bisoning `basename $<`"
        $(VERB) $(BISON) -v -d -p $(<F:%Parser.y=%) -o $*.tab.c  $<
        $(VERB) cmp -s $*.tab.c $*.cpp > /dev/null || ${MV} -f $*.tab.c $*.cpp
        $(VERB) cmp -s $*.tab.h $*.h   > /dev/null || ${MV} -f $*.tab.h $*.h
@@ -790,11 +815,11 @@ SourceDepend := $(SourceBaseNames:%=$(BUILD_OBJ_DIR)/Depend/%.d)
 
 # Create dependencies for the *.cpp files...
 $(BUILD_OBJ_DIR)/Depend/%.d: %.cpp $(BUILD_OBJ_DIR)/Depend/.dir
-       $(VERB) $(Depend) $< | $(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' > $@
+       $(VERB) $(Depend) $< | $(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' > $@
 
 # Create dependencies for the *.c files...
 $(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' > $@
+       $(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.
@@ -806,6 +831,13 @@ $(LLVM_OBJ_ROOT)/config.status:: $(LLVM_SRC_ROOT)/configure
        @${ECHO} "****************************************************************"
        $(VERB) exit 1
 
+# If the Makefile in the source tree has been updated, copy it over into the
+# build tree.
+Makefile :: $(BUILD_SRC_DIR)/Makefile
+       @${ECHO} "===== Updating Makefile from source dir: `dirname $<` ====="
+       $(MKDIR) $(@D)
+       cp -f $< $@
+
 #
 # Include dependencies generated from C/C++ source files, but not if we
 # are cleaning (this example taken from the GNU Make Manual).