Strip tools/Debug/ executables by default. Define KEEP_SYMBOLS to

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index 38a4e66cf6a9c0315a9658a041ee86cf855058fb..20e2979b63b4ef51550a125647affe73d2716fa4 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -13,10 +13,15 @@
 #    example, ../.. for two levels deep.
 #
 # 2. DIRS - A list of subdirectories to be built.  Fake targets are set up
-#    so that each of the targets "all", "install", and "clean" each build.
-#    the subdirectories before the local target.
+#    so that each of the targets "all", "install", and "clean" each build
+#    the subdirectories before the local target.  DIRS are guaranteed to be
+#    built in order.
 #
-# 3. Source - If specified, this sets the source code filenames.  If this
+# 3. PARALLEL_DIRS - A list of subdirectories to be built, but that may be
+#    built in any order.  All DIRS are built in order before PARALLEL_DIRS are
+#    built, which are then built in any order.
+#
+# 4. Source - If specified, this sets the source code filenames.  If this
 #    is not set, it defaults to be all of the .cpp, .c, .y, and .l files 
 #    in the current directory.  Also, if you want to build files in addition
 #    to the local files, you can use the ExtraSource variable
@@ -126,6 +131,13 @@ else
 PROFILE =
 endif
 
+# By default, strip symbol information from executable
+ifdef KEEP_SYMBOLS
+STRIP =
+else
+STRIP = -s
+endif
+
 # Allow gnu extensions...
 CPPFLAGS += -D_GNU_SOURCE
 
@@ -144,7 +156,7 @@ Link     := $(PURIFY) $(CXX) $(PROFILE) -static
 else
 Link     := $(CXX) $(PROFILE)
 endif
-LinkG    := $(Link) -g  -L $(LIBDEBUG)
+LinkG    := $(Link) -g  -L $(LIBDEBUG) $(STRIP)
 LinkO    := $(Link) -O3 -L $(LIBRELEASE)
 
 # Create one .o file from a bunch of .o files...
@@ -174,17 +186,25 @@ ObjectsG = $(addprefix $(BUILD_ROOT)/Debug/,$(Objs))
 
 
 #---------------------------------------------------------
-# Handle the DIRS option
+# Handle the DIRS and PARALLEL_DIRS options
 #---------------------------------------------------------
 
-ifdef DIRS  # Only do this if we're using DIRS!
+ifdef DIRS
+all install clean ::
+       $(VERB) for dir in ${DIRS}; do \
+               (cd $$dir; $(MAKE) $@) || exit 1; \
+       done
+endif
 
-all     :: $(addsuffix /.makeall    , $(DIRS))
-install :: $(addsuffix /.makeinstall, $(DIRS))
-clean   :: $(addsuffix /.makeclean  , $(DIRS))
+# Handle PARALLEL_DIRS
+ifdef PARALLEL_DIRS
+all     :: $(addsuffix /.makeall    , $(PARALLEL_DIRS))
+install :: $(addsuffix /.makeinstall, $(PARALLEL_DIRS))
+clean   :: $(addsuffix /.makeclean  , $(PARALLEL_DIRS))
 
-%/.makeall %/.makeclean %/.makeinstall:
+%/.makeall %/.makeinstall %/.makeclean:
        $(VERB) cd $(@D); $(MAKE) $(subst $(@D)/.make,,$@)
+
 endif
 
 #---------------------------------------------------------
@@ -206,6 +226,9 @@ endif
 
 ifdef LIBRARYNAME
 
+# Make sure there isn't any extranous whitespace on the LIBRARYNAME option
+LIBRARYNAME := $(strip $(LIBRARYNAME))
+
 LIBNAME_O    := $(LIBRELEASE)/lib$(LIBRARYNAME).so
 LIBNAME_G    := $(LIBDEBUG)/lib$(LIBRARYNAME).so
 LIBNAME_AO   := $(LIBRELEASE)/lib$(LIBRARYNAME).a