diff options
author | Steve Huston <shuston@riverace.com> | 2016-07-07 20:15:29 -0400 |
---|---|---|
committer | Steve Huston <shuston@riverace.com> | 2016-07-14 15:16:22 -0400 |
commit | 84a8df4c294ac4d74b067dfc8c3ddcacc37ac987 (patch) | |
tree | 3885dd09315a8591859d142f15d60a655384f7de | |
parent | 1c4d57e4aa7fb1d732c70f1ca52ed7e60474cf1e (diff) | |
download | ATCD-84a8df4c294ac4d74b067dfc8c3ddcacc37ac987.tar.gz |
Case 2025, see notes
(cherry picked from commit ce6901f995267e3bc2cf5695c1bca42bd07b44b0)
-rw-r--r-- | ACE/include/makeinclude/macros.GNU | 3 | ||||
-rw-r--r-- | ACE/include/makeinclude/rules.local.GNU | 3 | ||||
-rw-r--r-- | ACE/include/makeinclude/rules.nested.GNU | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/ACE/include/makeinclude/macros.GNU b/ACE/include/makeinclude/macros.GNU index aca73bb20da..5774427d892 100644 --- a/ACE/include/makeinclude/macros.GNU +++ b/ACE/include/makeinclude/macros.GNU @@ -22,7 +22,8 @@ TARGETS_LOCAL = \ depend.local \ rcs_info.local \ idl_stubs.local \ - svnignore.local + svnignore.local \ + $(PRIVATE_TARGETS_LOCAL) TARGETS_NESTED = \ $(TARGETS_LOCAL:.local=.nested) diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index a878e24c34f..5d3b81781c1 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -426,7 +426,8 @@ endif # DO_CLEANUP # Dependency generation target #---------------------------------------------------------------------------- -MAKEFILE ?= GNUmakefile +TOP_MAKEFILE := $(word 1,$(MAKEFILE_LIST)) +MAKEFILE ?= $(TOP_MAKEFILE) DEPENDENCY_FILE ?= $(MAKEFILE) IDL_DEPENDENCY_FILES ?= $(MAKEFILE) diff --git a/ACE/include/makeinclude/rules.nested.GNU b/ACE/include/makeinclude/rules.nested.GNU index 16073934ac8..42ec2e4e443 100644 --- a/ACE/include/makeinclude/rules.nested.GNU +++ b/ACE/include/makeinclude/rules.nested.GNU @@ -10,7 +10,8 @@ # variable must be set to its actual name before including this # file to allow the recursive MAKE to work properly. -MAKEFILE ?= GNUmakefile +TOP_MAKEFILE := $(word 1,$(MAKEFILE_LIST)) +MAKEFILE ?= $(TOP_MAKEFILE) SUBDIR_MAKEFILE ?= $(MAKEFILE) # Make sure that we build directories with DIRS= in sequence instead of in |