diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-11-30 13:35:01 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-11-30 13:35:01 +0000 |
| commit | 89334718cf09acccf61634cdcbd0f3bcb64ee832 (patch) | |
| tree | b4a7be0d1e85c7a5ce9595ad7eb26fce3e3a1274 | |
| parent | 10c295e12625fd5bcb63ac0a26f235f1a1ae6a2c (diff) | |
| download | ATCD-89334718cf09acccf61634cdcbd0f3bcb64ee832.tar.gz | |
ChangeLogTag: Tue Nov 30 07:32:18 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rw-r--r-- | apps/gperf/tests/iout2_gen/.empty | 1 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 2 |
3 files changed, 19 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 3911c8bde2f..09a7d9abc75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue Nov 30 07:32:18 2004 Chad Elliott <elliott_c@ociweb.com> + + * apps/gperf/tests/iout2_gen/.empty: + * bin/MakeProjectCreator/templates/gnu.mpd: + + Reverted my previous change as it caused more problems than it + solved. Instead, after much research I've found that VPATH + doesn't work when source files are generated into a directory + other than '.', so I made a directory (iout2_gen) to hold the + generated source (idl.cpp) from the iinset2 gperf test. + Tue Nov 30 09:51:12 UTC 2004 Martin Corino <mcorino@remedy.nl> * ace/ACE.inl: @@ -5,12 +16,12 @@ Tue Nov 30 09:51:12 UTC 2004 Martin Corino <mcorino@remedy.nl> Mon Nov 29 17:56:39 2004 Steve Huston <shuston@riverace.com> - * tests/Test_Output.cpp: Re this change: - Fri Nov 19 18:19:19 2004 Steve Huston <shuston@riverace.com> - the reinterpret_cast<> breaks some stuff on LynxOS. So only do - reinterpret_cast on ACE_LACKS_IOSTREAM_TOTALLY, else use - dynamic_cast. This should fix LynXOS. Thanks to - Olli Savia <ops@iki.fi> for bringing this to my attention. + * tests/Test_Output.cpp: Re this change: + Fri Nov 19 18:19:19 2004 Steve Huston <shuston@riverace.com> + the reinterpret_cast<> breaks some stuff on LynxOS. So only do + reinterpret_cast on ACE_LACKS_IOSTREAM_TOTALLY, else use + dynamic_cast. This should fix LynXOS. Thanks to + Olli Savia <ops@iki.fi> for bringing this to my attention. Mon Nov 29 14:10:12 2004 Chad Elliott <elliott_c@ociweb.com> diff --git a/apps/gperf/tests/iout2_gen/.empty b/apps/gperf/tests/iout2_gen/.empty new file mode 100644 index 00000000000..eb0e403e06a --- /dev/null +++ b/apps/gperf/tests/iout2_gen/.empty @@ -0,0 +1 @@ +This file keeps the directory around even when using cvs update -dP diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index d64f24fd688..b6b99e58b44 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -303,7 +303,7 @@ else endif <%endfor%> -OBJS = $(addsuffix .$(OBJEXT), $(subst ../, ,$(FILES))) +OBJS = $(addsuffix .$(OBJEXT), $(notdir $(FILES))) SRC = $(addsuffix .cpp, $(FILES)) <%endif%> ifneq (,$(RC)) |