summaryrefslogtreecommitdiff
path: root/bin/MakeProjectCreator/config
diff options
context:
space:
mode:
Diffstat (limited to 'bin/MakeProjectCreator/config')
-rw-r--r--bin/MakeProjectCreator/config/acedefaults.mpb6
-rw-r--r--bin/MakeProjectCreator/config/amh.mpb3
-rw-r--r--bin/MakeProjectCreator/config/ami.mpb4
-rw-r--r--bin/MakeProjectCreator/config/ciao_deployment_stub.mpb8
-rw-r--r--bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb8
-rw-r--r--bin/MakeProjectCreator/config/ciao_servant.mpb2
-rw-r--r--bin/MakeProjectCreator/config/ciao_servant_dnc.mpb2
-rw-r--r--bin/MakeProjectCreator/config/ciao_server.mpb2
-rw-r--r--bin/MakeProjectCreator/config/ciao_server_dnc.mpb4
-rw-r--r--bin/MakeProjectCreator/config/core.mpb2
-rw-r--r--bin/MakeProjectCreator/config/dseventlogadmin.mpb2
-rw-r--r--bin/MakeProjectCreator/config/dslogadmin.mpb2
-rw-r--r--bin/MakeProjectCreator/config/dsnotifylogadmin.mpb2
-rw-r--r--bin/MakeProjectCreator/config/ec_use_typed_events.mpb4
-rw-r--r--bin/MakeProjectCreator/config/event.mpb4
-rw-r--r--bin/MakeProjectCreator/config/ftorbutils.mpb4
-rw-r--r--bin/MakeProjectCreator/config/ftrtevent.mpb3
-rw-r--r--bin/MakeProjectCreator/config/global.features3
-rw-r--r--bin/MakeProjectCreator/config/iorinterceptor.mpb2
-rw-r--r--bin/MakeProjectCreator/config/lifecycle.mpb2
-rw-r--r--bin/MakeProjectCreator/config/loadbalancing.mpb2
-rw-r--r--bin/MakeProjectCreator/config/naming.mpb3
-rw-r--r--bin/MakeProjectCreator/config/notification.mpb3
-rw-r--r--bin/MakeProjectCreator/config/notifytest.mpb2
-rw-r--r--bin/MakeProjectCreator/config/objreftemplate.mpb2
-rw-r--r--bin/MakeProjectCreator/config/orbsvcslib.mpb2
-rw-r--r--bin/MakeProjectCreator/config/portablegroup.mpb2
-rw-r--r--bin/MakeProjectCreator/config/portableserver.mpb2
-rw-r--r--bin/MakeProjectCreator/config/rtcorbacommon.mpb3
-rw-r--r--bin/MakeProjectCreator/config/rtcosscheduling.mpb2
-rw-r--r--bin/MakeProjectCreator/config/rteventlogadmin.mpb2
-rw-r--r--bin/MakeProjectCreator/config/rtnotify.mpb2
-rw-r--r--bin/MakeProjectCreator/config/rtsched.mpb2
-rw-r--r--bin/MakeProjectCreator/config/security.mpb2
-rw-r--r--bin/MakeProjectCreator/config/smart_proxies.mpb2
-rw-r--r--bin/MakeProjectCreator/config/ssliop.mpb2
-rw-r--r--bin/MakeProjectCreator/config/svc_utils.mpb2
-rw-r--r--bin/MakeProjectCreator/config/taodefaults.mpb4
-rw-r--r--bin/MakeProjectCreator/config/taolib.mpb2
-rw-r--r--bin/MakeProjectCreator/config/time.mpb2
-rw-r--r--bin/MakeProjectCreator/config/trading.mpb3
41 files changed, 59 insertions, 58 deletions
diff --git a/bin/MakeProjectCreator/config/acedefaults.mpb b/bin/MakeProjectCreator/config/acedefaults.mpb
index ff74f4e334e..b26d925ef49 100644
--- a/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -9,10 +9,6 @@ project: ace_qt, zzip {
// Support the alternative Borland Make project type
specific(bmake) {
unicode_flags += -DACE_USES_WCHAR
- macros += ACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\\"$(LIBMODIFIER)\\")
- }
-
- specific(automake) {
- includes += $(ACE_BUILDDIR)
+ macros += ACE_LD_DECORATOR_STR=ACE_LIB_TEXT(\\"$(LIB_MODIFIER)\\")
}
}
diff --git a/bin/MakeProjectCreator/config/amh.mpb b/bin/MakeProjectCreator/config/amh.mpb
index 56648343ec1..905b651b3dc 100644
--- a/bin/MakeProjectCreator/config/amh.mpb
+++ b/bin/MakeProjectCreator/config/amh.mpb
@@ -1,6 +1,7 @@
// -*- MPC -*-
// $Id$
-project: taoidldefaults, messaging {
+project: taoidldefaults {
+ requires += ami // There is no separate
idlflags += -GH
}
diff --git a/bin/MakeProjectCreator/config/ami.mpb b/bin/MakeProjectCreator/config/ami.mpb
index 9735a3b293d..00d02724a03 100644
--- a/bin/MakeProjectCreator/config/ami.mpb
+++ b/bin/MakeProjectCreator/config/ami.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : taoidldefaults, messaging {
+project : messaging {
requires += ami
idlflags += -GC
-}
+} \ No newline at end of file
diff --git a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
index 180daf23682..69d7b3ca163 100644
--- a/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
+++ b/bin/MakeProjectCreator/config/ciao_deployment_stub.mpb
@@ -1,9 +1,9 @@
// -*- MPC -*-
// $Id$
-project : taolib_with_idl {
+project : portableserver,taoidldefaults {
after += Deployment_stub
- libs += CIAO_Deployment_stub
- includes += $(CIAO_ROOT)/DAnCE
- idlflags += -I$(CIAO_ROOT)/DAnCE -Sc
+ libs += Deployment_stub
+ includes += $(CIAO_ROOT)/DAnCE/ciao $(CIAO_ROOT)/DAnCE
+ idlflags += -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -Sc
}
diff --git a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
index 48293d29fa4..07c94af6152 100644
--- a/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
+++ b/bin/MakeProjectCreator/config/ciao_deployment_svnt.mpb
@@ -1,9 +1,9 @@
// -*- MPC -*-
// $Id$
-project : portableserver, ciao_deployment_stub, ciao_client_dnc {
+project : portableserver, taoidldefaults {
after += Deployment_svnt
- libs += CIAO_Deployment_svnt
- includes += $(CIAO_ROOT)/DAnCE/ciao
- idlflags += -I$(CIAO_ROOT)/DAnCE -Sc
+ libs += Deployment_svnt
+ includes += $(CIAO_ROOT)/DAnCE/ciao $(CIAO_ROOT)/DAnCE
+ idlflags += -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -Sc
}
diff --git a/bin/MakeProjectCreator/config/ciao_servant.mpb b/bin/MakeProjectCreator/config/ciao_servant.mpb
index 54c71d843f6..adb1b89819b 100644
--- a/bin/MakeProjectCreator/config/ciao_servant.mpb
+++ b/bin/MakeProjectCreator/config/ciao_servant.mpb
@@ -9,7 +9,7 @@ project : ciao_component {
automatic = 0
dependent = 1
command = $(CIAO_ROOT)/bin/cidlc
- commandflags = -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs --
+ commandflags = -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao --
inputext = .cidl
source_outputext = _svnt.cpp
generic_outputext = E.idl
diff --git a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
index c4d66b64e3c..a42f2f90d3a 100644
--- a/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_servant_dnc.mpb
@@ -9,7 +9,7 @@ project : ciao_component_dnc {
automatic = 0
dependent = 1
command = $(CIAO_ROOT)/bin/cidlc
- commandflags = -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao -I$(TAO_ROOT)/orbsvcs --
+ commandflags = -I$(CIAO_ROOT)/DAnCE -I$(CIAO_ROOT)/DAnCE/ciao -I$(TAO_ROOT) -I$(TAO_ROOT)/tao --
inputext = .cidl
source_outputext = _svnt.cpp
generic_outputext = E.idl
diff --git a/bin/MakeProjectCreator/config/ciao_server.mpb b/bin/MakeProjectCreator/config/ciao_server.mpb
index 9e48aa8fbf2..2b620d68906 100644
--- a/bin/MakeProjectCreator/config/ciao_server.mpb
+++ b/bin/MakeProjectCreator/config/ciao_server.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : ciao_component, utils {
+project : ciao_component {
after += CIAO_Server
libs += CIAO_Server
}
diff --git a/bin/MakeProjectCreator/config/ciao_server_dnc.mpb b/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
index 7edba9f68fc..2daf0dbf2d9 100644
--- a/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
+++ b/bin/MakeProjectCreator/config/ciao_server_dnc.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : ciao_component_dnc, utils {
+project : ciao_component_dnc {
after += CIAO_DnC_Server
- libs += CIAO_DnC_Server CIAO_Deployment_stub CIAO_Deployment_svnt
+ libs += CIAO_DnC_Server
}
diff --git a/bin/MakeProjectCreator/config/core.mpb b/bin/MakeProjectCreator/config/core.mpb
index d718009002d..7939d3fe923 100644
--- a/bin/MakeProjectCreator/config/core.mpb
+++ b/bin/MakeProjectCreator/config/core.mpb
@@ -2,7 +2,7 @@
// $Id$
project {
- specific {
+ verbatim(borland, macros) {
INSTALL_THIS_TARGET = 1
}
}
diff --git a/bin/MakeProjectCreator/config/dseventlogadmin.mpb b/bin/MakeProjectCreator/config/dseventlogadmin.mpb
index 031be774f43..343e83d8841 100644
--- a/bin/MakeProjectCreator/config/dseventlogadmin.mpb
+++ b/bin/MakeProjectCreator/config/dseventlogadmin.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : orbsvcslib, dslogadmin, event {
+project : dslogadmin, event {
after += DsEventLogAdmin
libs += TAO_DsEventLogAdmin
}
diff --git a/bin/MakeProjectCreator/config/dslogadmin.mpb b/bin/MakeProjectCreator/config/dslogadmin.mpb
index 94516c7133f..9311ba4235c 100644
--- a/bin/MakeProjectCreator/config/dslogadmin.mpb
+++ b/bin/MakeProjectCreator/config/dslogadmin.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : orbsvcslib {
+project : svc_utils, etcl, dynamicany {
after += DsLogAdmin
libs += TAO_DsLogAdmin
}
diff --git a/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb b/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
index fcd49678617..3fa171ab476 100644
--- a/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
+++ b/bin/MakeProjectCreator/config/dsnotifylogadmin.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : orbsvcslib, dslogadmin, dseventlogadmin, event, notification {
+project : dseventlogadmin, notification, naming {
after += DsNotifyLogAdmin
libs += TAO_DsNotifyLogAdmin
}
diff --git a/bin/MakeProjectCreator/config/ec_use_typed_events.mpb b/bin/MakeProjectCreator/config/ec_use_typed_events.mpb
index 5d0d9adef6f..a306db273d3 100644
--- a/bin/MakeProjectCreator/config/ec_use_typed_events.mpb
+++ b/bin/MakeProjectCreator/config/ec_use_typed_events.mpb
@@ -1,6 +1,8 @@
// -*- MPC -*-
// $Id$
-feature(ec_typed_events) {
+feature(ec_typed_events) {
macros += TAO_HAS_TYPED_EVENT_CHANNEL
+ libs += TAO_IFR_Client TAO_DynamicInterface
+ after += IFR_Client DynamicInterface
}
diff --git a/bin/MakeProjectCreator/config/event.mpb b/bin/MakeProjectCreator/config/event.mpb
index 10968e61645..8604669c7fe 100644
--- a/bin/MakeProjectCreator/config/event.mpb
+++ b/bin/MakeProjectCreator/config/event.mpb
@@ -1,7 +1,9 @@
// -*- MPC -*-
// $Id$
-project : orbsvcslib, ec_use_typed_events, minimum_corba {
+project : messaging, ec_use_typed_events, naming {
after += CosEvent
libs += TAO_CosEvent
+ tagchecks += CosEvent
+ avoids += minimum_corba
}
diff --git a/bin/MakeProjectCreator/config/ftorbutils.mpb b/bin/MakeProjectCreator/config/ftorbutils.mpb
index 2698ffa36cf..427a8d1b45b 100644
--- a/bin/MakeProjectCreator/config/ftorbutils.mpb
+++ b/bin/MakeProjectCreator/config/ftorbutils.mpb
@@ -1,8 +1,10 @@
// -*- MPC -*-
// $Id$
-project : iormanip, portableserver, orbsvcslib, minimum_corba {
+project : iormanip, portableserver {
after += FTORB_Utils
libs += TAO_FTORB_Utils
tagchecks += FTORB_Utils
+ avoids += minimum_corba
}
+
diff --git a/bin/MakeProjectCreator/config/ftrtevent.mpb b/bin/MakeProjectCreator/config/ftrtevent.mpb
index 50a843d8d27..e10e4903c68 100644
--- a/bin/MakeProjectCreator/config/ftrtevent.mpb
+++ b/bin/MakeProjectCreator/config/ftrtevent.mpb
@@ -1,8 +1,9 @@
// -*- MPC -*-
// $Id$
-project : ftorbutils, rtevent, naming, messaging, minimum_corba {
+project : ftorbutils, rtevent, naming {
after += FtRtEvent
libs += TAO_FtRtEvent
tagchecks += FtRtEvent
+ avoids += minimum_corba
}
diff --git a/bin/MakeProjectCreator/config/global.features b/bin/MakeProjectCreator/config/global.features
index d77e608c9ca..d7860e05620 100644
--- a/bin/MakeProjectCreator/config/global.features
+++ b/bin/MakeProjectCreator/config/global.features
@@ -1,6 +1,6 @@
// The global features file contains the default feature settings.
// By default, if a feature isn't listed here then it is enabled.
-// If it is listed, then the value assigned to the feature is interpreted
+// If it is listed, then the value assigned to the feature is enterpreted
// as a boolean value. You really shouldn't have to edit this file except
// to change the defaults. If you want to override these values you can do
// one of two things.
@@ -31,4 +31,3 @@ sctp = 0
xt_reactor = 0
dummy_label = 0
cidl = 0
-wince = 0
diff --git a/bin/MakeProjectCreator/config/iorinterceptor.mpb b/bin/MakeProjectCreator/config/iorinterceptor.mpb
index 43310026ccd..208e574c7ad 100644
--- a/bin/MakeProjectCreator/config/iorinterceptor.mpb
+++ b/bin/MakeProjectCreator/config/iorinterceptor.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : taolib, portableserver, objreftemplate, valuetype {
+project : taolib, objreftemplate, valuetype {
after += IORInterceptor
libs += TAO_IORInterceptor
}
diff --git a/bin/MakeProjectCreator/config/lifecycle.mpb b/bin/MakeProjectCreator/config/lifecycle.mpb
index db47576564a..ecfb0e7bee6 100644
--- a/bin/MakeProjectCreator/config/lifecycle.mpb
+++ b/bin/MakeProjectCreator/config/lifecycle.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : naming, portableserver {
+project : naming {
libs += TAO_CosLifeCycle
after += CosLifeCycle
tagchecks += LifeCycle
diff --git a/bin/MakeProjectCreator/config/loadbalancing.mpb b/bin/MakeProjectCreator/config/loadbalancing.mpb
index 7ad4f78dd3a..f850b2fea74 100644
--- a/bin/MakeProjectCreator/config/loadbalancing.mpb
+++ b/bin/MakeProjectCreator/config/loadbalancing.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : messaging, naming, portablegroup, iorinterceptor {
+project : messaging, naming, portablegroup {
libs += TAO_CosLoadBalancing
after += CosLoadBalancing
tagchecks += CosLoadBalancing
diff --git a/bin/MakeProjectCreator/config/naming.mpb b/bin/MakeProjectCreator/config/naming.mpb
index 807f3a0c35f..7258f1aaecb 100644
--- a/bin/MakeProjectCreator/config/naming.mpb
+++ b/bin/MakeProjectCreator/config/naming.mpb
@@ -1,7 +1,8 @@
// -*- MPC -*-
// $Id$
-project : orbsvcslib {
+project : iortable, messaging, svc_utils {
after += CosNaming
libs += TAO_CosNaming
+ tagchecks += Naming
}
diff --git a/bin/MakeProjectCreator/config/notification.mpb b/bin/MakeProjectCreator/config/notification.mpb
index 402df15a2e4..4a2eaf459a0 100644
--- a/bin/MakeProjectCreator/config/notification.mpb
+++ b/bin/MakeProjectCreator/config/notification.mpb
@@ -1,7 +1,8 @@
// -*- MPC -*-
// $Id$
-project : orbsvcslib, event {
+project : etcl, dynamicany, portableserver, svc_utils {
after += CosNotification
libs += TAO_CosNotification
+ tagchecks += Notify
}
diff --git a/bin/MakeProjectCreator/config/notifytest.mpb b/bin/MakeProjectCreator/config/notifytest.mpb
index 932037d9ebb..30c1dc45c83 100644
--- a/bin/MakeProjectCreator/config/notifytest.mpb
+++ b/bin/MakeProjectCreator/config/notifytest.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project: orbsvcsexe, notification, notification_skel, naming, svc_utils {
+project: orbsvcsexe, notification, naming {
after += NotifyTests_Lib
libs += TAO_NotifyTests
includes += $(TAO_ROOT)/orbsvcs/tests/Notify/lib
diff --git a/bin/MakeProjectCreator/config/objreftemplate.mpb b/bin/MakeProjectCreator/config/objreftemplate.mpb
index e887919b2c7..78215f78863 100644
--- a/bin/MakeProjectCreator/config/objreftemplate.mpb
+++ b/bin/MakeProjectCreator/config/objreftemplate.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : portableserver, valuetype {
+project : valuetype {
after += ObjRefTemplate
libs += TAO_ObjRefTemplate
}
diff --git a/bin/MakeProjectCreator/config/orbsvcslib.mpb b/bin/MakeProjectCreator/config/orbsvcslib.mpb
index 0b63b7f61f1..5a7b2faf814 100644
--- a/bin/MakeProjectCreator/config/orbsvcslib.mpb
+++ b/bin/MakeProjectCreator/config/orbsvcslib.mpb
@@ -3,6 +3,4 @@
project : taolib_with_idl, orbsvcs_output {
tagname = TAO_ORBSVCS
- includes += $(TAO_ROOT)/orbsvcs
- idlflags += -I$(TAO_ROOT)/orbsvcs
}
diff --git a/bin/MakeProjectCreator/config/portablegroup.mpb b/bin/MakeProjectCreator/config/portablegroup.mpb
index 351cbcb67c1..4df490afdad 100644
--- a/bin/MakeProjectCreator/config/portablegroup.mpb
+++ b/bin/MakeProjectCreator/config/portablegroup.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : naming, messaging, minimum_corba, iormanip {
+project : naming, minimum_corba, iormanip {
libs += TAO_PortableGroup
after += PortableGroup
tagchecks += PortableGroup
diff --git a/bin/MakeProjectCreator/config/portableserver.mpb b/bin/MakeProjectCreator/config/portableserver.mpb
index 484d7aa83c2..44cfd1d4814 100644
--- a/bin/MakeProjectCreator/config/portableserver.mpb
+++ b/bin/MakeProjectCreator/config/portableserver.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : taolib {
+project : taolib, objreftemplate, valuetype, iorinterceptor {
after += PortableServer
libs += TAO_PortableServer
}
diff --git a/bin/MakeProjectCreator/config/rtcorbacommon.mpb b/bin/MakeProjectCreator/config/rtcorbacommon.mpb
index 91125e0fdc8..4612e25c71e 100644
--- a/bin/MakeProjectCreator/config/rtcorbacommon.mpb
+++ b/bin/MakeProjectCreator/config/rtcorbacommon.mpb
@@ -1,7 +1,8 @@
// -*- MPC -*-
// $Id$
-project : portableserver, minimum_corba {
+project : portableserver {
+ avoids += minimum_corba
after += RTCORBA_Common
libs += RTCORBA_Common
includes += ../Common
diff --git a/bin/MakeProjectCreator/config/rtcosscheduling.mpb b/bin/MakeProjectCreator/config/rtcosscheduling.mpb
index 5f8caccf577..bb8aee78d2d 100644
--- a/bin/MakeProjectCreator/config/rtcosscheduling.mpb
+++ b/bin/MakeProjectCreator/config/rtcosscheduling.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : rtportableserver, orbsvcslib {
+project : rtportableserver {
after += RTCosScheduling
libs += TAO_RTCosScheduling
tagchecks += RTCosScheduling
diff --git a/bin/MakeProjectCreator/config/rteventlogadmin.mpb b/bin/MakeProjectCreator/config/rteventlogadmin.mpb
index 9f9459ea40d..3e052d455d0 100644
--- a/bin/MakeProjectCreator/config/rteventlogadmin.mpb
+++ b/bin/MakeProjectCreator/config/rteventlogadmin.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : dslogadmin_serv, rtoldevent {
+project : dslogadmin, rtoldevent {
after += RTEventLogAdmin
libs += TAO_RTEventLogAdmin
}
diff --git a/bin/MakeProjectCreator/config/rtnotify.mpb b/bin/MakeProjectCreator/config/rtnotify.mpb
index 847b9deaad5..7bd52f4cca7 100644
--- a/bin/MakeProjectCreator/config/rtnotify.mpb
+++ b/bin/MakeProjectCreator/config/rtnotify.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : notification_serv, rtcorba {
+project : notification, rtcorba {
after += RT_Notification
libs += TAO_RT_Notification
}
diff --git a/bin/MakeProjectCreator/config/rtsched.mpb b/bin/MakeProjectCreator/config/rtsched.mpb
index bb435139cf7..148d376614d 100644
--- a/bin/MakeProjectCreator/config/rtsched.mpb
+++ b/bin/MakeProjectCreator/config/rtsched.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : naming, svc_utils {
+project : naming {
after += RTSched
libs += TAO_RTSched
tagchecks += Sched
diff --git a/bin/MakeProjectCreator/config/security.mpb b/bin/MakeProjectCreator/config/security.mpb
index 41af3660e61..12228e7a0f6 100644
--- a/bin/MakeProjectCreator/config/security.mpb
+++ b/bin/MakeProjectCreator/config/security.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : interceptors, portableserver, valuetype, corba_messaging, orbsvcslib {
+project : portableserver {
after += Security
libs += TAO_Security
tagchecks += Security
diff --git a/bin/MakeProjectCreator/config/smart_proxies.mpb b/bin/MakeProjectCreator/config/smart_proxies.mpb
index 0e69cdfeed8..f99d3d5c6aa 100644
--- a/bin/MakeProjectCreator/config/smart_proxies.mpb
+++ b/bin/MakeProjectCreator/config/smart_proxies.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : orbsvcslib {
+project : taolib_with_idl {
after += SmartProxies
libs += TAO_SmartProxies
idlflags += -Gsp
diff --git a/bin/MakeProjectCreator/config/ssliop.mpb b/bin/MakeProjectCreator/config/ssliop.mpb
index e73be56e997..91a0e278230 100644
--- a/bin/MakeProjectCreator/config/ssliop.mpb
+++ b/bin/MakeProjectCreator/config/ssliop.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project: interceptors, security, portableserver, ssl {
+project: security, portableserver, ssl {
after += SSLIOP
libs += TAO_SSLIOP
tagchecks += SSLIOP
diff --git a/bin/MakeProjectCreator/config/svc_utils.mpb b/bin/MakeProjectCreator/config/svc_utils.mpb
index a38a4a962cc..fea86bd16e6 100644
--- a/bin/MakeProjectCreator/config/svc_utils.mpb
+++ b/bin/MakeProjectCreator/config/svc_utils.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : portableserver, orbsvcslib {
+project : portableserver, taolib_with_idl {
after += Svc_Utils
libs += TAO_Svc_Utils
}
diff --git a/bin/MakeProjectCreator/config/taodefaults.mpb b/bin/MakeProjectCreator/config/taodefaults.mpb
index 781b2d43d5b..cc3b876c7e6 100644
--- a/bin/MakeProjectCreator/config/taodefaults.mpb
+++ b/bin/MakeProjectCreator/config/taodefaults.mpb
@@ -5,8 +5,4 @@ project {
staticflags += TAO_AS_STATIC_LIBS
includes += $(TAO_ROOT)
libpaths += $(ACE_ROOT)/lib
-
- specific(automake) {
- includes += $(TAO_BUILDDIR)
- }
}
diff --git a/bin/MakeProjectCreator/config/taolib.mpb b/bin/MakeProjectCreator/config/taolib.mpb
index ae9910d4e14..7a0a92a034f 100644
--- a/bin/MakeProjectCreator/config/taolib.mpb
+++ b/bin/MakeProjectCreator/config/taolib.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : acelib, taoversion, tao_output, taodefaults, pidl {
+project : acelib, taoversion, tao_output, taodefaults {
after += TAO
libs += TAO
}
diff --git a/bin/MakeProjectCreator/config/time.mpb b/bin/MakeProjectCreator/config/time.mpb
index a7787744a5e..a1270ad37a0 100644
--- a/bin/MakeProjectCreator/config/time.mpb
+++ b/bin/MakeProjectCreator/config/time.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : orbsvcslib, portableserver {
+project : naming {
after += CosTime
libs += TAO_CosTime
tagchecks += Time
diff --git a/bin/MakeProjectCreator/config/trading.mpb b/bin/MakeProjectCreator/config/trading.mpb
index d5cb48b46e4..e12229b3167 100644
--- a/bin/MakeProjectCreator/config/trading.mpb
+++ b/bin/MakeProjectCreator/config/trading.mpb
@@ -1,7 +1,8 @@
// -*- MPC -*-
// $Id$
-project : orbsvcslib {
+project : dynamicany, portableserver {
after += CosTrading
libs += TAO_CosTrading
+ tagchecks += Trader
}