Wed Oct 29 19:23:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

8 files changed, 96 insertions, 16 deletions

diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc b/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc
index 742769bb17c..654ada76322 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/Auth.mpc
@@ -1,19 +1,40 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, namingexe, pi_server, avoids_minimum_corba {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, pi_server, avoids_minimum_corba {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     ServerInitializer.cpp
     ServerInterceptor.cpp
     MessengerServer.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(*Client): taoexe, namingexe, pi, avoids_minimum_corba, interceptors {
+project(*Client): taoclient, pi, avoids_minimum_corba, interceptors {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
     ClientInitializer.cpp
     ClientInterceptor.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
index 17613d73381..bc1cfd78d0f 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/Auth/MessengerClient.cpp
@@ -5,7 +5,6 @@
 #include "tao/ORBInitializer_Registry.h"
 // Ensure that the PI library is linked in when building statically
 #include "tao/PI/PI.h"
-#include "orbsvcs/CosNamingC.h"
 #include <iostream>
 
 int
diff --git a/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc b/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc
index b52d3c63910..28e5fe7e1ae 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/IOR/IOR.mpc
@@ -1,6 +1,15 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, pi_server, avoids_minimum_corba, iorinterceptor {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, pi_server, avoids_minimum_corba, iorinterceptor {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     MessengerServer.cpp
@@ -8,13 +17,25 @@ project(*Server): taoexe, portableserver, pi_server, avoids_minimum_corba, iorin
     ServerInterceptor.cpp
     ServerIORInterceptor.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(*Client): taoexe, pi, avoids_minimum_corba, interceptors {
+project(*Client): taoclient, pi, avoids_minimum_corba, interceptors {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
     ClientInitializer.cpp
     ClientInterceptor.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
index 41372dddb13..2585bbc7d72 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/ClientInitializer.cpp
@@ -3,7 +3,6 @@
 #include "ClientInitializer.h"
 #include "ClientInterceptor.h"
 #include "MessengerC.h"
-#include "orbsvcs/CosNamingC.h"
 #include <iostream>
 
 ClientInitializer::ClientInitializer (void)
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp
index 65c51a955bb..8992a47f748 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerClient.cpp
@@ -6,7 +6,6 @@
 #include "tao/ORBInitializer_Registry.h"
 // Ensure that the PI library is linked in when building statically
 #include "tao/PI/PI.h"
-#include "orbsvcs/CosNamingC.h"
 #include <iostream>
 
 int
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
index 9282e1415c4..7f6034193a7 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/MessengerServer.cpp
@@ -7,7 +7,6 @@
 #include "tao/ORBInitializer_Registry.h"
 // Ensure that the PI_Server library is linked in when building statically
 #include "tao/PI_Server/PI_Server.h"
-#include "orbsvcs/CosNamingC.h"
 #include <iostream>
 #include <fstream>
 #include <fstream>
diff --git a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc
index d7526631b02..6c9f86ccd66 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/PICurrent/PICurrent.mpc
@@ -1,19 +1,40 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, pi_server, namingexe {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, pi_server {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     ServerInitializer.cpp
     ServerInterceptor.cpp
     MessengerServer.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(*Client): taoexe, pi, namingexe, interceptors {
+project(*Client): taoclient, pi, interceptors {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
     ClientInitializer.cpp
     ClientInterceptor.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }
diff --git a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc
index 1a7e839618b..654ada76322 100644
--- a/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc
+++ b/TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/SimpleCode.mpc
@@ -1,19 +1,40 @@
 // $Id$
 
-project(*Server): taoexe, portableserver, pi_server, avoids_minimum_corba {
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Messenger.idl
+  }
+  custom_only = 1
+}
+
+project(*Server): taoserver, pi_server, avoids_minimum_corba {
+  exename = MessengerServer
+  after += *idl
   Source_Files {
     Messenger_i.cpp
     ServerInitializer.cpp
     ServerInterceptor.cpp
     MessengerServer.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+    MessengerS.cpp
+  }
+  IDL_Files {
+  }
 }
 
-project(*Client): taoexe, pi, avoids_minimum_corba, interceptors {
+project(*Client): taoclient, pi, avoids_minimum_corba, interceptors {
+  exename = MessengerClient
+  after += *idl
   Source_Files {
-    MessengerC.cpp
     MessengerClient.cpp
     ClientInitializer.cpp
     ClientInterceptor.cpp
   }
+  Source_Files {
+    MessengerC.cpp
+  }
+  IDL_Files {
+  }
 }