7 files changed, 229 insertions, 37 deletions
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc
index 7cd986e6a2d..ed0b14b832b 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/EventSequence.mpc
@@ -1,26 +1,54 @@
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): portableserver, orbsvcsexe, notification_skel, naming {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     EventSequenceSupplier_i.cpp
     MessengerServer.cpp
     Messenger_i.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
 project(*Client): orbsvcsexe, notification, naming {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
     MessengerC.cpp
     MessengerClient.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }
 
 project(*Consumer): portableserver, orbsvcsexe, notification_skel, naming {
+  exename = MessengerConsumer
+  after += *idl
   IDL_Files {
   }
   Source_Files {
     MessengerConsumer.cpp
     EventSequenceConsumer_i.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc
index 88a7660808e..67245745272 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Filtering/Filtering.mpc
@@ -1,29 +1,53 @@
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): portableserver, orbsvcsexe, notification_skel, naming {
   exename = MessengerServer
+  after += *idl
   Source_Files {
     StructuredEventSupplier_i.cpp
     MessengerServer.cpp
     Messenger_i.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
 project(*Client): orbsvcsexe, notification, naming {
   exename = MessengerClient
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }
 
 project(*Consumer): portableserver, orbsvcsexe, notification_skel, naming {
   exename = MessengerConsumer
-  IDL_Files {
-  }
+  after += *idl
   Source_Files {
     MessengerConsumer.cpp
     StructuredEventConsumer_i.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc
index c6cd2f3d24c..e887855005a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/Messenger/NotifyServiceMessenger.mpc
@@ -1,25 +1,53 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, namingexe, notification_skel {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, namingexe, notification_skel {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     StructuredEventSupplier_i.cpp
-    MessengerServer.cpp         
+    MessengerServer.cpp
     Messenger_i.cpp
   }
-}
-
-project(*Client): taoexe, namingexe, notification {
   Source_Files {
     MessengerC.cpp
-    MessengerClient.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
   }
 }
 
-project(*Consumer): taoexe, portableserver, namingexe, notification_skel {
+project(*Client): taoclient, namingexe, notification {
+  exename = MessengerClient
+  after += *idl
+  Source_Files {
+    MessengerClient.cpp
+  }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
   IDL_Files {
   }
+}
+
+project(*Consumer): taoserver, namingexe, notification_skel {
+  exename = MessengerConsumer
+  after += *idl
   Source_Files {
     MessengerConsumer.cpp
     StructuredEventConsumer_i.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc
index c6cd2f3d24c..e887855005a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/OfferSubscriptions/OfferSubscriptions.mpc
@@ -1,25 +1,53 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, namingexe, notification_skel {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, namingexe, notification_skel {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     StructuredEventSupplier_i.cpp
-    MessengerServer.cpp         
+    MessengerServer.cpp
     Messenger_i.cpp
   }
-}
-
-project(*Client): taoexe, namingexe, notification {
   Source_Files {
     MessengerC.cpp
-    MessengerClient.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
   }
 }
 
-project(*Consumer): taoexe, portableserver, namingexe, notification_skel {
+project(*Client): taoclient, namingexe, notification {
+  exename = MessengerClient
+  after += *idl
+  Source_Files {
+    MessengerClient.cpp
+  }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
   IDL_Files {
   }
+}
+
+project(*Consumer): taoserver, namingexe, notification_skel {
+  exename = MessengerConsumer
+  after += *idl
   Source_Files {
     MessengerConsumer.cpp
     StructuredEventConsumer_i.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc
index c6cd2f3d24c..e887855005a 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/QoSProperties/QoSProperties.mpc
@@ -1,25 +1,53 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, namingexe, notification_skel {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, namingexe, notification_skel {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     StructuredEventSupplier_i.cpp
-    MessengerServer.cpp         
+    MessengerServer.cpp
     Messenger_i.cpp
   }
-}
-
-project(*Client): taoexe, namingexe, notification {
   Source_Files {
     MessengerC.cpp
-    MessengerClient.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
   }
 }
 
-project(*Consumer): taoexe, portableserver, namingexe, notification_skel {
+project(*Client): taoclient, namingexe, notification {
+  exename = MessengerClient
+  after += *idl
+  Source_Files {
+    MessengerClient.cpp
+  }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
   IDL_Files {
   }
+}
+
+project(*Consumer): taoserver, namingexe, notification_skel {
+  exename = MessengerConsumer
+  after += *idl
   Source_Files {
     MessengerConsumer.cpp
     StructuredEventConsumer_i.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc
index cc01e7483d9..2915af028d6 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/RTNotify/RTNotify.mpc
@@ -1,25 +1,53 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, namingexe, notification_skel, rtcorba {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, namingexe, notification_skel, rtcorba {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     StructuredEventSupplier_i.cpp
-    MessengerServer.cpp         
+    MessengerServer.cpp
     Messenger_i.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(*Client): taoexe, namingexe, notification {
+project(*Client): taoclient, namingexe, notification {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
     MessengerC.cpp
     MessengerClient.cpp
   }
-}
-
-project(*Consumer): taoexe, portableserver, namingexe, notification_skel, rtportableserver {
+  Source_Files {
+    MessengerC.cpp
+  }
   IDL_Files {
   }
+}
+
+project(*Consumer): taoserver, namingexe, notification_skel, rtportableserver {
+  exename = MessengerConsumer
+  after += *idl
   Source_Files {
     MessengerConsumer.cpp
     StructuredEventConsumer_i.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc
index 5458a3127b2..0abe4b7e5dc 100644
--- a/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc
+++ b/TAO/orbsvcs/DevGuideExamples/NotifyService/SupplierSideNC/SupplierSideNC.mpc
@@ -1,25 +1,53 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, namingexe, notification_serv {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, namingexe, notification_serv {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     StructuredEventSupplier_i.cpp
-    MessengerServer.cpp         
+    MessengerServer.cpp
     Messenger_i.cpp
   }
-}
-
-project(*Client): taoexe, namingexe, notification {
   Source_Files {
     MessengerC.cpp
-    MessengerClient.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
   }
 }
 
-project(*Consumer): taoexe, portableserver, namingexe, notification_skel {
+project(*Client): taoclient, namingexe, notification {
+  exename = MessengerClient
+  after += *idl
+  Source_Files {
+    MessengerClient.cpp
+  }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
   IDL_Files {
   }
+}
+
+project(*Consumer): taoserver, namingexe, notification_skel {
+  exename = MessengerConsumer
+  after += *idl
   Source_Files {
     MessengerConsumer.cpp
     StructuredEventConsumer_i.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }