ChangeLogTag: Fri Jan 5 06:54:42 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com>

4 files changed, 144 insertions, 0 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 264935afbfd..0e41a561eb8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Fri Jan  5 06:54:42 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * configure.ac:
+
+          Configure Makefiles for new subdirectory.
+
+        * tests/Portable_Interceptors/Makefile.am:
+
+          Regenerate to descend into Redirection subdirectory.
+
+        * tests/Portable_Interceptors/Redirection/Makefile.am:
+
+          New Makefile.am.
+
 Fri Jan  5 06:51:11 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * configure.ac:
diff --git a/TAO/configure.ac b/TAO/configure.ac
index 9f523ce42d0..18e2e4491e2 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -802,6 +802,7 @@ if test $tao_build_tests = yes; then
     tests/Portable_Interceptors/Processing_Mode_Policy/Makefile
     tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Makefile
     tests/Portable_Interceptors/Recursive_ORBInitializer/Makefile
+    tests/Portable_Interceptors/Redirection/Makefile
     tests/Portable_Interceptors/Register_Initial_References/Makefile
     tests/Portable_Interceptors/Request_Interceptor_Flow/Makefile
     tests/Portable_Interceptors/Service_Context_Manipulation/Makefile
diff --git a/TAO/tests/Portable_Interceptors/Makefile.am b/TAO/tests/Portable_Interceptors/Makefile.am
index e530d97271e..bd17fa3898d 100644
--- a/TAO/tests/Portable_Interceptors/Makefile.am
+++ b/TAO/tests/Portable_Interceptors/Makefile.am
@@ -26,6 +26,7 @@ SUBDIRS = \
         PolicyFactory \
         Processing_Mode_Policy \
         Recursive_ORBInitializer \
+        Redirection \
         Register_Initial_References \
         Request_Interceptor_Flow \
         Service_Context_Manipulation \
diff --git a/TAO/tests/Portable_Interceptors/Redirection/Makefile.am b/TAO/tests/Portable_Interceptors/Redirection/Makefile.am
new file mode 100644
index 00000000000..658dfa945ad
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/Redirection/Makefile.am
@@ -0,0 +1,128 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
+TAO_IDLFLAGS = -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)
+
+noinst_PROGRAMS =
+
+## Makefile.PI_Redirection_Idl.am
+
+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) -Sa -St $(srcdir)/test.idl
+	@touch $@
+
+noinst_HEADERS = \
+  test.idl
+
+## Makefile.PI_Redirection_Client.am
+
+if BUILD_EXCEPTIONS
+if BUILD_INTERCEPTORS
+
+noinst_PROGRAMS += client
+
+client_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+client_SOURCES = \
+  Client_ORBInitializer.cpp \
+  Client_Request_Interceptor.cpp \
+  client.cpp \
+  testC.cpp \
+  Client_ORBInitializer.h \
+  Client_Request_Interceptor.h
+
+client_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_INTERCEPTORS
+endif BUILD_EXCEPTIONS
+
+## Makefile.PI_Redirection_Server.am
+
+if BUILD_EXCEPTIONS
+if BUILD_INTERCEPTORS
+
+noinst_PROGRAMS += server
+
+server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+server_SOURCES = \
+  CrashPoint.cpp \
+  Server_ORBInitializer.cpp \
+  Server_Request_Interceptor.cpp \
+  server.cpp \
+  testC.cpp \
+  testS.cpp \
+  test_i.cpp \
+  CrashPoint.h \
+  Server_ORBInitializer.h \
+  Server_Request_Interceptor.h \
+  test_i.h
+
+server_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
+  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
+  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_INTERCEPTORS
+endif BUILD_EXCEPTIONS
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB