Added the OPTIONAL_DIRS variable for specifying optional directories to build.

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

diff --git a/Makefile.common b/Makefile.common
index 9a69fc4c7aafd753263e4e4b3e8b357212aa518d..88cdd97c00ad647ff2ab321d11251ad382590497 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -40,6 +40,7 @@
 #
 #===-----------------------------------------------------------------------====
 
+#
 # Configuration file to set paths specific to local installation of LLVM
 # 
 include $(LEVEL)/Makefile.config
@@ -340,6 +341,16 @@ test    :: $(addsuffix /.maketest   , $(PARALLEL_DIRS))
        $(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@)
 endif
 
+ifdef OPTIONAL_DIRS
+all install clean test ::
+       $(VERB) for dir in ${OPTIONAL_DIRS}; do \
+               if [ -d $$dir ]; \
+               then\
+                       (cd $$dir; $(MAKE) $@) || exit 1; \
+               fi \
+       done
+endif
+
 #---------------------------------------------------------
 # Handle the LIBRARYNAME option - used when building libs...
 #---------------------------------------------------------
@@ -489,6 +500,7 @@ $(USED_LIB_PATHS_G) $(USED_LIB_PATHS_O) $(USED_LIB_PATHS_P): \
         $(addsuffix /.makeall, $(PARALLEL_DIRS))
 
 all::   $(TOOLEXENAMES)
+
 clean::
        $(VERB) rm -f $(TOOLEXENAMES)
 

diff --git a/Makefile.rules b/Makefile.rules
index 9a69fc4c7aafd753263e4e4b3e8b357212aa518d..88cdd97c00ad647ff2ab321d11251ad382590497 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -40,6 +40,7 @@
 #
 #===-----------------------------------------------------------------------====
 
+#
 # Configuration file to set paths specific to local installation of LLVM
 # 
 include $(LEVEL)/Makefile.config
@@ -340,6 +341,16 @@ test    :: $(addsuffix /.maketest   , $(PARALLEL_DIRS))
        $(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@)
 endif
 
+ifdef OPTIONAL_DIRS
+all install clean test ::
+       $(VERB) for dir in ${OPTIONAL_DIRS}; do \
+               if [ -d $$dir ]; \
+               then\
+                       (cd $$dir; $(MAKE) $@) || exit 1; \
+               fi \
+       done
+endif
+
 #---------------------------------------------------------
 # Handle the LIBRARYNAME option - used when building libs...
 #---------------------------------------------------------
@@ -489,6 +500,7 @@ $(USED_LIB_PATHS_G) $(USED_LIB_PATHS_O) $(USED_LIB_PATHS_P): \
         $(addsuffix /.makeall, $(PARALLEL_DIRS))
 
 all::   $(TOOLEXENAMES)
+
 clean::
        $(VERB) rm -f $(TOOLEXENAMES)