summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2004-11-29 19:13:50 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2004-11-29 19:13:50 +0000
commit8428b0d5c402aee186d22f7ce21ae0f14f6ccbc3 (patch)
tree4cb182bf8781e9a81c36dfbd327427bedaf3f2be
parentb106d27f113292a8fd9046f8c80c2fc081a65871 (diff)
downloadATCD-8428b0d5c402aee186d22f7ce21ae0f14f6ccbc3.tar.gz
ChangeLogTag: Mon Nov 29 13:12:14 2004 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog32
-rw-r--r--bin/MakeProjectCreator/templates/gnu.mpd2
2 files changed, 21 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 2829f4cc68e..afc6e3737ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,23 +1,31 @@
+Mon Nov 29 13:12:14 2004 Chad Elliott <elliott_c@ociweb.com>
+
+ * bin/MakeProjectCreator/templates/gnu.mpd:
+
+ Modified the OBJS setting to allow cpp files that are generated
+ into a subdirectory below where the mpc file exists. gperf tests
+ happen to do this now.
+
Mon Nov 29 16:07:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
- * examples/Web_Crawler/Iterators.cpp:
- Minor change to get rid of warning in GCC 2.96 build.
+ * examples/Web_Crawler/Iterators.cpp:
+ Minor change to get rid of warning in GCC 2.96 build.
Mon Nov 29 16:03:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
- * ACEXML/common/HttpCharStream.cpp:
- Minor change to get rid of warning in GCC 2.96 build.
+ * ACEXML/common/HttpCharStream.cpp:
+ Minor change to get rid of warning in GCC 2.96 build.
Mon Nov 29 15:43:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
- * performance-tests/SCTP/Options_Manager.h:
- * performance-tests/SCTP/Options_Manager.cpp:
- * performance-tests/SCTP/SOCK_SEQPACK_srv.cpp:
- * performance-tests/SCTP/SOCK_SEQPACK_clt.cpp:
- * performance-tests/SCTP/SOCK_STREAM_srv.cpp:
- * performance-tests/SCTP/SOCK_STREAM_clt.cpp:
- Fixed problems with use of iostreams for
- ACE_LACKS_IOSTREAM_TOTALLY builds (VxWorks DIAB).
+ * performance-tests/SCTP/Options_Manager.h:
+ * performance-tests/SCTP/Options_Manager.cpp:
+ * performance-tests/SCTP/SOCK_SEQPACK_srv.cpp:
+ * performance-tests/SCTP/SOCK_SEQPACK_clt.cpp:
+ * performance-tests/SCTP/SOCK_STREAM_srv.cpp:
+ * performance-tests/SCTP/SOCK_STREAM_clt.cpp:
+ Fixed problems with use of iostreams for
+ ACE_LACKS_IOSTREAM_TOTALLY builds (VxWorks DIAB).
Mon Nov 29 07:04:58 2004 Chad Elliott <elliott_c@ociweb.com>
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index ff2810a4172..d64f24fd688 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -303,7 +303,7 @@ else
endif
<%endfor%>
-OBJS = $(addsuffix .o, $(notdir $(FILES)))
+OBJS = $(addsuffix .$(OBJEXT), $(subst ../, ,$(FILES)))
SRC = $(addsuffix .cpp, $(FILES))
<%endif%>
ifneq (,$(RC))