ChangeLogTag: Thu Oct 6 10:03:16 2005 J.T. Conklin <jtc@acorntoolworks.com>

14 files changed, 135 insertions, 203 deletions

diff --git a/TAO/docs/tutorials/Quoter/AMI/Makefile.am b/TAO/docs/tutorials/Quoter/AMI/Makefile.am
index 54024668ba5..278a4547b9f 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/AMI/Makefile.am
@@ -15,17 +15,14 @@ TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_
 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.Quoter_AMI_Client.am
+## Makefile.Quoter_AMI_Idl.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   QuoterC.cpp \
   QuoterC.h \
   QuoterC.inl \
@@ -36,7 +33,7 @@ BUILT_SOURCES += \
   QuoterS_T.h \
   QuoterS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Quoter-stamp \
   QuoterC.cpp \
   QuoterC.h \
@@ -54,6 +51,16 @@ Quoter-stamp: $(srcdir)/Quoter.idl
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Quoter.idl
 	@touch $@
 
+
+endif BUILD_CORBA_MESSAGING
+endif BUILD_AMI
+
+## Makefile.Quoter_AMI_Client.am
+
+if BUILD_AMI
+if BUILD_CORBA_MESSAGING
+if BUILD_EXCEPTIONS
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -67,12 +74,7 @@ client_SOURCES = \
   QuoterC.cpp \
   QuoterS.cpp \
   client.cpp \
-  Handler_i.h \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.h \
-  QuoterS_T.h \
-  QuoterS_T.inl
+  Handler_i.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -94,35 +96,6 @@ if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 
-BUILT_SOURCES += \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-CLEANFILES += \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Quoter.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -137,11 +110,6 @@ server_SOURCES = \
   Stock_Factory_i.cpp \
   Stock_i.cpp \
   server.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.h \
-  QuoterS_T.h \
-  QuoterS_T.inl \
   Stock_Factory_i.h \
   Stock_i.h
 
diff --git a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
index 3cb7b9dcc3b..b19033fbef3 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
+++ b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc
@@ -1,18 +1,34 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults, ami {
+  IDL_Files {
+    Quoter.idl
+  }
+  custom_only = 1
+}
+
 project(*client) : taoexe, portableserver, ami, exceptions  {
-  requires += exceptions
+  after += *idl
   source_files {
     client.cpp
     Handler_i.cpp
+    QuoterS.cpp
+    QuoterC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*server) : taoserver, ami, exceptions {
+  after += *idl
   source_files {
     server.cpp
     Stock_Factory_i.cpp
     Stock_i.cpp
+    QuoterS.cpp
+    QuoterC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am
index 4e34f9f70eb..64e4b2c3a71 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am
@@ -15,16 +15,11 @@ TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_
 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.Quoter_Event_Service_Client.am
-
-if BUILD_EXCEPTIONS
-if !BUILD_MINIMUM_CORBA
+## Makefile.Quoter_Event_Service_Idl.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   QuoterC.cpp \
   QuoterC.h \
   QuoterC.inl \
@@ -35,7 +30,7 @@ BUILT_SOURCES += \
   QuoterS_T.h \
   QuoterS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Quoter-stamp \
   QuoterC.cpp \
   QuoterC.h \
@@ -50,9 +45,15 @@ CLEANFILES += \
 QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp
 
 Quoter-stamp: $(srcdir)/Quoter.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Quoter.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Quoter.idl
 	@touch $@
 
+
+## Makefile.Quoter_Event_Service_Client.am
+
+if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -66,14 +67,8 @@ client_CPPFLAGS = \
 
 client_SOURCES = \
   QuoterC.cpp \
-  QuoterS.cpp \
   Stock_Consumer.cpp \
   client.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.h \
-  QuoterS_T.h \
-  QuoterS_T.inl \
   Stock_Consumer.h
 
 client_LDADD = \
@@ -93,35 +88,6 @@ endif BUILD_EXCEPTIONS
 if BUILD_EXCEPTIONS
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES += \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-CLEANFILES += \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Quoter.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -139,11 +105,6 @@ server_SOURCES = \
   Stock_Factory_i.cpp \
   Stock_i.cpp \
   server.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.h \
-  QuoterS_T.h \
-  QuoterS_T.inl \
   Stock_Factory_i.h \
   Stock_i.h
 
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
index 9dc94002fd8..496b8506ce0 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc
@@ -1,17 +1,33 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl) : taoidldefaults {
+  IDL_Files {
+    Quoter.idl
+  }
+  custom_only = 1
+}
+
 project(*client) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba, exceptions {
+  after += *idl
   source_files {
     client.cpp
     Stock_Consumer.cpp
+    QuoterC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*server) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba, exceptions {
+  after += *idl
   source_files {
     server.cpp
     Stock_Factory_i.cpp
     Stock_i.cpp
+    QuoterS.cpp
+    QuoterC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am
index fff64bb2c06..3fc227750ee 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Makefile.am
@@ -28,7 +28,8 @@ client_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../idl
+  -I$(srcdir)/../idl \
+  -I../idl
 
 client_SOURCES = \
   client.cpp \
@@ -58,7 +59,8 @@ server_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../idl
+  -I$(srcdir)/../idl \
+  -I../idl
 
 server_SOURCES = \
   Stock_Factory_i.cpp \
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am
index 39cb80e28e1..7a34dc7ad89 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am
@@ -15,18 +15,14 @@ TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_
 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.Quoter_On_Demand_Activation_Client.am
+## Makefile.Quoter_On_Demand_Activation_Idl.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   QuoterC.cpp \
   QuoterC.h \
   QuoterC.inl \
@@ -37,7 +33,7 @@ BUILT_SOURCES += \
   QuoterS_T.h \
   QuoterS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Quoter-stamp \
   QuoterC.cpp \
   QuoterC.h \
@@ -52,9 +48,20 @@ CLEANFILES += \
 QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp
 
 Quoter-stamp: $(srcdir)/Quoter.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC $(srcdir)/Quoter.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Quoter.idl
 	@touch $@
 
+
+endif BUILD_CORBA_MESSAGING
+endif BUILD_AMI
+
+## Makefile.Quoter_On_Demand_Activation_Client.am
+
+if BUILD_AMI
+if BUILD_CORBA_MESSAGING
+if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -70,12 +77,7 @@ client_SOURCES = \
   QuoterC.cpp \
   QuoterS.cpp \
   client.cpp \
-  Handler_i.h \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.h \
-  QuoterS_T.h \
-  QuoterS_T.inl
+  Handler_i.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -100,35 +102,6 @@ if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES += \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-CLEANFILES += \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC $(srcdir)/Quoter.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -146,11 +119,6 @@ server_SOURCES = \
   Stock_Factory_i.cpp \
   Stock_i.cpp \
   server.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.h \
-  QuoterS_T.h \
-  QuoterS_T.inl \
   Stock_Factory_Locator_i.h \
   Stock_Factory_i.h \
   Stock_i.h
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
index f03c0f6733d..650bdc9d832 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
@@ -1,18 +1,35 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults, ami {
+  IDL_Files {
+    Quoter.idl
+  }
+  custom_only = 1
+}
+
 project(*client) : taoexe, portableserver, naming, ami, minimum_corba, exceptions  {
+  after += *idl
   source_files {
     client.cpp
     Handler_i.cpp
+    QuoterS.cpp
+    QuoterC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*server) : taoserver, naming, ami, minimum_corba, exceptions {
+  after += *idl
   source_files {
     server.cpp
     Stock_Factory_i.cpp
     Stock_i.cpp
     Stock_Factory_Locator_i.cpp
+    QuoterS.cpp
+    QuoterC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
index 6c17230f6a5..371a4583a6b 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
@@ -15,17 +15,11 @@ TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_
 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.Quoter_RT_Event_Service_Client.am
-
-if BUILD_CORBA_MESSAGING
-if BUILD_EXCEPTIONS
-if !BUILD_MINIMUM_CORBA
+## Makefile.Quoter_RT_Event_Service_Idl.am
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   QuoterC.cpp \
   QuoterC.h \
   QuoterC.inl \
@@ -36,7 +30,7 @@ BUILT_SOURCES += \
   QuoterS_T.h \
   QuoterS_T.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Quoter-stamp \
   QuoterC.cpp \
   QuoterC.h \
@@ -51,9 +45,16 @@ CLEANFILES += \
 QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp
 
 Quoter-stamp: $(srcdir)/Quoter.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Quoter.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Quoter.idl
 	@touch $@
 
+
+## Makefile.Quoter_RT_Event_Service_Client.am
+
+if BUILD_CORBA_MESSAGING
+if BUILD_EXCEPTIONS
+if !BUILD_MINIMUM_CORBA
+
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -66,14 +67,8 @@ client_CPPFLAGS = \
 
 client_SOURCES = \
   QuoterC.cpp \
-  QuoterS.cpp \
   Stock_Consumer.cpp \
   client.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.h \
-  QuoterS_T.h \
-  QuoterS_T.inl \
   Stock_Consumer.h
 
 client_LDADD = \
@@ -101,35 +96,6 @@ if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES += \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-CLEANFILES += \
-  Quoter-stamp \
-  QuoterC.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.cpp \
-  QuoterS.h \
-  QuoterS.inl \
-  QuoterS_T.cpp \
-  QuoterS_T.h \
-  QuoterS_T.inl
-
-QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp
-
-Quoter-stamp: $(srcdir)/Quoter.idl
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Quoter.idl
-	@touch $@
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -146,11 +112,6 @@ server_SOURCES = \
   Stock_Factory_i.cpp \
   Stock_i.cpp \
   server.cpp \
-  QuoterC.h \
-  QuoterC.inl \
-  QuoterS.h \
-  QuoterS_T.h \
-  QuoterS_T.inl \
   Stock_Factory_i.h \
   Stock_i.h
 
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
index f4b466e58be..3c466c42860 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
@@ -1,17 +1,33 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults {
+  IDL_Files {
+    Quoter.idl
+  }
+  custom_only = 1
+}
+
 project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, minimum_corba, exceptions {
+  after += *idl
   source_files {
     client.cpp
     Stock_Consumer.cpp
+    QuoterC.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*server) : orbsvcsexe, portableserver, rtevent_serv, naming, minimum_corba, exceptions {
+  after += *idl
   source_files {
     server.cpp
     Stock_Factory_i.cpp
     Stock_i.cpp
+    QuoterS.cpp
+    QuoterC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Client/Makefile.am
index 4ff8aca7739..0bfcfd867b2 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/Makefile.am
@@ -25,7 +25,8 @@ client_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../../idl
+  -I$(srcdir)/../../idl \
+  -I../../idl
 
 client_SOURCES = \
   client.cpp
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am
index cd9d9872a5f..a1e084fad23 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Makefile.am
@@ -29,7 +29,8 @@ client_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../../idl
+  -I$(srcdir)/../../idl \
+  -I../../idl
 
 client_SOURCES = \
   client.cpp \
@@ -67,7 +68,8 @@ server_CPPFLAGS = \
   -I$(TAO_BUILDDIR) \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
-  -I$(srcdir)/../../idl
+  -I$(srcdir)/../../idl \
+  -I../../idl
 
 server_SOURCES = \
   Stock_Factory_i.cpp \
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am
index e2b00e19c1d..0b5fae765c3 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am
@@ -26,7 +26,8 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../../idl
+  -I$(srcdir)/../../idl \
+  -I../../idl
 
 server_SOURCES = \
   Stock_Factory_i.cpp \
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am
index 42a642b6c50..cb841195769 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Makefile.am
@@ -26,7 +26,8 @@ client_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../../idl
+  -I$(srcdir)/../../idl \
+  -I../../idl
 
 client_SOURCES = \
   client.cpp \
@@ -53,7 +54,8 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../../idl
+  -I$(srcdir)/../../idl \
+  -I../../idl
 
 server_SOURCES = \
   Stock_Factory_i.cpp \
diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/Server/Makefile.am
index 83ffed4c2bd..5500cfaa35d 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Makefile.am
@@ -25,7 +25,8 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../../idl
+  -I$(srcdir)/../../idl \
+  -I../../idl
 
 server_SOURCES = \
   Stock_Factory_i.cpp \