ChangeLogTag: Thu Dec 29 11:43:02 2005 J.T. Conklin <jtc@acorntoolworks.com>

6 files changed, 144 insertions, 193 deletions

diff --git a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
index 131fa143ce3..3172a2ddd7f 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
@@ -1,21 +1,38 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults, ami {
+  IDL_Files {
+    Web_Server.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): messaging, taoserver, ami, namingexe {
+  exename = server
+  after += *IDL
   avoids += ace_for_tao
   Source_Files {
     Content_Iterator_i.cpp
     Iterator_Factory_i.cpp
     server.cpp
+    Web_ServerS.cpp
+    Web_ServerC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Client): messaging, taoserver, ami, namingexe {
   exename = client
-  after += *Server
+  after += *IDL
   avoids += ace_for_tao
   Source_Files {
     client.cpp
     Iterator_Handler.cpp
+    Web_ServerS.cpp
+    Web_ServerC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Makefile.am b/TAO/examples/Content_Server/AMI_Iterator/Makefile.am
index 171be5b4057..190eecba38d 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Makefile.am
+++ b/TAO/examples/Content_Server/AMI_Iterator/Makefile.am
@@ -16,17 +16,14 @@ 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)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.AMI_Iterator_Server.am
+## Makefile.AMI_Iterator_IDL.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   Web_ServerC.cpp \
   Web_ServerC.h \
   Web_ServerC.inl \
@@ -37,7 +34,7 @@ BUILT_SOURCES += \
   Web_ServerS_T.h \
   Web_ServerS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Web_Server-stamp \
   Web_ServerC.cpp \
   Web_ServerC.h \
@@ -52,12 +49,22 @@ CLEANFILES += \
 Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp
 
 Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Web_Server.idl
 	@touch $@
 
-noinst_PROGRAMS += server
 
-server_CPPFLAGS = \
+endif BUILD_CORBA_MESSAGING
+endif BUILD_AMI
+
+## Makefile.AMI_Iterator_Client.am
+
+if BUILD_AMI
+if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
+
+client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
@@ -65,21 +72,14 @@ server_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs
 
-server_SOURCES = \
-  Content_Iterator_i.cpp \
-  Iterator_Factory_i.cpp \
+client_SOURCES = \
+  Iterator_Handler.cpp \
   Web_ServerC.cpp \
   Web_ServerS.cpp \
-  server.cpp \
-  Content_Iterator_i.h \
-  Iterator_Factory_i.h \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.h \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
+  client.cpp \
+  Iterator_Handler.h
 
-server_LDADD = \
+client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
@@ -94,44 +94,15 @@ endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
-## Makefile.AMI_Iterator_Client.am
+## Makefile.AMI_Iterator_Server.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 if !BUILD_ACE_FOR_TAO
 
-BUILT_SOURCES += \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl \
-  Web_ServerS_T.cpp \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
-
-CLEANFILES += \
-  Web_Server-stamp \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.cpp \
-  Web_ServerS.h \
-  Web_ServerS.inl \
-  Web_ServerS_T.cpp \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
-
-Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp
-
-Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl
-	@touch $@
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS += server
 
-client_CPPFLAGS = \
+server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
@@ -139,19 +110,16 @@ client_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs
 
-client_SOURCES = \
-  Iterator_Handler.cpp \
+server_SOURCES = \
+  Content_Iterator_i.cpp \
+  Iterator_Factory_i.cpp \
   Web_ServerC.cpp \
   Web_ServerS.cpp \
-  client.cpp \
-  Iterator_Handler.h \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.h \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
+  server.cpp \
+  Content_Iterator_i.h \
+  Iterator_Factory_i.h
 
-client_LDADD = \
+server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
diff --git a/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
index f90c6ae59e6..9ebc2e75c6c 100644
--- a/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
+++ b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
@@ -1,22 +1,39 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults, ami {
+  IDL_Files {
+    Push_Web_Server.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): messaging, taoserver, ami, namingexe {
+  exename = server
+  after += *IDL
   avoids += ace_for_tao
   Source_Files {
     Callback_Handler.cpp
     Push_Iterator_Factory_i.cpp
     server.cpp
+    Push_Web_ServerS.cpp
+    Push_Web_ServerC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Client): messaging, taoserver, ami, namingexe {
   exename = client
-  after += *Server
+  after += *IDL
   avoids += ace_for_tao
   Source_Files {
     client.cpp
     Callback_i.cpp
     Push_Iterator_Handler.cpp
+    Push_Web_ServerS.cpp
+    Push_Web_ServerC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/examples/Content_Server/AMI_Observer/Makefile.am b/TAO/examples/Content_Server/AMI_Observer/Makefile.am
index 20f6993e832..e89ce05aec2 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Makefile.am
+++ b/TAO/examples/Content_Server/AMI_Observer/Makefile.am
@@ -16,17 +16,14 @@ 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)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.AMI_Observer_Server.am
+## Makefile.AMI_Observer_IDL.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   Push_Web_ServerC.cpp \
   Push_Web_ServerC.h \
   Push_Web_ServerC.inl \
@@ -37,7 +34,7 @@ BUILT_SOURCES += \
   Push_Web_ServerS_T.h \
   Push_Web_ServerS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Push_Web_Server-stamp \
   Push_Web_ServerC.cpp \
   Push_Web_ServerC.h \
@@ -52,12 +49,22 @@ CLEANFILES += \
 Push_Web_ServerC.cpp Push_Web_ServerC.h Push_Web_ServerC.inl Push_Web_ServerS.cpp Push_Web_ServerS.h Push_Web_ServerS.inl Push_Web_ServerS_T.cpp Push_Web_ServerS_T.h Push_Web_ServerS_T.inl: Push_Web_Server-stamp
 
 Push_Web_Server-stamp: $(srcdir)/Push_Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(srcdir)/Push_Web_Server.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Push_Web_Server.idl
 	@touch $@
 
-noinst_PROGRAMS += server
 
-server_CPPFLAGS = \
+endif BUILD_CORBA_MESSAGING
+endif BUILD_AMI
+
+## Makefile.AMI_Observer_Client.am
+
+if BUILD_AMI
+if BUILD_CORBA_MESSAGING
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
+
+client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
@@ -65,21 +72,16 @@ server_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs
 
-server_SOURCES = \
-  Callback_Handler.cpp \
-  Push_Iterator_Factory_i.cpp \
+client_SOURCES = \
+  Callback_i.cpp \
+  Push_Iterator_Handler.cpp \
   Push_Web_ServerC.cpp \
   Push_Web_ServerS.cpp \
-  server.cpp \
-  Callback_Handler.h \
-  Push_Iterator_Factory_i.h \
-  Push_Web_ServerC.h \
-  Push_Web_ServerC.inl \
-  Push_Web_ServerS.h \
-  Push_Web_ServerS_T.h \
-  Push_Web_ServerS_T.inl
+  client.cpp \
+  Callback_i.h \
+  Push_Iterator_Handler.h
 
-server_LDADD = \
+client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
@@ -94,44 +96,15 @@ endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
-## Makefile.AMI_Observer_Client.am
+## Makefile.AMI_Observer_Server.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 if !BUILD_ACE_FOR_TAO
 
-BUILT_SOURCES += \
-  Push_Web_ServerC.cpp \
-  Push_Web_ServerC.h \
-  Push_Web_ServerC.inl \
-  Push_Web_ServerS.cpp \
-  Push_Web_ServerS.h \
-  Push_Web_ServerS.inl \
-  Push_Web_ServerS_T.cpp \
-  Push_Web_ServerS_T.h \
-  Push_Web_ServerS_T.inl
-
-CLEANFILES += \
-  Push_Web_Server-stamp \
-  Push_Web_ServerC.cpp \
-  Push_Web_ServerC.h \
-  Push_Web_ServerC.inl \
-  Push_Web_ServerS.cpp \
-  Push_Web_ServerS.h \
-  Push_Web_ServerS.inl \
-  Push_Web_ServerS_T.cpp \
-  Push_Web_ServerS_T.h \
-  Push_Web_ServerS_T.inl
-
-Push_Web_ServerC.cpp Push_Web_ServerC.h Push_Web_ServerC.inl Push_Web_ServerS.cpp Push_Web_ServerS.h Push_Web_ServerS.inl Push_Web_ServerS_T.cpp Push_Web_ServerS_T.h Push_Web_ServerS_T.inl: Push_Web_Server-stamp
-
-Push_Web_Server-stamp: $(srcdir)/Push_Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(srcdir)/Push_Web_Server.idl
-	@touch $@
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS += server
 
-client_CPPFLAGS = \
+server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
@@ -139,21 +112,16 @@ client_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs
 
-client_SOURCES = \
-  Callback_i.cpp \
-  Push_Iterator_Handler.cpp \
+server_SOURCES = \
+  Callback_Handler.cpp \
+  Push_Iterator_Factory_i.cpp \
   Push_Web_ServerC.cpp \
   Push_Web_ServerS.cpp \
-  client.cpp \
-  Callback_i.h \
-  Push_Iterator_Handler.h \
-  Push_Web_ServerC.h \
-  Push_Web_ServerC.inl \
-  Push_Web_ServerS.h \
-  Push_Web_ServerS_T.h \
-  Push_Web_ServerS_T.inl
+  server.cpp \
+  Callback_Handler.h \
+  Push_Iterator_Factory_i.h
 
-client_LDADD = \
+server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am
index be09e24a314..9d8a8908302 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am
+++ b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am
@@ -16,15 +16,11 @@ 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)
 
-CLEANFILES =
 noinst_PROGRAMS =
-BUILT_SOURCES =
 
-## Makefile.SMI_Iterator_Server.am
-
-if !BUILD_ACE_FOR_TAO
+## Makefile.SMI_Iterator_IDL.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   Web_ServerC.cpp \
   Web_ServerC.h \
   Web_ServerC.inl \
@@ -35,7 +31,7 @@ BUILT_SOURCES += \
   Web_ServerS_T.h \
   Web_ServerS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Web_Server-stamp \
   Web_ServerC.cpp \
   Web_ServerC.h \
@@ -50,12 +46,17 @@ CLEANFILES += \
 Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.cpp Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp
 
 Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Web_Server.idl
 	@touch $@
 
-noinst_PROGRAMS += server
 
-server_CPPFLAGS = \
+## Makefile.SMI_Iterator_Client.am
+
+if !BUILD_ACE_FOR_TAO
+
+noinst_PROGRAMS += client
+
+client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
@@ -63,22 +64,13 @@ server_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs
 
-server_SOURCES = \
-  Content_Iterator_i.cpp \
-  Iterator_Factory_i.cpp \
+client_SOURCES = \
   Web_ServerC.cpp \
-  Web_ServerS.cpp \
-  server.cpp \
+  client.cpp \
   Content_Iterator_i.h \
-  Iterator_Factory_i.h \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.h \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
+  Iterator_Factory_i.h
 
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
@@ -86,40 +78,13 @@ server_LDADD = \
 
 endif !BUILD_ACE_FOR_TAO
 
-## Makefile.SMI_Iterator_Client.am
+## Makefile.SMI_Iterator_Server.am
 
 if !BUILD_ACE_FOR_TAO
 
-BUILT_SOURCES += \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.h \
-  Web_ServerS.inl \
-  Web_ServerS_T.cpp \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
-
-CLEANFILES += \
-  Web_Server-stamp \
-  Web_ServerC.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.h \
-  Web_ServerS.inl \
-  Web_ServerS_T.cpp \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
-
-Web_ServerC.cpp Web_ServerC.h Web_ServerC.inl Web_ServerS.h Web_ServerS.inl Web_ServerS_T.cpp Web_ServerS_T.h Web_ServerS_T.inl: Web_Server-stamp
-
-Web_Server-stamp: $(srcdir)/Web_Server.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl
-	@touch $@
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS += server
 
-client_CPPFLAGS = \
+server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
@@ -127,16 +92,17 @@ client_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs
 
-client_SOURCES = \
+server_SOURCES = \
+  Content_Iterator_i.cpp \
+  Iterator_Factory_i.cpp \
   Web_ServerC.cpp \
-  client.cpp \
-  Web_ServerC.h \
-  Web_ServerC.inl \
-  Web_ServerS.h \
-  Web_ServerS_T.h \
-  Web_ServerS_T.inl
+  Web_ServerS.cpp \
+  server.cpp \
+  Content_Iterator_i.h \
+  Iterator_Factory_i.h
 
-client_LDADD = \
+server_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 \
diff --git a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
index 14996eef97a..4675543c102 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
@@ -1,21 +1,36 @@
 // -*- MPC -*-
 // $Id$
 
+project(*IDL): taoidldefaults {
+  IDL_Files {
+    Web_Server.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): namingexe, portableserver {
+  exename = server
+  after += *IDL
   avoids += ace_for_tao
   Source_Files {
     Content_Iterator_i.cpp
     Iterator_Factory_i.cpp
     server.cpp
+    Web_ServerS.cpp
+    Web_ServerC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Client): namingexe {
-  after += *Server
+  exename = client
+  after += *IDL
   avoids += ace_for_tao
   Source_Files {
     Web_ServerC.cpp
     client.cpp
   }
+  IDL_Files {
+  }
 }
-