6 files changed, 12 insertions, 86 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.mpc b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
index f1132586053..e73440e773b 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -3,13 +3,9 @@
 
 project(CosNaming_IDL) : orbsvcslib, core {
 
-  specific(!automake) {
-    requires += dummy_label
-  }
-
   custom_only =	1
 
-  idlflags +=	-Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h
+  idlflags += -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h
 
   IDL_Files {
     CosNaming.idl
@@ -20,16 +16,9 @@ project(CosNaming) : orbsvcslib, core {
   sharedname   = TAO_CosNaming
   dynamicflags = TAO_NAMING_BUILD_DLL
 
-  specific (automake) {
-    after	+= CosNaming_IDL
-  } else {
-    idlflags	+= -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h
-  }
+  after	+= CosNaming_IDL
 
   IDL_Files {
-    conditional (!automake) {
-      CosNaming.idl
-    }
   }
 
   Source_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
index cc835d9255e..7d8bfd3ad0a 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -3,13 +3,9 @@
 
 project(CosNotification_IDL) : orbsvcslib, core, event {
 
-  specific(!automake) {
-    requires += dummy_label
-  }
-
   custom_only = 1
 
-  idlflags    += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h
+  idlflags += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h
 
   IDL_Files {
     CosNotification.idl
@@ -25,21 +21,9 @@ project(CosNotification) : orbsvcslib, core, event {
   sharedname   = TAO_CosNotification
   dynamicflags = TAO_NOTIFY_BUILD_DLL
 
-  specific (automake) {
-    after       += CosNotification_IDL
-  } else {
-    idlflags    += -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h
-  }
+  after += CosNotification_IDL
 
   IDL_Files {
-    conditional (!automake) {
-      CosNotification.idl
-      CosNotifyComm.idl
-      CosNotifyFilter.idl
-      CosNotifyChannelAdmin.idl
-      NotifyExt.idl
-      Event_Forwarder.idl
-    }
   }
 
   Source_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index bbeb7a9f572..e42e484b382 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -3,13 +3,9 @@
 
 project(CosTrading_IDL) : orbsvcslib, core {
 
-  specific(!automake) {
-    requires += dummy_label
-  }
-
   custom_only = 1
 
-  idlflags    += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h
+  idlflags += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h
 
   IDL_Files {
     CosTrading.idl
@@ -23,18 +19,9 @@ project(CosTrading) : orbsvcslib, core {
   sharedname   = TAO_CosTrading
   dynamicflags = TAO_TRADING_BUILD_DLL
 
-  specific (automake) {
-    after     += CosTrading_IDL
-  } else {
-    idlflags  += -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h
-  }
+  after += CosTrading_IDL
 
   IDL_Files {
-    conditional (!automake) {
-      CosTrading.idl
-      CosTradingRepos.idl
-      CosTradingDynamic.idl
-    }
   }
 
   Source_Files {
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index 8177ca425a5..8dfaecb576b 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -3,13 +3,9 @@
 
 project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event {
 
-  specific(!automake) {
-    requires += dummy_label
-  }
-
   custom_only = 1
 
-  idlflags    += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h
+  idlflags += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h
 
   IDL_Files {
     DsEventLogAdmin.idl
@@ -20,16 +16,9 @@ project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event {
   sharedname   = TAO_DsEventLogAdmin
   dynamicflags = TAO_EVENTLOG_BUILD_DLL
 
-  specific (automake) {
-    after       += DsEventLogAdmin_IDL
-  } else {
-    idlflags    += -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h
-  }
+  after += DsEventLogAdmin_IDL
 
   IDL_Files {
-    conditional (!automake) {
-      DsEventLogAdmin.idl
-    }
   }
 
   Source_Files {
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index a4531ccee85..8200d972c94 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -3,13 +3,9 @@
 
 project(DsLogAdmin_IDL) : orbsvcslib, core {
 
-  specific(!automake) {
-    requires += dummy_label
-  }
-
   custom_only = 1
 
-  idlflags    += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h
+  idlflags += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h
 
   IDL_Files {
     DsLogAdmin.idl
@@ -21,17 +17,9 @@ project(DsLogAdmin) : orbsvcslib, core {
   sharedname   = TAO_DsLogAdmin
   dynamicflags = TAO_LOG_BUILD_DLL
 
-  specific (automake) {
-    after       += DsLogAdmin_IDL
-  } else {
-    idlflags    += -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h
-  }
+  after += DsLogAdmin_IDL
 
   IDL_Files {
-    conditional (!automake) {
-      DsLogAdmin.idl
-      DsLogNotification.idl
-    }
   }
 
   Source_Files {
diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
index a58918d62cf..b0817ae0f30 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -3,13 +3,9 @@
 
 project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification {
 
-  specific (!automake) {
-    requires += dummy_label
-  }
-
   custom_only = 1
 
-  idlflags    += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h
+  idlflags += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h
 
   IDL_Files {
     DsNotifyLogAdmin.idl
@@ -20,16 +16,9 @@ project(DsNotifyLogAdmin) : orbsvcslib, core, dslogadmin, dseventlogadmin, event
   sharedname   = TAO_DsNotifyLogAdmin
   dynamicflags = TAO_NOTIFYLOG_BUILD_DLL
 
-  specific (automake) {
-    after       += DsNotifyLogAdmin_IDL
-  } else {
-    idlflags    += -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h
-  }
+  after += DsNotifyLogAdmin_IDL
 
   IDL_Files {
-    conditional (!automake) {
-      DsNotifyLogAdmin.idl
-    }
   }
 
   Source_Files {