summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarijke Hengstmengel <MHengstmengel@users.noreply.github.com>2011-10-26 12:02:48 +0000
committerMarijke Hengstmengel <MHengstmengel@users.noreply.github.com>2011-10-26 12:02:48 +0000
commitc1825ee60b2640d92230857cf72aa30e19476af4 (patch)
tree52b54b249af37065b280c65e104dc67f13b35373
parentc901fbe94df00e549bd169f4ff9fe0e52da09f54 (diff)
downloadATCD-c1825ee60b2640d92230857cf72aa30e19476af4.tar.gz
Wed Oct 26 12:018:24 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl>
* ciao/Containers/Session/Session_Containers.mpc: Remove ciao_port_activator_stub and cia_servant_activator_stub
-rw-r--r--CIAO/ChangeLog.BRANCH5
-rw-r--r--CIAO/ciao/Containers/Session/Session_Container.mpc9
2 files changed, 10 insertions, 4 deletions
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH
index f0bdadfa6ac..1220df77dee 100644
--- a/CIAO/ChangeLog.BRANCH
+++ b/CIAO/ChangeLog.BRANCH
@@ -1,3 +1,8 @@
+Wed Oct 26 12:018:24 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl>
+
+ * ciao/Containers/Session/Session_Containers.mpc:
+ Remove ciao_port_activator_stub and cia_servant_activator_stub
+
Wed Oct 26 07:28:24 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl>
* ciao/Containers/Containers.mpc:
diff --git a/CIAO/ciao/Containers/Session/Session_Container.mpc b/CIAO/ciao/Containers/Session/Session_Container.mpc
index 45e500e93e7..9180d8d26bb 100644
--- a/CIAO/ciao/Containers/Session/Session_Container.mpc
+++ b/CIAO/ciao/Containers/Session/Session_Container.mpc
@@ -15,9 +15,9 @@ project(CIAO_Session_Container_idl) : install, ciaoidldefaults {
install_dir = ciao/Containers/Session
}
}
-
-project(CIAO_Session_Container_stub) : install, ccm_stub, ciao_lib, ciao_container_base_stub, utils, ciao_base, \
- ciao_servant_activator_stub {
+project(CIAO_Session_Container_stub) : install, ccm_stub, ciao_lib, ciao_container_base_stub, utils, \
+ ciao_base {
+
after += CIAO_Session_Container_idl
dynamicflags += SESSION_CONTAINER_STUB_BUILD_DLL
@@ -39,7 +39,8 @@ project(CIAO_Session_Container_stub) : install, ccm_stub, ciao_lib, ciao_contain
}
project(CIAO_Session_Container) : install, ccm_svnt, ciao_lib, utils, ciao_base, \
- ciao_servant_activator, ciao_servant, ciao_session_container_stub {
+ ciao_servant, ciao_session_container_stub {
+
after += CIAO_Session_Container_idl
dynamicflags += SESSION_CONTAINER_BUILD_DLL