A few more microsteps

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index bc93c39f0dc361f4840de487391332d9ec147234..59eec663afa0d52f555b6021b3151a3150f5703a 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -1,11 +1,11 @@
-#===-- Makefile.rules - Common make rules for LLVM -------*- makefile -*--====
-# 
+#===-- Makefile.rules - Common make rules for LLVM ---------*- Makefile -*--===#
+#
 #                     The LLVM Compiler Infrastructure
 #
 # This file was developed by the LLVM research group and is distributed under
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
-##===----------------------------------------------------------------------===##
+#===------------------------------------------------------------------------===#
 #
 # This file is included by all of the LLVM makefiles.  This file defines common
 # rules to do things like compile a .cpp file or generate dependency info.
@@ -78,6 +78,7 @@ ifdef BYTECODE_LIBRARY
 # if BYTECODE_LIBRARY is specified, the default is to build the bytecode lib
 all:: bytecodelib
 install:: install-bytecode-library
+install-bytecode:: install-bytecode-library
 endif
 
 # Default Rule:  Make sure it's also a :: rule
@@ -92,6 +93,9 @@ test::
 # Default rule for building only bytecode.
 bytecode::
 
+# Default rule for installing only bytecode.
+install-bytecode::
+
 # Print out the directories used for building
 prdirs::
        @${ECHO} "Build Source Root: " $(BUILD_SRC_ROOT)
@@ -290,7 +294,7 @@ CPPFLAGS += -D_GNU_SOURCE
 CPPFLAGS += -D__STDC_LIMIT_MACROS
 
 ### FIXME: this is GCC specific
-CPPFLAGS += -DDEPRECATED='__attribute__ ((deprecated))'
+CPPFLAGS += -DATTR_DEPRECATED='__attribute__ ((deprecated))'
 
 CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused
 CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions
@@ -391,14 +395,14 @@ RObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(RObjs))
 #---------------------------------------------------------
 
 ifdef DIRS
-all install clean test bytecode stripped-bytecode::
+all install clean test bytecode stripped-bytecode install-bytecode::
        $(VERB) for dir in ${DIRS}; do \
                if [ ! -f $$dir/Makefile ]; \
                then \
                        $(MKDIR) $$dir; \
                        cp $(SourceDir)/$$dir/Makefile $$dir/Makefile; \
                fi; \
-               ($(MAKE) -C $$dir $@) || exit 1; \
+               ($(MAKE) -C $$dir $@ $(MFLAGS)) || exit 1; \
        done
 endif
 
@@ -410,19 +414,20 @@ clean    :: $(addsuffix /.makeclean   , $(PARALLEL_DIRS))
 test     :: $(addsuffix /.maketest    , $(PARALLEL_DIRS))
 bytecode :: $(addsuffix /.makebytecode, $(PARALLEL_DIRS))
 stripped-bytecode :: $(addsuffix /.makestripped-bytecode, $(PARALLEL_DIRS))
+install-bytecode :: $(addsuffix /.makeinstall-bytecode, $(PARALLEL_DIRS))
 
-%/.makeall %/.makeinstall %/.makeclean %/.maketest %/.makebytecode %/.makestripped-bytecode:
+%/.makeall %/.makeinstall %/.makeclean %/.maketest %/.makebytecode %/.makestripped-bytecode %/.makeinstall-bytecode:
        $(VERB) if [ ! -f $(@D)/Makefile ]; \
        then \
                $(MKDIR) $(@D); \
                cp $(SourceDir)/$(@D)/Makefile $(@D)/Makefile; \
        fi; \
-       $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@)
+       $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) $(MFLAGS)
 endif
 
 # Handle directories that may or may not exist
 ifdef OPTIONAL_DIRS
-all install clean test bytecode stripped-bytecode::
+all install clean test bytecode stripped-bytecode install-bytecode::
        $(VERB) for dir in ${OPTIONAL_DIRS}; do \
                if [ -d $(SourceDir)/$$dir ]; \
                then\
@@ -431,7 +436,7 @@ all install clean test bytecode stripped-bytecode::
                                $(MKDIR) $$dir; \
                                cp $(SourceDir)/$$dir/Makefile $$dir/Makefile; \
                        fi; \
-                       ($(MAKE) -C$$dir $@) || exit 1; \
+                       ($(MAKE) -C$$dir $@ $(MFLAGS)) || exit 1; \
                fi \
        done
 endif