diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2005-02-03 15:26:07 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2005-02-03 15:26:07 +0000 |
| commit | e5263f69fda347251ec248d58c073a89e066fab0 (patch) | |
| tree | 694fa8a843382dadaf7cf1fe47a93b5dbbca24dd | |
| parent | 0c421ed2972ef991ab62f93bcb7f844b87e65859 (diff) | |
| download | ATCD-e5263f69fda347251ec248d58c073a89e066fab0.tar.gz | |
ChangeLogTag: Thu Feb 3 09:25:38 2005 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 7 |
2 files changed, 17 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index c8f9dbd4890..00ee520f8a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Feb 3 09:25:38 2005 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Ensure that TAO_ROOT is set if it is a tao or a ciao project. + Thu Feb 3 12:43:37 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/rules.local.GNU: @@ -30,21 +36,21 @@ Thu Feb 3 08:43:37 2005 Martin Corino <mcorino@remedy.nl> * test/Proactor_Test_IPV6.cpp: - Fixed incorrect logfile name in cases where this test is unsupported - leading to falsely reported testfailures. + Fixed incorrect logfile name in cases where this test is unsupported + leading to falsely reported testfailures. Wed Feb 2 15:25:39 2005 Steve Huston <shuston@riverace.com> - * ace/OS_NS_stdio.inl (vsprintf): Clarified the reason why ULONG_MAX - doesn't always work with vswprintf(). glibc (at least newer versions - such as 2.3) check the bounds of the buffer/size combination before - attempting the operation. + * ace/OS_NS_stdio.inl (vsprintf): Clarified the reason why ULONG_MAX + doesn't always work with vswprintf(). glibc (at least newer versions + such as 2.3) check the bounds of the buffer/size combination before + attempting the operation. Wed Feb 02 08:57:23 2005 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * bin/make_release: + * bin/make_release: - Added some comments and removed some old comments. + Added some comments and removed some old comments. Wed Feb 2 08:46:51 2005 Chad Elliott <elliott_c@ociweb.com> diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 1e5e5a43afb..c9549d03fe4 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -31,14 +31,13 @@ static_libs_only = 1 SHLIB_UNCHECKED = <%if(targetoutdir)%><%targetoutdir%><%endif%>lib<%sharedname%>.$(SOEXT) SHLIB = $(SHLIB_UNCHECKED) <%endif%> -<%if(tao)%> +<%if(tao || ciao)%> -TAO_ROOT ?= $(ACE_ROOT)/TAO -<%endif%> +TAO_ROOT ?= $(ACE_ROOT)/TAO <%if(ciao)%> - CIAO_ROOT ?= $(TAO_ROOT)/CIAO <%endif%> +<%endif%> <%if(grouped_source_files)%> <%foreach(grouped_source_files)%> |