diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2007-01-18 19:23:58 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2007-01-18 19:23:58 +0000 |
| commit | 23e68a7c2dbd41a39c4ac1422d34e901fd49aa74 (patch) | |
| tree | 7d4310e581c16caa824b798b3211001f5c1ef221 | |
| parent | 8e8b4a7a5813d6260c717104e76454571a2665f7 (diff) | |
| download | ATCD-23e68a7c2dbd41a39c4ac1422d34e901fd49aa74.tar.gz | |
ChangeLogTag: Thu Jan 18 19:22:41 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 14 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/templates/gnu.mpd | 7 | ||||
| -rw-r--r-- | ACE/include/makeinclude/rules.common.GNU | 2 |
3 files changed, 22 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index b39dad30234..0f777ad2ccd 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,17 @@ +Thu Jan 18 19:22:41 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Provide a __prebuild__ target that performs the prebuild step or + nothing if a prebuild step wasn't supplied. + + * include/makeinclude/rules.common.GNU: + + Added the __prebuild__ target to the front of the all + dependencies. + + This change fixes Bugzilla #2713. + Wed Jan 17 15:55:06 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com> * bin/tao_orb_tests.lst: diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 72812a24622..477f9671069 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -634,6 +634,13 @@ ifneq ($(GENERATED_DIRTY),) -$(RM) -r $(GENERATED_DIRTY) endif +__prebuild__: +<%if(prebuild)%> + @<%eval(prebuild)%> +<%else%> + @-: +<%endif%> + <%if(postbuild)%> all: __postbuild__ diff --git a/ACE/include/makeinclude/rules.common.GNU b/ACE/include/makeinclude/rules.common.GNU index dd354e41a3f..d1f13955bbc 100644 --- a/ACE/include/makeinclude/rules.common.GNU +++ b/ACE/include/makeinclude/rules.common.GNU @@ -6,7 +6,7 @@ # Common targets #---------------------------------------------------------------------------- -all: all.nested all.local +all: __prebuild__ all.nested all.local debug: debug.nested debug.local profile: profile.nested profile.local install: install.nested install.local |