From 2a6530f91ad3fc7701cce87b99e2566dc621497a Mon Sep 17 00:00:00 2001 From: John Criswell Date: Fri, 27 Jun 2003 16:58:44 +0000 Subject: [PATCH] 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 --- Makefile.common | 12 ++++++++++++ Makefile.rules | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/Makefile.common b/Makefile.common index 9a69fc4c7aa..88cdd97c00a 100644 --- 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 9a69fc4c7aa..88cdd97c00a 100644 --- 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) -- 2.34.1