diff options
| author | Steve Huston <shuston@riverace.com> | 2016-07-14 17:09:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-14 17:09:44 -0400 |
| commit | 13a0ebb95abc64e66c9f6a48f190187e36f10840 (patch) | |
| tree | 30df624efa557fa6f56521fde89eda821503a465 | |
| parent | 7627b5e0073d58550491af5493237880f514b66a (diff) | |
| parent | c752cc58a68f2f91da9550764a55b6dc7f91432c (diff) | |
| download | ATCD-13a0ebb95abc64e66c9f6a48f190187e36f10840.tar.gz | |
Merge pull request #275 from DOCGroup/Riverace-case-2025
Make nested makes easier to manage
| -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 |