ChangeLogTag: Sat Dec 9 23:18:53 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 49 insertions, 50 deletions

diff --git a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
index f4f21ac3fb7..7bb66c7b450 100644
--- a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
+++ b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
@@ -1,14 +1,32 @@
 // -*- MPC -*-
 // $Id$
 
+project(*idl): taoidldefaults, ami {
+  IDL_Files {
+    AMI.idl
+  }
+  custom_only = 1
+}
+
 project(*Server): taoserver, iortable, ami {
+  after += *idl
   Source_Files {
     server.cpp
+    AMIC.cpp
+    AMIS.cpp
+  }
+  IDL_Files {
   }
 }
 
 project(*Client): taoclient, ami {
+  after += *idl
+  after += *Server
   Source_Files {
     client.cpp
+    AMIC.cpp
+    AMIS.cpp
+  }
+  IDL_Files {
   }
 }
diff --git a/TAO/tests/Bug_1869_Regression/Makefile.am b/TAO/tests/Bug_1869_Regression/Makefile.am
index d8edbfc872e..fbc0f98c13f 100644
--- a/TAO/tests/Bug_1869_Regression/Makefile.am
+++ b/TAO/tests/Bug_1869_Regression/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.Bug_1869_Regression_Client.am
+## Makefile.Bug_1869_Regression_Idl.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 
-BUILT_SOURCES += \
+BUILT_SOURCES = \
   AMIC.cpp \
   AMIC.h \
   AMIC.inl \
@@ -34,7 +32,7 @@ BUILT_SOURCES += \
   AMIS.h \
   AMIS.inl
 
-CLEANFILES += \
+CLEANFILES = \
   AMI-stamp \
   AMIC.cpp \
   AMIC.h \
@@ -49,29 +47,40 @@ AMI-stamp: $(srcdir)/AMI.idl $(TAO_IDL_DEP)
 	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/AMI.idl
 	@touch $@
 
-noinst_PROGRAMS += client
 
-client_CPPFLAGS = \
+noinst_HEADERS = \
+  AMI.idl
+
+endif BUILD_EXCEPTIONS
+endif BUILD_CORBA_MESSAGING
+endif BUILD_AMI
+
+## Makefile.Bug_1869_Regression_Server.am
+
+if BUILD_AMI
+if BUILD_CORBA_MESSAGING
+if BUILD_EXCEPTIONS
+
+noinst_PROGRAMS += server
+
+server_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-client_SOURCES = \
+server_SOURCES = \
   AMIC.cpp \
   AMIS.cpp \
-  client.cpp \
-  AMIC.h \
-  AMIC.inl \
-  AMIS.h \
-  AMIS.inl
+  server.cpp
 
-client_LDADD = \
+server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
@@ -80,59 +89,31 @@ endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
-## Makefile.Bug_1869_Regression_Server.am
+## Makefile.Bug_1869_Regression_Client.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
 
-BUILT_SOURCES += \
-  AMIC.cpp \
-  AMIC.h \
-  AMIC.inl \
-  AMIS.cpp \
-  AMIS.h \
-  AMIS.inl
-
-CLEANFILES += \
-  AMI-stamp \
-  AMIC.cpp \
-  AMIC.h \
-  AMIC.inl \
-  AMIS.cpp \
-  AMIS.h \
-  AMIS.inl
-
-AMIC.cpp AMIC.h AMIC.inl AMIS.cpp AMIS.h AMIS.inl: AMI-stamp
-
-AMI-stamp: $(srcdir)/AMI.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/AMI.idl
-	@touch $@
-
-noinst_PROGRAMS += server
+noinst_PROGRAMS += client
 
-server_CPPFLAGS = \
+client_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR)
 
-server_SOURCES = \
+client_SOURCES = \
   AMIC.cpp \
   AMIS.cpp \
-  server.cpp \
-  AMIC.h \
-  AMIC.inl \
-  AMIS.h \
-  AMIS.inl
+  client.cpp
 
-server_LDADD = \
+client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la