diff options
| author | Steve Huston <shuston@riverace.com> | 2016-07-14 15:13:27 -0400 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2016-07-14 15:13:27 -0400 |
| commit | 7627b5e0073d58550491af5493237880f514b66a (patch) | |
| tree | b481e2938798722706d56e756e1227c460c2d735 | |
| parent | dcdedb05f23e55c2c9b718e666554ed6e75d99a5 (diff) | |
| download | ATCD-7627b5e0073d58550491af5493237880f514b66a.tar.gz | |
Revert "Case 2025, see notes"; should have made this a pull request.
This reverts commit dcdedb05f23e55c2c9b718e666554ed6e75d99a5.
| -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, 3 insertions, 6 deletions
diff --git a/ACE/include/makeinclude/macros.GNU b/ACE/include/makeinclude/macros.GNU index 5774427d892..aca73bb20da 100644 --- a/ACE/include/makeinclude/macros.GNU +++ b/ACE/include/makeinclude/macros.GNU @@ -22,8 +22,7 @@ TARGETS_LOCAL = \ depend.local \ rcs_info.local \ idl_stubs.local \ - svnignore.local \ - $(PRIVATE_TARGETS_LOCAL) + svnignore.local TARGETS_NESTED = \ $(TARGETS_LOCAL:.local=.nested) diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index 5d3b81781c1..a878e24c34f 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -426,8 +426,7 @@ endif # DO_CLEANUP # Dependency generation target #---------------------------------------------------------------------------- -TOP_MAKEFILE := $(word 1,$(MAKEFILE_LIST)) -MAKEFILE ?= $(TOP_MAKEFILE) +MAKEFILE ?= GNUmakefile DEPENDENCY_FILE ?= $(MAKEFILE) IDL_DEPENDENCY_FILES ?= $(MAKEFILE) diff --git a/ACE/include/makeinclude/rules.nested.GNU b/ACE/include/makeinclude/rules.nested.GNU index 42ec2e4e443..16073934ac8 100644 --- a/ACE/include/makeinclude/rules.nested.GNU +++ b/ACE/include/makeinclude/rules.nested.GNU @@ -10,8 +10,7 @@ # variable must be set to its actual name before including this # file to allow the recursive MAKE to work properly. -TOP_MAKEFILE := $(word 1,$(MAKEFILE_LIST)) -MAKEFILE ?= $(TOP_MAKEFILE) +MAKEFILE ?= GNUmakefile SUBDIR_MAKEFILE ?= $(MAKEFILE) # Make sure that we build directories with DIRS= in sequence instead of in |