ChangeLogTag: Fri Jan 6 01:57:00 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

3 files changed, 36 insertions, 90 deletions

diff --git a/TAO/examples/ior_corbaloc/Makefile.am b/TAO/examples/ior_corbaloc/Makefile.am
index 45f9cfb65a5..44351704969 100644
--- a/TAO/examples/ior_corbaloc/Makefile.am
+++ b/TAO/examples/ior_corbaloc/Makefile.am
@@ -16,7 +16,7 @@ TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
 TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
 TAO_ROOT = $(top_srcdir)
 
-## Makefile.ior_corbaloc_client.am
+## Makefile.ior_corbaloc_IDL.am
 
 BUILT_SOURCES = \
   corbalocC.cpp \
@@ -44,9 +44,12 @@ CLEANFILES = \
 corbalocC.cpp corbalocC.h corbalocC.inl corbalocS.cpp corbalocS.h corbalocS.inl corbalocS_T.cpp corbalocS_T.h corbalocS_T.inl: corbaloc-stamp
 
 corbaloc-stamp: $(srcdir)/corbaloc.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/corbaloc.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/corbaloc.idl
 	@touch $@
 
+
+## Makefile.ior_corbaloc_client.am
+
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -60,17 +63,10 @@ client_CPPFLAGS = \
 client_SOURCES = \
   client.cpp \
   corbalocC.cpp \
-  corbalocS.cpp \
   ior_corbaloc_client_i.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.h \
-  corbalocS_T.h \
-  corbalocS_T.inl \
   ior_corbaloc_client_i.h
 
 client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
@@ -78,95 +74,26 @@ client_LDADD = \
 
 ## Makefile.ior_corbaloc_corbaname_client.am
 
-BUILT_SOURCES += \
-  corbalocC.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.cpp \
-  corbalocS.h \
-  corbalocS.inl \
-  corbalocS_T.cpp \
-  corbalocS_T.h \
-  corbalocS_T.inl
-
-CLEANFILES += \
-  corbaloc-stamp \
-  corbalocC.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.cpp \
-  corbalocS.h \
-  corbalocS.inl \
-  corbalocS_T.cpp \
-  corbalocS_T.h \
-  corbalocS_T.inl
-
-corbalocC.cpp corbalocC.h corbalocC.inl corbalocS.cpp corbalocS.h corbalocS.inl corbalocS_T.cpp corbalocS_T.h corbalocS_T.inl: corbaloc-stamp
-
-corbaloc-stamp: $(srcdir)/corbaloc.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/corbaloc.idl
-	@touch $@
-
 noinst_PROGRAMS += corbaname_client
 
 corbaname_client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_BUILDDIR)
 
 corbaname_client_SOURCES = \
   corbalocC.cpp \
-  corbalocS.cpp \
   corbaname_client.cpp \
-  status_i.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.h \
-  corbalocS_T.h \
-  corbalocS_T.inl \
+  ior_corbaloc_client_i.h \
   status_i.h
 
 corbaname_client_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 ## Makefile.ior_corbaloc_server.am
 
-BUILT_SOURCES += \
-  corbalocC.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.cpp \
-  corbalocS.h \
-  corbalocS.inl \
-  corbalocS_T.cpp \
-  corbalocS_T.h \
-  corbalocS_T.inl
-
-CLEANFILES += \
-  corbaloc-stamp \
-  corbalocC.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.cpp \
-  corbalocS.h \
-  corbalocS.inl \
-  corbalocS_T.cpp \
-  corbalocS_T.h \
-  corbalocS_T.inl
-
-corbalocC.cpp corbalocC.h corbalocC.inl corbalocS.cpp corbalocS.h corbalocS.inl corbalocS_T.cpp corbalocS_T.h corbalocS_T.inl: corbaloc-stamp
-
-corbaloc-stamp: $(srcdir)/corbaloc.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/corbaloc.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -182,11 +109,6 @@ server_SOURCES = \
   corbalocS.cpp \
   server.cpp \
   status_i.cpp \
-  corbalocC.h \
-  corbalocC.inl \
-  corbalocS.h \
-  corbalocS_T.h \
-  corbalocS_T.inl \
   status_i.h
 
 server_LDADD = \
diff --git a/TAO/examples/ior_corbaloc/corbaname_client.cpp b/TAO/examples/ior_corbaloc/corbaname_client.cpp
index 950f6ef7922..80c352cb9fa 100644
--- a/TAO/examples/ior_corbaloc/corbaname_client.cpp
+++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp
@@ -12,7 +12,7 @@
  */
 //=============================================================================
 
-#include "ior_corbaloc_client_i.h"
+#include "corbalocC.h"
 #include "ace/Log_Msg.h"
 
 int main (int argc, char *argv [])
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
index e461065f445..84647e7b5a1 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
@@ -1,24 +1,48 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    corbaloc.idl
+  }
+  custom_only = 1
+}
+
 project(*server): namingexe, portableserver {
+  exename = server
+
+  after += *IDL
   Source_Files {
     status_i.cpp
     server.cpp
+    corbalocS.cpp
+    corbalocC.cpp
+  }
+  IDL_Files {
   }
 }
 
-project(*client): namingexe, portableserver {
+project(*client): namingexe {
+  exename = client
+
+  after += *IDL
   Source_Files {
     ior_corbaloc_client_i.cpp
     client.cpp
+    corbalocC.cpp
+  }
+  IDL_Files {
   }
 }
 
-project(*corbaname client): namingexe, portableserver {
+project(*corbaname client): taoclient {
+  exename = corbaname_client
+
+  after += *IDL
   Source_Files {
-    status_i.cpp
     corbaname_client.cpp
+    corbalocC.cpp
+  }
+  IDL_Files {
   }
 }
-