summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2009-08-24 02:08:47 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2009-08-24 02:08:47 +0000
commitb913e75c720060dd0ab5a30007e7818e801e1d05 (patch)
tree092e334dc14269ae53fe3c50fb08b5ed19d53fea
parentf34a7c6a10786a9d0b86f7b1d305dec79cb3231d (diff)
downloadATCD-b913e75c720060dd0ab5a30007e7818e801e1d05.tar.gz
Mon Aug 24 02:08:18 UTC 2009 William R. Otte <Wotte@dre.vanderbilt.edu>
-rw-r--r--modules/CIAO/ChangeLog21
-rw-r--r--modules/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc3
-rw-r--r--modules/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc12
3 files changed, 21 insertions, 15 deletions
diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog
index 3fe3c319b51..6f72c5eb367 100644
--- a/modules/CIAO/ChangeLog
+++ b/modules/CIAO/ChangeLog
@@ -1,9 +1,16 @@
-Sun Aug 23 04:24:04 UTC 2009 William R. Otte <Wotte@dre.vanderbilt.edu>
+Mon Aug 24 02:08:18 UTC 2009 William R. Otte <Wotte@dre.vanderbilt.edu>
* connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc:
+ * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc:
+
+ Compile fixes.
- Base project fixes.
-
+Sun Aug 23 04:24:04 UTC 2009 William R. Otte <Wotte@dre.vanderbilt.edu>
+
+ * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc:
+
+ Base project fixes.
+
* connectors/dds4ccm/examples/Quoter/Connector:
* connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl3:
* connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.idl3p:
@@ -11,12 +18,12 @@ Sun Aug 23 04:24:04 UTC 2009 William R. Otte <Wotte@dre.vanderbilt.edu>
* connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h:
* connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp:
- Connector IDL and skeleton exec impl.
-
+ Connector IDL and skeleton exec impl.
+
* connectors/dds4ccm/idl/dds4ccm_Port_RawListen.idl3p:
- Fixed includes.
-
+ Fixed includes.
+
Sat Aug 22 18:33:49 UTC 2009 William R. Otte <Wotte@dre.vanderbilt.edu>
diff --git a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
index c57a9c8951b..b18f4f2a15b 100644
--- a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
+++ b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
@@ -43,10 +43,9 @@ project(DDS_Quoter_Base_NDDS_TS) : nddslib {
}
-project(DDS_Quoter_Base_stub) : ccm_stub {
+project(DDS_Quoter_Base_stub) : ccm_stub {
after += DDS_Quoter_Base_idl_gen
libs +=
-
libout = ../lib
sharedname = DDS_Quoter_Base_stub
dynamicflags = QUOTER_BASE_STUB_BUILD_DLL
diff --git a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
index bd151538f26..0d97bbfb94c 100644
--- a/modules/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
+++ b/modules/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
@@ -35,7 +35,7 @@ project(DDS_Quoter_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
libpaths += ../lib
libout = ../lib
includes += ..
- sharedname = Quoter_Connector_lem_stub
+ sharedname = DDS_Quoter_Connector_lem_stub
dynamicflags = QUOTER_CONNECTOR_LEM_STUB_BUILD_DLL
IDL_Files {
@@ -61,7 +61,7 @@ project(DDS_Quoter_Connector_stub) : ccm_stub, dds4ccm_base {
libpaths += ../lib
libout = ../lib
includes += ..
- sharedname = Quoter_Connector_stub
+ sharedname = DDS_Quoter_Connector_stub
dynamicflags = QUOTER_CONNECTOR_STUB_BUILD_DLL
IDL_Files {
@@ -83,8 +83,8 @@ project(DDS_Quoter_Connector_stub) : ccm_stub, dds4ccm_base {
project(DDS_Quoter_Connector_exec) : ciao_executor, dds4ccm_base {
after += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub
- sharedname = Quoter_Connector_exec
- libs += Quoter_Connector_stub Quoter_Connector_lem_stub DDS_Quoter_Base_stub
+ sharedname = DDS_Quoter_Connector_exec
+ libs += DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Base_stub
libpaths += ../lib
libout = ../lib
includes += ..
@@ -109,8 +109,8 @@ project(DDS_Quoter_Connector_exec) : ciao_executor, dds4ccm_base {
project(DDS_Quoter_Connector_svnt) : ciao_servant, dds4ccm_skel {
after += DDS_Quoter_Base_skel DDS_Quoter_Connector_lem_stub
- sharedname = Quoter_Connector_svnt
- libs += Quoter_Connector_stub Quoter_Connector_lem_stub \
+ sharedname = DDS_Quoter_Connector_svnt
+ libs += DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub \
DDS_Quoter_Base_skel \
DDS_Quoter_Base_stub
libpaths += ../lib