summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2007-02-19 21:34:40 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2007-02-19 21:34:40 +0000
commitf55e04af9b081a9c3ab83dd9f640a9be97a84536 (patch)
tree518994ffd7fb76459d93bd2433d704ceb3eeed29
parent49bd2fa0b21e1ddd6be2b1817caefae3eb9cc673 (diff)
downloadATCD-f55e04af9b081a9c3ab83dd9f640a9be97a84536.tar.gz
ChangeLogTag:Mon Feb 19 21:27:11 UTC 2007 William R. Otte <wotte@dre.vanderbilt.edu>
-rw-r--r--ciao_core_2/CIAO/MPC/config/ciao_client_dnc.mpb4
-rw-r--r--ciao_core_2/CIAO/MPC/config/ciao_component_dnc.mpb4
-rw-r--r--ciao_core_2/CIAO/MPC/config/ciao_container_dnc.mpb4
-rw-r--r--ciao_core_2/CIAO/MPC/config/ciao_events_base_dnc.mpb4
-rw-r--r--ciao_core_2/CIAO/MPC/config/ciao_events_dnc.mpb4
-rw-r--r--ciao_core_2/CIAO/MPC/config/ciao_servant_dnc.mpb4
-rw-r--r--ciao_core_2/CIAO/MPC/config/ciao_server_dnc.mpb4
-rw-r--r--ciao_core_2/CIAO/MPC/config/ciaoexe.mpb2
-rw-r--r--ciao_core_2/CIAO/ciaosvcs/Events/CIAO_Events.mpc4
-rw-r--r--ciao_core_2/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc4
10 files changed, 19 insertions, 19 deletions
diff --git a/ciao_core_2/CIAO/MPC/config/ciao_client_dnc.mpb b/ciao_core_2/CIAO/MPC/config/ciao_client_dnc.mpb
index 8e12607cf37..f7360e597b1 100644
--- a/ciao_core_2/CIAO/MPC/config/ciao_client_dnc.mpb
+++ b/ciao_core_2/CIAO/MPC/config/ciao_client_dnc.mpb
@@ -2,8 +2,8 @@
// $Id$
project : ifr_client, valuetype, pi, codecfactory {
- after += CIAO_DnC_Client
+ after += CIAO_Client
includes += $(CIAO_ROOT) $(CIAO_ROOT)/ciao
idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao
- libs += CIAO_DnC_Client
+ libs += CIAO_Client
}
diff --git a/ciao_core_2/CIAO/MPC/config/ciao_component_dnc.mpb b/ciao_core_2/CIAO/MPC/config/ciao_component_dnc.mpb
index 9cabf46cf83..9749679bfcb 100644
--- a/ciao_core_2/CIAO/MPC/config/ciao_component_dnc.mpb
+++ b/ciao_core_2/CIAO/MPC/config/ciao_component_dnc.mpb
@@ -2,6 +2,6 @@
// $Id$
project : portableserver, ciao_server_dnc, ciao_events_dnc {
- after += CIAO_DnC_Container
- libs += CIAO_DnC_Container
+ after += CIAO_Container
+ libs += CIAO_Container
}
diff --git a/ciao_core_2/CIAO/MPC/config/ciao_container_dnc.mpb b/ciao_core_2/CIAO/MPC/config/ciao_container_dnc.mpb
index 43365e736e3..1d4c2770456 100644
--- a/ciao_core_2/CIAO/MPC/config/ciao_container_dnc.mpb
+++ b/ciao_core_2/CIAO/MPC/config/ciao_container_dnc.mpb
@@ -2,6 +2,6 @@
// $Id$
project : portableserver, ciao_client_dnc, avoids_corba_e_compact, avoids_corba_e_micro {
- after += CIAO_DnC_Container
- libs += CIAO_DnC_Container
+ after += CIAO_Container
+ libs += CIAO_Container
}
diff --git a/ciao_core_2/CIAO/MPC/config/ciao_events_base_dnc.mpb b/ciao_core_2/CIAO/MPC/config/ciao_events_base_dnc.mpb
index de2c8d5a7b9..9553e9fd826 100644
--- a/ciao_core_2/CIAO/MPC/config/ciao_events_base_dnc.mpb
+++ b/ciao_core_2/CIAO/MPC/config/ciao_events_base_dnc.mpb
@@ -2,6 +2,6 @@
// $Id$
project : orbsvcslib, ciao_container_dnc, ciao_client_dnc {
- libs += CIAO_DnC_Events_Base
- after += CIAO_DnC_Events_Base
+ libs += CIAO_Events_Base
+ after += CIAO_Events_Base
}
diff --git a/ciao_core_2/CIAO/MPC/config/ciao_events_dnc.mpb b/ciao_core_2/CIAO/MPC/config/ciao_events_dnc.mpb
index 50ec7aad402..b54b68b2cb8 100644
--- a/ciao_core_2/CIAO/MPC/config/ciao_events_dnc.mpb
+++ b/ciao_core_2/CIAO/MPC/config/ciao_events_dnc.mpb
@@ -4,6 +4,6 @@
project : ifr_client, valuetype, pi, codecfactory, ciao_container_dnc, ciao_client_dnc, ciao_rtevent_dnc, naming {
includes += $(CIAO_ROOT)/ciaosvcs/Events
idlflags += -I$(CIAO_ROOT)/ciaosvcs/Events
- libs += CIAO_DnC_Events
- after += CIAO_DnC_Events
+ libs += CIAO_Events
+ after += CIAO_Events
}
diff --git a/ciao_core_2/CIAO/MPC/config/ciao_servant_dnc.mpb b/ciao_core_2/CIAO/MPC/config/ciao_servant_dnc.mpb
index 6bc5c8d52a0..c6edf00271b 100644
--- a/ciao_core_2/CIAO/MPC/config/ciao_servant_dnc.mpb
+++ b/ciao_core_2/CIAO/MPC/config/ciao_servant_dnc.mpb
@@ -2,6 +2,6 @@
// $Id$
project : ciao_component_dnc, ciao_deployment_svnt, ciao_events_dnc, ciaocidldefaults, utils, naming {
- after += CIAO_DnC_Server
- libs += CIAO_DnC_Server
+ after += CIAO_Server
+ libs += CIAO_Server
}
diff --git a/ciao_core_2/CIAO/MPC/config/ciao_server_dnc.mpb b/ciao_core_2/CIAO/MPC/config/ciao_server_dnc.mpb
index c35042c2c4a..7b19cab3743 100644
--- a/ciao_core_2/CIAO/MPC/config/ciao_server_dnc.mpb
+++ b/ciao_core_2/CIAO/MPC/config/ciao_server_dnc.mpb
@@ -2,6 +2,6 @@
// $Id$
project : ciao_client_dnc, ciao_deployment_svnt, utils, naming, ciao_events_dnc, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
- after += CIAO_DnC_Server
- libs += CIAO_DnC_Server
+ after += CIAO_Server
+ libs += CIAO_Server
}
diff --git a/ciao_core_2/CIAO/MPC/config/ciaoexe.mpb b/ciao_core_2/CIAO/MPC/config/ciaoexe.mpb
index 4131f3b2fed..69433807610 100644
--- a/ciao_core_2/CIAO/MPC/config/ciaoexe.mpb
+++ b/ciao_core_2/CIAO/MPC/config/ciaoexe.mpb
@@ -1,4 +1,4 @@
// $Id$
project {
install = $(CIAO_ROOT)/bin
-} \ No newline at end of file
+}
diff --git a/ciao_core_2/CIAO/ciaosvcs/Events/CIAO_Events.mpc b/ciao_core_2/CIAO/ciaosvcs/Events/CIAO_Events.mpc
index a5a1417673e..7a9d37a309a 100644
--- a/ciao_core_2/CIAO/ciaosvcs/Events/CIAO_Events.mpc
+++ b/ciao_core_2/CIAO/ciaosvcs/Events/CIAO_Events.mpc
@@ -1,9 +1,9 @@
// -*- MPC -*-
// $Id$
-project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc {
+project (CIAO_Events) : orbsvcslib, ciao_rtevent_dnc {
- sharedname = CIAO_DnC_Events
+ sharedname = CIAO_Events
idlflags += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
dynamicflags = CIAO_EVENTS_BUILD_DLL
diff --git a/ciao_core_2/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc b/ciao_core_2/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
index ef9688d0d5b..e7602e2e0ac 100644
--- a/ciao_core_2/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
+++ b/ciao_core_2/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
@@ -2,9 +2,9 @@
// $Id$
-project (CIAO_DnC_Events_Base) : orbsvcslib, ciao_client_dnc, ciao_container_dnc {
+project (CIAO_Events_Base) : orbsvcslib, ciao_client_dnc, ciao_container_dnc {
- sharedname = CIAO_DnC_Events_Base
+ sharedname = CIAO_Events_Base
idlflags += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
dynamicflags = CIAO_EVENTS_BUILD_DLL