2 files changed, 40 insertions, 66 deletions

diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
index a4156b9a83f..5fb820f88c7 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
@@ -1,10 +1,22 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults, ami {
+  IDL_Files {
+    Test.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): taoserver, ami {
+  after += *idl
   Source_Files {
     AMI_Buffering.cpp
     server.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
 
@@ -15,6 +27,10 @@ project(*Client): taoserver, ami {
     Client_Task.cpp
     Reply_Handler.cpp
     client.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
 
@@ -24,5 +40,9 @@ project(*Admin): taoserver, ami {
   Source_Files {
     AMI_Buffering_Admin.cpp
     admin.cpp
+    TestS.cpp
+    TestC.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/tests/AMI_Buffering/Makefile.am b/TAO/tests/AMI_Buffering/Makefile.am
index 31f7ee69e54..68d320afe30 100644
--- a/TAO/tests/AMI_Buffering/Makefile.am
+++ b/TAO/tests/AMI_Buffering/Makefile.am
@@ -17,16 +17,14 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T
 TAO_ROOT = $(top_srcdir)
 
 noinst_PROGRAMS =
-CLEANFILES =
-BUILT_SOURCES =
 
-## Makefile.AMI_Buffering_Server.am
+## Makefile.AMI_Buffering_Idl.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
   TestC.inl \
@@ -34,7 +32,7 @@ BUILT_SOURCES += \
   TestS.h \
   TestS.inl
 
-CLEANFILES += \
+CLEANFILES = \
   Test-stamp \
   TestC.cpp \
   TestC.h \
@@ -49,6 +47,20 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
 	@touch $@
 
+
+noinst_HEADERS = \
+  Test.idl
+
+endif BUILD_EXCEPTIONS
+endif BUILD_CORBA_MESSAGING
+endif BUILD_AMI
+
+## Makefile.AMI_Buffering_Server.am
+
+if BUILD_AMI
+if BUILD_CORBA_MESSAGING
+if BUILD_EXCEPTIONS
+
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -62,11 +74,7 @@ server_SOURCES = \
   TestC.cpp \
   TestS.cpp \
   server.cpp \
-  AMI_Buffering.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
+  AMI_Buffering.h
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -88,29 +96,6 @@ if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -126,11 +111,7 @@ client_SOURCES = \
   TestS.cpp \
   client.cpp \
   Client_Task.h \
-  Reply_Handler.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
+  Reply_Handler.h
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -152,29 +133,6 @@ if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 
-BUILT_SOURCES += \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-CLEANFILES += \
-  Test-stamp \
-  TestC.cpp \
-  TestC.h \
-  TestC.inl \
-  TestS.cpp \
-  TestS.h \
-  TestS.inl
-
-TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp
-
-Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Test.idl
-	@touch $@
-
 noinst_PROGRAMS += admin
 
 admin_CPPFLAGS = \
@@ -188,11 +146,7 @@ admin_SOURCES = \
   TestC.cpp \
   TestS.cpp \
   admin.cpp \
-  AMI_Buffering_Admin.h \
-  TestC.h \
-  TestC.inl \
-  TestS.h \
-  TestS.inl
+  AMI_Buffering_Admin.h
 
 admin_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \