Removed DSUI requirement; to add it back, use dsui.mpb and the

*vars.cpp and .h files DSUI generates to the projects.

6 files changed, 3 insertions, 32 deletions

diff --git a/Kokyu/Kokyu.mpc b/Kokyu/Kokyu.mpc
index 5d20965f8c7..40756058c25 100644
--- a/Kokyu/Kokyu.mpc
+++ b/Kokyu/Kokyu.mpc
@@ -17,7 +17,7 @@ project(Kokyu) : acelib {
     Default_Dispatcher_Impl.cpp
     Dispatcher_Task.cpp
     Kokyu_defs.cpp
-    kokyu_dsui_vars.cpp
+    //kokyu_dsui_vars.cpp
   }
 
   Template_Files {
@@ -40,12 +40,6 @@ project(RGKokyu) : acelib {
     all : clean
   }
 
-  specific(gnuace) {
-    libs += dsui
-    libpaths += $(DATASTREAM_ROOT)/lib
-    includes += $(DATASTREAM_ROOT)/include
-  }
-
   Source_Files {
     Dispatch_Deferrer.cpp
     Dispatcher_Impl.cpp
@@ -53,7 +47,6 @@ project(RGKokyu) : acelib {
     Default_Dispatcher_Impl.cpp
     Dispatcher_Task.cpp
     Kokyu_defs.cpp
-    kokyu_dsui_vars.cpp
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.mpc b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
index 2b0eaa2843b..b2f2e81802d 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.mpc
@@ -7,8 +7,7 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging, portableserver {
   dynamicflags = TAO_RTEVENT_BUILD_DLL
   tagchecks   += RTEvent
   // Add this include path for precompiled headers
-  includes    += $(TAO_ROOT)/orbsvcs/orbsvcs $(DATASTREAM_ROOT)/include
-  libs += wrappers dsui
+  includes    += $(TAO_ROOT)/orbsvcs/orbsvcs
 
   IDL_Files {
     RtecDefaultEventData.idl
@@ -100,7 +99,6 @@ project(RTEvent) : orbsvcslib, core, svc_utils, messaging, portableserver {
       Event/EC_Type_Filter.cpp
       Event/EC_UDP_Admin.cpp
       Event/EC_Event_Limit.cpp
-      Event/ec_dsui_vars.cpp
     }
   }
 }
diff --git a/ace/RMCast/rmcast.mpc b/ace/RMCast/rmcast.mpc
index 548dbed6d6d..5f98b38d8b0 100644
--- a/ace/RMCast/rmcast.mpc
+++ b/ace/RMCast/rmcast.mpc
@@ -5,11 +5,4 @@ project(RMCast) : acelib, core {
   requires    += rmcast
   sharedname   = ACE_RMCast
   dynamicflags = ACE_RMCAST_BUILD_DLL
-
-  specific(gnuace) {
-    libs += dsui
-    libpaths += $(DATASTREAM_ROOT)/lib
-    includes += $(DATASTREAM_ROOT)/include
-  }
-
 }
diff --git a/ace/ace.mpc b/ace/ace.mpc
index 1e53d020e35..03910011d26 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -18,12 +18,6 @@ project(ACE) : acedefaults, aceversion, core, other, codecs, token, svcconf, uui
   //OS_String.cpp
   //Synch.cpp
 
-  specific(gnuace) {
-    libs += dsui
-    libpaths += $(DATASTREAM_ROOT)/lib
-    includes += $(DATASTREAM_ROOT)/include
-  }
-
   Source_Files(ACE_COMPONENTS) {
     OS {
       Basic_Types.cpp
@@ -277,7 +271,6 @@ project(ACE) : acedefaults, aceversion, core, other, codecs, token, svcconf, uui
       Message_Queue.cpp
       Reactor_Notification_Strategy.cpp
       Task.cpp
-      ace_dsui_vars.cpp
     }
 
     Memory {
diff --git a/bin/MakeProjectCreator/config/acelib.mpb b/bin/MakeProjectCreator/config/acelib.mpb
index ac0486b26f1..f28fd0eaacf 100644
--- a/bin/MakeProjectCreator/config/acelib.mpb
+++ b/bin/MakeProjectCreator/config/acelib.mpb
@@ -5,10 +5,4 @@ project: acedefaults, aceversion {
   after    += ACE
   libs     += ACE
   libout    = $(ACE_ROOT)/lib
-
-  specific(gnuace) {
-    libs += dsui
-    libpaths += $(DATASTREAM_ROOT)/lib
-    includes += $(DATASTREAM_ROOT)/include
-  }
 }
diff --git a/bin/MakeProjectCreator/config/kokyu.mpb b/bin/MakeProjectCreator/config/kokyu.mpb
index 23fb6f2b924..f1725fdbf33 100644
--- a/bin/MakeProjectCreator/config/kokyu.mpb
+++ b/bin/MakeProjectCreator/config/kokyu.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : acelib, dsui {
+project : acelib {
   after    += Kokyu
   libs     += Kokyu
   includes += $(ACE_ROOT)/Kokyu