summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2012-08-29 07:37:18 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2012-08-29 07:37:18 +0000
commitffa067348c22df604b64dd44122706d459e04a2e (patch)
treef84b11268f0174f06887309754be0fc8e4a51dcf
parentee643303e78acd95e8a72990c05e8d20e3b003c6 (diff)
downloadATCD-ffa067348c22df604b64dd44122706d459e04a2e.tar.gz
Wed Aug 29 07:36:27 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* CIAO_TAO.mwc: * CIAO_TAO_DAnCE.mwc: * CIAO_TAO_DAnCE_OpenDDS.mwc: * CIAO_TAO_OpenDDS.mwc: Be more specific in what we build * tests/tests.mwc: Removed this file.
-rw-r--r--CIAO/CIAO_TAO.mwc2
-rw-r--r--CIAO/CIAO_TAO_DAnCE.mwc2
-rw-r--r--CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc2
-rw-r--r--CIAO/CIAO_TAO_OpenDDS.mwc2
-rw-r--r--CIAO/ChangeLog11
-rw-r--r--CIAO/tests/tests.mwc9
6 files changed, 15 insertions, 13 deletions
diff --git a/CIAO/CIAO_TAO.mwc b/CIAO/CIAO_TAO.mwc
index 4068f8ff613..db7df8f1e90 100644
--- a/CIAO/CIAO_TAO.mwc
+++ b/CIAO/CIAO_TAO.mwc
@@ -6,7 +6,7 @@ workspace {
$(ACE_ROOT)/apps/gperf/src
$(ACE_ROOT)/apps/JAWS/server
$(ACE_ROOT)/protocols/ace/INet
- $(ACE_ROOT)/contrib
+ $(ACE_ROOT)/contrib/minizip
$(TAO_ROOT)/tao
$(TAO_ROOT)/TAO_IDL
$(TAO_ROOT)/utils
diff --git a/CIAO/CIAO_TAO_DAnCE.mwc b/CIAO/CIAO_TAO_DAnCE.mwc
index 496208bf791..14bc3bccf6b 100644
--- a/CIAO/CIAO_TAO_DAnCE.mwc
+++ b/CIAO/CIAO_TAO_DAnCE.mwc
@@ -6,7 +6,7 @@ workspace {
$(ACE_ROOT)/apps/gperf/src
$(ACE_ROOT)/apps/JAWS/server
$(ACE_ROOT)/protocols/ace/INet
- $(ACE_ROOT)/contrib
+ $(ACE_ROOT)/contrib/minizip
$(TAO_ROOT)/TAO_IDL
$(TAO_ROOT)/tao
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming.mpc
diff --git a/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc b/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc
index eaf13d32ab3..de432017ac4 100644
--- a/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc
+++ b/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc
@@ -6,7 +6,7 @@ workspace {
$(ACE_ROOT)/apps/gperf/src
$(ACE_ROOT)/apps/JAWS/server
$(ACE_ROOT)/protocols/ace/INet
- $(ACE_ROOT)/contrib
+ $(ACE_ROOT)/contrib/minizip
$(TAO_ROOT)/TAO_IDL
$(TAO_ROOT)/tao
$(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming.mpc
diff --git a/CIAO/CIAO_TAO_OpenDDS.mwc b/CIAO/CIAO_TAO_OpenDDS.mwc
index 9e349e060ac..d905ded6fdc 100644
--- a/CIAO/CIAO_TAO_OpenDDS.mwc
+++ b/CIAO/CIAO_TAO_OpenDDS.mwc
@@ -6,7 +6,7 @@ workspace {
$(ACE_ROOT)/apps/gperf/src
$(ACE_ROOT)/apps/JAWS/server
$(ACE_ROOT)/protocols/ace/INet
- $(ACE_ROOT)/contrib
+ $(ACE_ROOT)/contrib/minizip
$(TAO_ROOT)/tao
$(TAO_ROOT)/TAO_IDL
$(TAO_ROOT)/utils
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 558c9a4a466..c285c98a093 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Wed Aug 29 07:36:27 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * CIAO_TAO.mwc:
+ * CIAO_TAO_DAnCE.mwc:
+ * CIAO_TAO_DAnCE_OpenDDS.mwc:
+ * CIAO_TAO_OpenDDS.mwc:
+ Be more specific in what we build
+
+ * tests/tests.mwc:
+ Removed this file.
+
Wed Aug 29 07:34:37 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ChangeLog:
diff --git a/CIAO/tests/tests.mwc b/CIAO/tests/tests.mwc
deleted file mode 100644
index 6479880bd23..00000000000
--- a/CIAO/tests/tests.mwc
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
- exclude {
- RTCCM
- }
-
-} \ No newline at end of file