Thu Nov 30 19:00:22 UTC 2006 Nishanth Shankaran <nshankar@nospam.com>

17 files changed, 69 insertions, 126 deletions

diff --git a/ChangeLog b/ChangeLog
index 46266c438be..8e6f695cd7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Thu Nov 30 19:00:22 UTC 2006  Nishanth Shankaran  <nshankar@nospam.com>
+
+        * Controller/Component/Controller.mpc:
+        * Input_Adapters/Base/Input_Adapter.mpc:
+        * Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc:
+        * Monitor/Central_Monitor/Monitor.mpc:
+        * Output_Adapters/Component/Output_Manager.mpc:
+        * Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc:
+        * Output_Adapters/Interface/Output_Adapter_Interface.mpc:
+        * Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc:
+        * Plan_Analyzer/Component/Plan_Analyzer.mpc:
+        * Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc:
+        * Planner_Manager/Component/Planner_Manager.mpc:
+        * Planner_Manager/Interface/Planner_Manager_Interface.mpc:
+        * Planners/Base/Planner.mpc:
+        * Planners/Interface/Planner_Interface.mpc:
+        * Planners/StaticPlanner/StaticPlanner.mpc:
+        * common/RACE_common.mpc: Modified the mpc files to take care of
+          the export macro stuff.
+
 Tue Nov 14 18:52:38 UTC 2006  John S. Kinnebrew  <john.s.kinnebrew@vanderbilt.edu>
 
         * SA_POP/SPACE.san.xml: Removed
diff --git a/Controller/Component/Controller.mpc b/Controller/Component/Controller.mpc
index de27e52e928..8debfd0f1d0 100644
--- a/Controller/Component/Controller.mpc
+++ b/Controller/Component/Controller.mpc
@@ -77,8 +77,6 @@ project(Controller_exec) : ciao_component_dnc, ciao_config_handlers {
                NodeManager_stub \
                Monitor_stub
 
-  idlflags  +=  -Wb,export_macro=CONTROLLER_EXEC_Export \
-                -Wb,export_include=Controller_exec_export.h
   dynamicflags   = CONTROLLER_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/Input_Adapters/Base/Input_Adapter.mpc b/Input_Adapters/Base/Input_Adapter.mpc
index abf47f7b1d9..659cdbf80f7 100644
--- a/Input_Adapters/Base/Input_Adapter.mpc
+++ b/Input_Adapters/Base/Input_Adapter.mpc
@@ -1,12 +1,8 @@
-// Input_Adapter.mpc,v 1.2 2005/09/19 15:55:49 wotte Exp 
-// This file is generated with "generate_component_mpc.pl -n Input_Adapter"
-
 project(Input_Adapter_stub): ciao_deployment_stub, ciao_race_component {
 
   after += Plan_Analyzer_Interface_stub
   sharedname = Input_Adapter_stub
-  idlflags += -Sc \
-              -Wb,stub_export_macro=INPUT_ADAPTER_STUB_Export \
+  idlflags += -Wb,stub_export_macro=INPUT_ADAPTER_STUB_Export \
               -Wb,stub_export_include=Input_Adapter_stub_export.h \
               -Wb,skel_export_macro=INPUT_ADAPTER_SVNT_Export \
               -Wb,skel_export_include=Input_Adapter_svnt_export.h
@@ -36,15 +32,9 @@ project(Input_Adapter_svnt) : ciao_servant_dnc, ciao_race_component {
   sharedname  = Input_Adapter_svnt
   libs    += Input_Adapter_stub Plan_Analyzer_Interface_stub
 
-  idlflags += -Sc \
-              -Wb,stub_export_macro=INPUT_ADAPTER_STUB_Export \
-              -Wb,stub_export_include=Input_Adapter_stub_export.h \
-              -Wb,skel_export_macro=INPUT_ADAPTER_SVNT_Export \
-              -Wb,skel_export_include=Input_Adapter_svnt_export.h
   dynamicflags = INPUT_ADAPTER_SVNT_BUILD_DLL
 
   IDL_Files {
-    Input_Adapter.idl
   }
 
   Source_Files {
diff --git a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
index 0b502e74c76..42bcff76cdb 100644
--- a/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
+++ b/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
@@ -1,8 +1,7 @@
 project(Interactive_Input_Adapter_stub): ciao_deployment_stub, ciao_race_component {
   after += Input_Adapter_stub
   sharedname = Interactive_Input_Adapter_stub
-  idlflags += -Sc \
-              -Wb,stub_export_macro=INTERACTIVE_INPUT_ADAPTER_STUB_Export \
+  idlflags += -Wb,stub_export_macro=INTERACTIVE_INPUT_ADAPTER_STUB_Export \
               -Wb,stub_export_include=Interactive_Input_Adapter_stub_export.h \
               -Wb,skel_export_macro=INTERACTIVE_INPUT_ADAPTER_SVNT_Export \
               -Wb,skel_export_include=Interactive_Input_Adapter_svnt_export.h
@@ -36,8 +35,7 @@ project(Interactive_Input_Adapter_svnt) : ciao_servant_dnc, ciao_race_component
              Input_Adapter_svnt \
              Plan_Analyzer_Interface_stub
 
-  idlflags  +=  -Sc \
-                -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_SVNT_Export \
+  idlflags  +=  -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_SVNT_Export \
                 -Wb,export_include=Interactive_Input_Adapter_svnt_export.h
 
   dynamicflags = INTERACTIVE_INPUT_ADAPTER_SVNT_BUILD_DLL
@@ -79,9 +77,6 @@ project(Interactive_Input_Adapter_exec) : ciao_component_dnc, ciao_config_handle
              Input_Adapter_svnt \
              Plan_Analyzer_Interface_stub \
 
-  idlflags  +=  -Sc \
-                -Wb,export_macro=INTERACTIVE_INPUT_ADAPTER_EXEC_Export \
-                -Wb,export_include=Interactive_Input_Adapter_exec_export.h
   dynamicflags   = INTERACTIVE_INPUT_ADAPTER_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/Monitor/Central_Monitor/Monitor.mpc b/Monitor/Central_Monitor/Monitor.mpc
index 3e3971cb271..892c285232f 100644
--- a/Monitor/Central_Monitor/Monitor.mpc
+++ b/Monitor/Central_Monitor/Monitor.mpc
@@ -25,10 +25,6 @@ project(Monitor_svnt) : ciao_servant_dnc {
                 -Wb,export_include=Monitor_svnt_export.h
   dynamicflags = MONITOR_SVNT_BUILD_DLL
 
-//  cidlflags -= --
-
-//  cidlflags += -gen-exec-impl --
-
   CIDL_Files {
     Monitor.cidl
   }
@@ -50,8 +46,6 @@ project(Monitor_exec) : ciao_component_dnc {
   sharedname = Monitor_exec
   libs      += Monitor_stub Monitor_svnt
 
-  idlflags  +=  -Wb,export_macro=MONITOR_EXEC_Export \
-                -Wb,export_include=Monitor_exec_export.h
   dynamicflags   = MONITOR_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -59,7 +53,6 @@ project(Monitor_exec) : ciao_component_dnc {
   }
 
   Source_Files {
-
     Monitor_exec.cpp
   }
 }
diff --git a/Output_Adapters/Component/Output_Manager.mpc b/Output_Adapters/Component/Output_Manager.mpc
index 7130c57e929..d8fb4cbdb33 100644
--- a/Output_Adapters/Component/Output_Manager.mpc
+++ b/Output_Adapters/Component/Output_Manager.mpc
@@ -58,13 +58,9 @@ project(Output_Manager_exec) : ciao_component_dnc, ciao_race_component  {
                Output_Adapter_Interface_stub \
                Output_Adapter_Interface_svnt
 
-  idlflags  +=  -Wb,export_macro=OUTPUT_MANAGER_EXEC_Export \
-                -Wb,export_include=Output_Manager_exec_export.h
-
   dynamicflags   = OUTPUT_MANAGER_EXEC_BUILD_DLL
 
   IDL_Files {
-
   }
 
   Source_Files {
diff --git a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc
index 1a4845732ea..c1b3110a71e 100644
--- a/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc
+++ b/Output_Adapters/DAnCE_Output_Adapter/DAnCE_Output_Adapter.mpc
@@ -82,9 +82,6 @@ project(DAnCE_Output_Adapter_exec) : ciao_component_dnc, ciao_race_component, ci
                NodeManager_stub \
                Monitor_stub
 
-  idlflags  +=  -Wb,export_macro=DANCE_OUTPUT_ADAPTER_EXEC_Export \
-                -Wb,export_include=DAnCE_Output_Adapter_exec_export.h
-
   dynamicflags   = DANCE_OUTPUT_ADAPTER_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/Output_Adapters/Interface/Output_Adapter_Interface.mpc b/Output_Adapters/Interface/Output_Adapter_Interface.mpc
index b8e7aa97b13..6355e6d9f4c 100644
--- a/Output_Adapters/Interface/Output_Adapter_Interface.mpc
+++ b/Output_Adapters/Interface/Output_Adapter_Interface.mpc
@@ -1,12 +1,7 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//Output_Adapter_Interface.mpc,v 1.2 2005/09/19 15:55:49 wotte Exp
-// This file is generated with "generate_component_mpc.pl -n Output_Adapter_Interface"
-
 project(Output_Adapter_Interface_stub): ciao_deployment_stub, ciao_race_component  {
 
   sharedname = Output_Adapter_Interface_stub
-  idlflags += -Sc \
-              -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \
+  idlflags += -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \
               -Wb,stub_export_include=Output_Adapter_Interface_stub_export.h \
               -Wb,skel_export_macro=OUTPUT_ADAPTER_INTERFACE_SVNT_Export \
               -Wb,skel_export_include=Output_Adapter_Interface_svnt_export.h
@@ -35,15 +30,9 @@ project(Output_Adapter_Interface_svnt) : ciao_servant_dnc, ciao_race_component
   sharedname  = Output_Adapter_Interface_svnt
   libs    += Output_Adapter_Interface_stub
 
-  idlflags += -Sc \
-              -Wb,stub_export_macro=OUTPUT_ADAPTER_INTERFACE_STUB_Export \
-              -Wb,stub_export_include=Output_Adapter_Interface_stub_export.h \
-              -Wb,skel_export_macro=OUTPUT_ADAPTER_INTERFACE_SVNT_Export \
-              -Wb,skel_export_include=Output_Adapter_Interface_svnt_export.h
   dynamicflags = OUTPUT_ADAPTER_INTERFACE_SVNT_BUILD_DLL
 
   IDL_Files {
-    PlanEgress.idl
   }
 
   Source_Files {
diff --git a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc
index ee512c768ed..13ac1315222 100644
--- a/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc
+++ b/Output_Adapters/XML_Output_Adapter/XML_Output_Adapter.mpc
@@ -65,6 +65,7 @@ project(XML_Output_Adapter_exec) : ciao_component_dnc, ciao_race_component, ciao
                 -Wb,export_include=XML_Output_Adapter_exec_export.h
   dynamicflags   = XML_OUTPUT_ADAPTER_EXEC_BUILD_DLL
   includes += $(CIAO_ROOT)/tools/Config_Handlers
+
   IDL_Files {
 
   }
diff --git a/Plan_Analyzer/Component/Plan_Analyzer.mpc b/Plan_Analyzer/Component/Plan_Analyzer.mpc
index 1ac2b6bce11..30ee74657fa 100644
--- a/Plan_Analyzer/Component/Plan_Analyzer.mpc
+++ b/Plan_Analyzer/Component/Plan_Analyzer.mpc
@@ -1,26 +1,20 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//Plan_Analyzer.mpc,v 1.2 2005/09/19 15:55:49 wotte Exp
-// This file is generated with "generate_component_mpc.pl Plan_Analyzer"
-
 project(Plan_Analyzer_stub): ciao_deployment_stub, ciao_race_component {
   after += Plan_Analyzer_Interface_stub \
            Planner_Manager_Interface_stub \
            Analyzer_I_stub
 
   libs += Plan_Analyzer_Interface_stub \
-           Planner_Manager_Interface_stub \ 
-          Analyzer_I_stub
+          Planner_Manager_Interface_stub \
+          Analyzer_I_stub \
+          RACE_common_stub
 
   sharedname = Plan_Analyzer_stub
-  idlflags += -Sc \
-              -Wb,stub_export_macro=PLAN_ANALYZER_STUB_Export \
+
+  idlflags += -Wb,stub_export_macro=PLAN_ANALYZER_STUB_Export \
               -Wb,stub_export_include=Plan_Analyzer_stub_export.h \
               -Wb,skel_export_macro=PLAN_ANALYZER_SVNT_Export \
               -Wb,skel_export_include=Plan_Analyzer_svnt_export.h
   dynamicflags   = PLAN_ANALYZER_STUB_BUILD_DLL
-  libs += Plan_Analyzer_Interface_stub \
-          RACE_common_stub \
-          Planner_Manager_Interface_stub
 
   IDL_Files {
     Plan_Analyzer.idl
@@ -49,8 +43,7 @@ project(Plan_Analyzer_svnt) : ciao_servant_dnc, ciao_race_component {
              Plan_Analyzer_Interface_svnt \
              Planner_Manager_Interface_stub Analyzer_I_stub
 
-  idlflags  +=  -Sc \
-                -Wb,export_macro=PLAN_ANALYZER_SVNT_Export \
+  idlflags  +=  -Wb,export_macro=PLAN_ANALYZER_SVNT_Export \
                 -Wb,export_include=Plan_Analyzer_svnt_export.h
 
   dynamicflags = PLAN_ANALYZER_SVNT_BUILD_DLL
@@ -93,13 +86,10 @@ project(Plan_Analyzer_exec) : ciao_component_dnc, ciao_race_component {
              Plan_Analyzer_Interface_svnt \
              Planner_Manager_Interface_stub Analyzer_I_stub
 
-  idlflags  +=  -Sc \
-                -Wb,export_macro=PLAN_ANALYZER_EXEC_Export \
-                -Wb,export_include=Plan_Analyzer_exec_export.h
   dynamicflags   = PLAN_ANALYZER_EXEC_BUILD_DLL
 
   IDL_Files {
-    
+
   }
 
   Source_Files {
diff --git a/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc b/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
index d4f82ec3669..ae643176ab5 100644
--- a/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
+++ b/Plan_Analyzer/Interface/Plan_Analyzer_Interface.mpc
@@ -1,8 +1,7 @@
 project(Plan_Analyzer_Interface_stub): ciao_deployment_stub, ciao_race_component {
 
   sharedname = Plan_Analyzer_Interface_stub
-  idlflags += -Sc \
-              -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \
+  idlflags += -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \
               -Wb,stub_export_include=Plan_Analyzer_Interface_stub_export.h \
               -Wb,skel_export_macro=PLAN_ANALYZER_INTERFACE_SVNT_Export \
               -Wb,skel_export_include=Plan_Analyzer_Interface_svnt_export.h
@@ -31,15 +30,9 @@ project(Plan_Analyzer_Interface_svnt) : ciao_servant_dnc, ciao_race_component {
   sharedname  = Plan_Analyzer_Interface_svnt
   libs    += Plan_Analyzer_Interface_stub
 
-  idlflags += -Sc \
-              -Wb,stub_export_macro=PLAN_ANALYZER_INTERFACE_STUB_Export \
-              -Wb,stub_export_include=Plan_Analyzer_Interface_stub_export.h \
-              -Wb,skel_export_macro=PLAN_ANALYZER_INTERFACE_SVNT_Export \
-              -Wb,skel_export_include=Plan_Analyzer_Interface_svnt_export.h
   dynamicflags = PLAN_ANALYZER_INTERFACE_SVNT_BUILD_DLL
 
   IDL_Files {
-    PlanIngress.idl
   }
 
   Source_Files {
@@ -78,7 +71,7 @@ project(Analyzer_I_stub): ciao_deployment_stub, ciao_race_component {
   }
 
   Inline_Files {
-    AnalyzerC.inl
+    Analyzer_IC.inl
   }
 
 }
@@ -88,11 +81,21 @@ project(Analyzer_I_svnt) : ciao_servant_dnc, ciao_race_component {
   sharedname  = Analyzer_I_svnt
   libs    += Analyzer_I_stub
 
-  idlflags  +=  -Wb,export_macro=ANALYZER_I_SVNT_Export \
-                -Wb,export_include=Analyzer_I_svnt_export.h
   dynamicflags = ANALYZER_I_SVNT_BUILD_DLL
 
+  IDL_Files {
+  }
+
+  Header_Files {
+    Analyzer_IS.h
+  }
+
   Source_Files {
     Analyzer_IS.cpp
   }
+
+  Inline_Files {
+    Analyzer_IS.inl
+  }
+
 }
diff --git a/Planner_Manager/Component/Planner_Manager.mpc b/Planner_Manager/Component/Planner_Manager.mpc
index 2699080cd0c..6cfb4b2ca66 100644
--- a/Planner_Manager/Component/Planner_Manager.mpc
+++ b/Planner_Manager/Component/Planner_Manager.mpc
@@ -3,8 +3,8 @@ project(Planner_Manager_stub): ciao_deployment_stub, ciao_race_component {
            Planner_Interface_stub \
            Output_Adapter_Interface_stub
   sharedname = Planner_Manager_stub
-  idlflags += -Sc \
-              -Wb,stub_export_macro=PLANNER_MANAGER_STUB_Export \
+
+  idlflags += -Wb,stub_export_macro=PLANNER_MANAGER_STUB_Export \
               -Wb,stub_export_include=Planner_Manager_stub_export.h \
               -Wb,skel_export_macro=PLANNER_MANAGER_SVNT_Export \
               -Wb,skel_export_include=Planner_Manager_svnt_export.h
@@ -46,8 +46,8 @@ project(Planner_Manager_svnt) : ciao_servant_dnc, ciao_race_component {
              TargetManager_stub \
              TargetManager_svnt \
              NodeManager_stub
-  idlflags  +=  -Sc \
-                -Wb,export_macro=PLANNER_MANAGER_SVNT_Export \
+
+  idlflags  +=  -Wb,export_macro=PLANNER_MANAGER_SVNT_Export \
                 -Wb,export_include=Planner_Manager_svnt_export.h
 
   dynamicflags = PLANNER_MANAGER_SVNT_BUILD_DLL
@@ -95,9 +95,6 @@ project(Planner_Manager_exec) : ciao_component_dnc, ciao_race_component {
              TargetManager_svnt \
              NodeManager_stub
 
-  idlflags  +=  -Sc \
-                -Wb,export_macro=PLANNER_MANAGER_EXEC_Export \
-                -Wb,export_include=Planner_Manager_exec_export.h
   dynamicflags   = PLANNER_MANAGER_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/Planner_Manager/Interface/Planner_Manager_Interface.mpc b/Planner_Manager/Interface/Planner_Manager_Interface.mpc
index b44cbf71c1e..b0741f9c340 100644
--- a/Planner_Manager/Interface/Planner_Manager_Interface.mpc
+++ b/Planner_Manager/Interface/Planner_Manager_Interface.mpc
@@ -1,13 +1,9 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//Planner_Manager_Interface.mpc,v 1.2 2005/09/19 15:55:49 wotte Exp
-// This file is generated with "generate_component_mpc.pl -n Planner_Manager_Interface"
-
 project(Planner_Manager_Interface_stub): ciao_deployment_stub, anytypecode, ciao_race_component {
 
   sharedname = Planner_Manager_Interface_stub
   after += RACE_common_stub
-  idlflags += -Sc \
-              -Wb,stub_export_macro=PLANNER_MANAGER_INTERFACE_STUB_Export \
+
+  idlflags += -Wb,stub_export_macro=PLANNER_MANAGER_INTERFACE_STUB_Export \
               -Wb,stub_export_include=Planner_Manager_Interface_stub_export.h \
               -Wb,skel_export_macro=PLANNER_MANAGER_INTERFACE_SVNT_Export \
               -Wb,skel_export_include=Planner_Manager_Interface_svnt_export.h
@@ -37,15 +33,9 @@ project(Planner_Manager_Interface_svnt) : ciao_servant_dnc, ciao_race_component
   sharedname  = Planner_Manager_Interface_svnt
   libs    += Planner_Manager_Interface_stub RACE_common_stub
 
-  idlflags += -Sc \
-              -Wb,stub_export_macro=PLANNER_MANAGER_INTERFACE_STUB_Export \
-              -Wb,stub_export_include=Planner_Manager_Interface_stub_export.h \
-              -Wb,skel_export_macro=PLANNER_MANAGER_INTERFACE_SVNT_Export \
-              -Wb,skel_export_include=Planner_Manager_Interface_svnt_export.h
   dynamicflags = PLANNER_MANAGER_INTERFACE_SVNT_BUILD_DLL
 
   IDL_Files {
-    Planner_Manager_I.idl
   }
 
   Source_Files {
diff --git a/Planners/Base/Planner.mpc b/Planners/Base/Planner.mpc
index 326daa16e49..f3f9891f7ac 100644
--- a/Planners/Base/Planner.mpc
+++ b/Planners/Base/Planner.mpc
@@ -1,13 +1,9 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//Planner.mpc,v 1.2 2005/09/19 15:55:49 wotte Exp
-// This file is generated with "generate_component_mpc.pl -n Planner"
-
 project(Planner_stub): ciao_deployment_stub, ciao_race_component {
 
   after += Planner_Interface_stub RACE_common_stub
   sharedname = Planner_stub
-  idlflags += -Sc \
-              -Wb,stub_export_macro=PLANNER_STUB_Export \
+
+  idlflags += -Wb,stub_export_macro=PLANNER_STUB_Export \
               -Wb,stub_export_include=Planner_stub_export.h \
               -Wb,skel_export_macro=PLANNER_SVNT_Export \
               -Wb,skel_export_include=Planner_svnt_export.h
@@ -37,15 +33,9 @@ project(Planner_svnt) : ciao_servant_dnc, ciao_race_component  {
   sharedname  = Planner_svnt
   libs    += Planner_Interface_stub Planner_Interface_svnt Planner_stub RACE_common_stub
 
-  idlflags += -Sc \
-              -Wb,stub_export_macro=PLANNER_STUB_Export \
-              -Wb,stub_export_include=Planner_stub_export.h \
-              -Wb,skel_export_macro=PLANNER_SVNT_Export \
-              -Wb,skel_export_include=Planner_svnt_export.h
   dynamicflags = PLANNER_SVNT_BUILD_DLL
 
   IDL_Files {
-    Planner.idl
   }
 
   Source_Files {
diff --git a/Planners/Interface/Planner_Interface.mpc b/Planners/Interface/Planner_Interface.mpc
index 0f17a0bbb74..7434265bf4c 100644
--- a/Planners/Interface/Planner_Interface.mpc
+++ b/Planners/Interface/Planner_Interface.mpc
@@ -1,12 +1,8 @@
-// generate_component_mpc.pl,v 1.9 2003/12/22 21:56:27 boris Exp
-//Planner_Interface.mpc,v 1.2 2005/09/19 15:55:49 wotte Exp
-// This file is generated with "generate_component_mpc.pl -n Planner_I"
-
 project(Planner_Interface_stub): ciao_deployment_stub, ciao_race_component  {
 
   sharedname = Planner_Interface_stub
-  idlflags += -Sc \
-              -Wb,stub_export_macro=PLANNER_INTERFACE_STUB_Export \
+
+  idlflags += -Wb,stub_export_macro=PLANNER_INTERFACE_STUB_Export \
               -Wb,stub_export_include=Planner_Interface_stub_export.h \
               -Wb,skel_export_macro=PLANNER_INTERFACE_SVNT_Export \
               -Wb,skel_export_include=Planner_Interface_svnt_export.h
@@ -35,15 +31,9 @@ project(Planner_Interface_svnt) : ciao_servant_dnc, ciao_race_component  {
   sharedname  = Planner_Interface_svnt
   libs    += Planner_Interface_stub
 
-  idlflags += -Sc \
-              -Wb,stub_export_macro=PLANNER_INTERFACE_STUB_Export \
-              -Wb,stub_export_include=Planner_Interface_stub_export.h \
-              -Wb,skel_export_macro=PLANNER_INTERFACE_SVNT_Export \
-              -Wb,skel_export_include=Planner_Interface_svnt_export.h
   dynamicflags = PLANNER_INTERFACE_SVNT_BUILD_DLL
 
   IDL_Files {
-    Planner_I.idl
   }
 
   Source_Files {
diff --git a/Planners/StaticPlanner/StaticPlanner.mpc b/Planners/StaticPlanner/StaticPlanner.mpc
index cdde9cb121c..b8be785ee74 100644
--- a/Planners/StaticPlanner/StaticPlanner.mpc
+++ b/Planners/StaticPlanner/StaticPlanner.mpc
@@ -2,7 +2,11 @@ project(Planner_StaticPlanner_stub): ciao_deployment_stub, ciao_race_component {
   after += Planner_stub Planner_Interface_stub
   libs += Planner_stub Planner_Interface_stub
   sharedname = StaticPlanner_stub
-  idlflags += -Wb,stub_export_macro=STATICPLANNER_STUB_Export -Wb,stub_export_include=StaticPlanner_stub_export.h -Wb,skel_export_macro=STATICPLANNER_SVNT_Export -Wb,skel_export_include=StaticPlanner_svnt_export.h
+  idlflags += -Wb,stub_export_macro=STATICPLANNER_STUB_Export \
+               -Wb,stub_export_include=StaticPlanner_stub_export.h \
+               -Wb,skel_export_macro=STATICPLANNER_SVNT_Export \
+               -Wb,skel_export_include=StaticPlanner_svnt_export.h
+
   dynamicflags   = STATICPLANNER_STUB_BUILD_DLL
 
   IDL_Files {
@@ -17,9 +21,12 @@ project(Planner_StaticPlanner_stub): ciao_deployment_stub, ciao_race_component {
 project(Planner_StaticPlanner_svnt) : ciao_servant_dnc, ciao_race_component {
   after += Planner_svnt Planner_StaticPlanner_stub Planner_Interface_svnt
   sharedname  = StaticPlanner_svnt
-  libs    += StaticPlanner_stub Planner_stub Planner_svnt Planner_Interface_stub Planner_Interface_svnt
+  libs    += StaticPlanner_stub Planner_stub Planner_svnt \
+             Planner_Interface_stub Planner_Interface_svnt
+
+  idlflags  +=  -Wb,export_macro=STATICPLANNER_SVNT_Export \
+                -Wb,export_include=StaticPlanner_svnt_export.h
 
-  idlflags  +=  -Wb,export_macro=STATICPLANNER_SVNT_Export -Wb,export_include=StaticPlanner_svnt_export.h
   dynamicflags = STATICPLANNER_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -49,7 +56,6 @@ project(Planner_StaticPlanner_exec) : ciao_component_dnc, ciao_race_component {
                Planner_svnt \
                RACE_common_stub
 
-  idlflags  +=  -Wb,export_macro=STATICPLANNER_EXEC_Export -Wb,export_include=StaticPlanner_exec_export.h
   dynamicflags   = STATICPLANNER_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/common/RACE_common.mpc b/common/RACE_common.mpc
index 359320e9f10..924d1901584 100644
--- a/common/RACE_common.mpc
+++ b/common/RACE_common.mpc
@@ -1,10 +1,9 @@
-//project(RACE_common_stub): taolib_with_idl, anytypecode {
 project(RACE_common_stub): ciao_deployment_stub {
 
   sharedname = RACE_common_stub
   idlflags += -Wb,stub_export_macro=RACE_COMMON_STUB_Export \
-              -Wb,stub_export_include=RACE_common_stub_export.h \
-              -SS
+              -Wb,stub_export_include=RACE_common_stub_export.h
+
   dynamicflags   = RACE_COMMON_STUB_BUILD_DLL
 
   IDL_Files {
@@ -28,8 +27,7 @@ project(OpString_stub): ciao_deployment_stub {
 
   sharedname = OpString_stub
   idlflags += -Wb,stub_export_macro=OPSTRING_STUB_Export \
-              -Wb,stub_export_include=OpString_stub_export.h \
-              -SS
+              -Wb,stub_export_include=OpString_stub_export.h
 
   dynamicflags   = OPSTRING_STUB_BUILD_DLL