Checked these files into the CVS repository. These files are

part of the TAO+auto{conf,make}/libtool integration work. There are still some missing files and some of the above files need to be modified before they will work. I just wanted to get these files under CVS control so that I can easily recover from a mishap or for some reason beyond my control.
author: Ossama Othman <ossama-othman@users.noreply.github.com> 1999-04-07 20:22:42 +0000
committer: Ossama Othman <ossama-othman@users.noreply.github.com> 1999-04-07 20:22:42 +0000
commit: 90239344d42bdf5c22cdb2c4655febedf031cb5c (patch)
tree: 6be1dac3126b665bbef648289f7f5e062a68da46
parent: e8494c8bed7970087c16a0a296898bcf93f74e2e (diff)
download: ATCD-90239344d42bdf5c22cdb2c4655febedf031cb5c.tar.gz
52 files changed, 3283 insertions, 0 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 19feb1d2d06..a7c06e7def6 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,64 @@
+Wed Apr  7 15:13:23 1999  Ossama Othman  <othman@cs.wustl.edu>
+
+	* configure.in:
+	* tao-config.1.in:
+	* tao-config.in:
+	* taoConf.sh.in:
+	* Makefile.am:
+	* TAO_IDL/ast/Makefile.am:
+	* TAO_IDL/be/Makefile.am:
+	* TAO_IDL/be_include/Makefile.am:
+	* TAO_IDL/driver/Makefile.am:
+	* TAO_IDL/fe/Makefile.am:
+	* TAO_IDL/include/Makefile.am:
+	* TAO_IDL/narrow/Makefile.am:
+	* TAO_IDL/util/Makefile.am:
+	* TAO_IDL/Makefile.am:
+	* orbsvcs/Concurrency_Service/Makefile.am:
+	* orbsvcs/CosEvent_Service/Makefile.am:
+	* orbsvcs/Dump_Schedule/Makefile.am:
+	* orbsvcs/Event_Service/Makefile.am:
+	* orbsvcs/ImplRepo_Service/Makefile.am:
+	* orbsvcs/LifeCycle_Service/Makefile.am:
+	* orbsvcs/Logging_Service/Makefile.am:
+	* orbsvcs/Naming_Service/Makefile.am:
+	* orbsvcs/Scheduling_Service/Makefile.am:
+	* orbsvcs/Time_Service/Makefile.am:
+	* orbsvcs/Trading_Service/Makefile.am:
+	* orbsvcs/Makefile.am:
+	* orbsvcs/orbsvcs/AV/Makefile.am:
+	* orbsvcs/orbsvcs/Concurrency/Makefile.am:
+	* orbsvcs/orbsvcs/CosEvent/Makefile.am:
+	* orbsvcs/orbsvcs/Event/Makefile.am:
+	* orbsvcs/orbsvcs/Makefile.am:
+	* orbsvcs/orbsvcs/Log/Makefile.am:
+	* orbsvcs/orbsvcs/Naming/Makefile.am:
+	* orbsvcs/orbsvcs/Property/Makefile.am:
+	* orbsvcs/orbsvcs/Sched/Makefile.am:
+	* orbsvcs/orbsvcs/Time/Makefile.am:
+	* orbsvcs/orbsvcs/Trader/Makefile.am:
+	* orbsvcs/tests/AVStreams/benchmark/Makefile.am:
+	* orbsvcs/tests/AVStreams/mpeg/source/client/Makefile.am:
+	* orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile.am:
+	* orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile.am:
+	* orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile.am:
+	* orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile.am:
+	* orbsvcs/tests/AVStreams/mpeg/source/server/Makefile.am:
+	* orbsvcs/tests/AVStreams/mpeg/source/Makefile.am:
+	* orbsvcs/tests/AVStreams/mpeg/Makefile.am:
+	* orbsvcs/tests/AVStreams/server_discovery/Makefile.am:
+	* orbsvcs/tests/AVStreams/sfp/Makefile.am:
+	* orbsvcs/tests/AVStreams/Makefile.am:
+	* orbsvcs/tests/Makefile.am:
+	* tao/Makefile.am:
+
+	  Checked these files into the CVS repository.  These files are
+	  part of the TAO+auto{conf,make}/libtool integration work.  There
+	  are still some missing files and some of the above files need
+	  to be modified before they will work.  I just wanted to get
+	  these files under CVS control so that I can easily recover
+	  from a mishap or for some reason beyond my control.
+
 Wed Apr 07 14:34:31 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* examples/POA/DSI/Database_i.cpp (_is_a): Removed unused
diff --git a/TAO/Makefile.am b/TAO/Makefile.am
new file mode 100644
index 00000000000..f0c130391ff
--- /dev/null
+++ b/TAO/Makefile.am
@@ -0,0 +1,81 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Top-level Makefile for TAO
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4 check-news
+
+bin_SCRIPTS = tao-config
+
+man_MANS = tao-config.1
+
+SUBDIRS = tao \
+          TAO_IDL
+##SUBDIRS = tao \
+##          TAO_IDL \
+##          orbsvcs \
+##          examples \
+##          performance-tests \
+##          tests \
+##          utils
+
+## For some reason, automake doesn't include acconfig.h in the distribution
+EXTRA_DIST = BUG-REPORT-FORM VERSION \
+             COPYING.sun LICENSE.sun README.sun README.taoconf \
+             tao-config.in taoConf.sh.in tao-config.1.in
+
+##EXTRA_DIST = TAO-INSTALL.html \
+##             ChangeLog-98b \
+##             ChangeLog-98a \
+##             ChangeLog-97 \
+##             FAQ \
+##             VERSION \
+##             etc \
+##             includes \
+##             os-patches \
+##             WindozeCE
+
+DISTCLEANFILES = tao-config taoConf.sh tao-config.1
+
+## release:
+##         $(MAKE) dist distdir=$(PACKAGE)$(VERSION)
+release:
+	$(MAKE) dist
+
+## Put `exec' in the name because this should be installed by
+## `install-exec', not `install-data'.
+confexecdir=$(libdir)
+confexec_DATA = taoConf.sh
+
+## We create taoConf.sh here and not from configure because we want
+## to get the paths expanded correctly.  Macros like srcdir are given
+## the value NONE in configure if the user doesn't specify them (this
+## is an autoconf feature, not a bug).
+taoConf.sh: taoConf.sh.in Makefile
+## Use sed and then mv to avoid problems if the user interrupts.
+	sed -e 's,\@TAO_LIBDIR\@,$(TAO_LIBDIR),g' \
+            -e 's,\@TAO_INCLUDEDIR\@,$(TAO_INCLUDEDIR),g' \
+            -e 's,\@TAO_LIBS\@,$(TAO_LIBS),g' \
+            -e 's,\@TAO_CXXFLAGS\@,$(TAO_CXXFLAGS),g' \
+              < $(srcdir)/taoConf.sh.in > taoConf.tmp \
+          && mv taoConf.tmp taoConf.sh
+
+tao-config.1: tao-config.1.in Makefile
+## Use sed and then mv to avoid problems if the user interrupts.
+	sed -e 's,\@libdir\@,$(libdir),g' \
+              < $(srcdir)/tao-config.1.in > tao-config.1.tmp \
+          && mv tao-config.1.tmp tao-config.1
+
+dist-hook:
+	tar cf - ./docs | (cd $(distdir); tar xfBp -)
+	list=`find $(distdir) -type d -name CVS -print`; for p in $$list; do \
+          rm -rf $$p; \
+        done
diff --git a/TAO/TAO_IDL/Makefile.am b/TAO/TAO_IDL/Makefile.am
new file mode 100644
index 00000000000..67859f0e9d1
--- /dev/null
+++ b/TAO/TAO_IDL/Makefile.am
@@ -0,0 +1,46 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Top-level Makefile.am for the TAO IDL compiler
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+SUBDIRS = driver fe narrow be be_include include ast util
+
+INCLUDES = -I$(top_srcdir)/TAO_IDL/include \
+           -I$(top_srcdir)/TAO_IDL/be_include -I$(top_srcdir)/TAO_IDL/fe
+
+man_MANS = tao_idl.1
+
+bin_PROGRAMS = tao_idl
+
+tao_idl_SOURCES = \
+        tao_idl.cpp
+
+tao_idl_LDADD = \
+        $(top_builddir)/TAO_IDL/driver/libdriver.a  \
+        $(top_builddir)/TAO_IDL/fe/libfe.a  \
+        $(top_builddir)/TAO_IDL/narrow/libnarrow.a  \
+        $(top_builddir)/TAO_IDL/be/libbe.a  \
+        $(top_builddir)/TAO_IDL/ast/libast.a  \
+        $(top_builddir)/TAO_IDL/util/libutil.a
+
+IDL_CFE_VERSION = \"1.3.0\"
+
+##        Is the "+=" a portable make feature?
+CXXFLAGS += \
+           -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
+
+EXTRA_DIST = $(man_MANS)
+
+tags:
+	rm -f TAGS
+	find . -name "*.h" -print | etags -a --c++ -
+	find . -name "*.cpp" -print | etags -a -
diff --git a/TAO/TAO_IDL/ast/Makefile.am b/TAO/TAO_IDL/ast/Makefile.am
new file mode 100644
index 00000000000..75e0bf342d2
--- /dev/null
+++ b/TAO/TAO_IDL/ast/Makefile.am
@@ -0,0 +1,51 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for the TAO IDL compiler --- 'ast' sub-directory
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+           -I$(top_srcdir)/TAO_IDL/include
+
+noinst_LIBRARIES = libast.a
+
+libast_a_SOURCES = \
+         ast_argument.cpp  \
+         ast_array.cpp  \
+         ast_attribute.cpp  \
+         ast_check.cpp  \
+         ast_concrete_type.cpp  \
+         ast_constant.cpp  \
+         ast_decl.cpp  \
+         ast_enum.cpp  \
+         ast_enum_val.cpp  \
+         ast_exception.cpp  \
+         ast_expression.cpp  \
+         ast_field.cpp  \
+         ast_generator.cpp  \
+         ast_interface.cpp  \
+         ast_interface_fwd.cpp  \
+         ast_module.cpp  \
+         ast_native.cpp  \
+         ast_operation.cpp  \
+         ast_predefined_type.cpp  \
+         ast_recursive.cpp  \
+         ast_redef.cpp  \
+         ast_root.cpp  \
+         ast_sequence.cpp  \
+         ast_string.cpp  \
+         ast_structure.cpp  \
+         ast_type.cpp  \
+         ast_typedef.cpp  \
+         ast_union.cpp  \
+         ast_union_branch.cpp  \
+         ast_union_label.cpp
+
diff --git a/TAO/TAO_IDL/be/Makefile.am b/TAO/TAO_IDL/be/Makefile.am
new file mode 100644
index 00000000000..df5dfca68c8
--- /dev/null
+++ b/TAO/TAO_IDL/be/Makefile.am
@@ -0,0 +1,84 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for the TAO IDL compiler --- 'be' sub-directory
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+           -I$(top_srcdir)/TAO_IDL/include \
+           -I$(top_srcdir)/TAO_IDL/be_include
+
+noinst_LIBRARIES = libbe.a
+
+libbe_a_SOURCES = \
+         be_args.cpp  \
+         be_argument.cpp  \
+         be_array.cpp  \
+         be_attribute.cpp  \
+         be_codegen.cpp  \
+         be_constant.cpp  \
+         be_decl.cpp  \
+         be_enum.cpp  \
+         be_enum_val.cpp  \
+         be_exception.cpp  \
+         be_expression.cpp  \
+         be_field.cpp  \
+         be_generator.cpp  \
+         be_helper.cpp  \
+         be_init.cpp  \
+         be_interface.cpp  \
+         be_interface_fwd.cpp  \
+         be_module.cpp  \
+         be_native.cpp  \
+         be_operation.cpp  \
+         be_predefined_type.cpp  \
+         be_produce.cpp  \
+         be_root.cpp  \
+         be_scope.cpp  \
+         be_sequence.cpp  \
+         be_stream_factory.cpp  \
+         be_string.cpp  \
+         be_structure.cpp  \
+         be_sunsoft.cpp  \
+         be_type.cpp  \
+         be_typedef.cpp  \
+         be_union.cpp  \
+         be_union_branch.cpp  \
+         be_union_label.cpp  \
+         be_visitor.cpp  \
+         be_visitor_argument.cpp  \
+         be_visitor_array.cpp  \
+         be_visitor_attribute.cpp  \
+         be_visitor_constant.cpp  \
+         be_visitor_context.cpp  \
+         be_visitor_decl.cpp  \
+         be_visitor_enum.cpp  \
+         be_visitor_exception.cpp  \
+         be_visitor_factory.cpp  \
+         be_visitor_field.cpp  \
+         be_visitor_interface.cpp  \
+         be_visitor_interface_fwd.cpp  \
+         be_visitor_module.cpp  \
+         be_visitor_operation.cpp  \
+         be_visitor_root.cpp  \
+         be_visitor_scope.cpp  \
+         be_visitor_sequence.cpp  \
+         be_visitor_structure.cpp  \
+         be_visitor_typecode.cpp  \
+         be_visitor_typedef.cpp  \
+         be_visitor_union.cpp  \
+         be_visitor_union_branch.cpp
+
+dist-hook:
+	list=`find * -name CVS -prune -o -type d -print`; for p in $$list; do \
+          $(mkinstalldirs) $(distdir)/$$p; \
+          cp $$p/*.cpp $(distdir)/$$p; \
+        done
diff --git a/TAO/TAO_IDL/be_include/Makefile.am b/TAO/TAO_IDL/be_include/Makefile.am
new file mode 100644
index 00000000000..029bbeafe3e
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/Makefile.am
@@ -0,0 +1,77 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for the TAO IDL compiler --- 'be_include' sub-directory
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+noinst_HEADERS = \
+         be.h  \
+         be_argument.h  \
+         be_array.h  \
+         be_attribute.h  \
+         be_codegen.h  \
+         be_constant.h  \
+         be_decl.h  \
+         be_enum.h  \
+         be_enum_val.h  \
+         be_exception.h  \
+         be_expression.h  \
+         be_field.h  \
+         be_generator.h  \
+         be_helper.h  \
+         be_interface.h  \
+         be_interface_fwd.h  \
+         be_module.h  \
+         be_native.h  \
+         be_operation.h  \
+         be_predefined_type.h  \
+         be_root.h  \
+         be_scope.h  \
+         be_sequence.h  \
+         be_state.h  \
+         be_stream_factory.h  \
+         be_string.h  \
+         be_structure.h  \
+         be_sunsoft.h  \
+         be_type.h  \
+         be_typedef.h  \
+         be_union.h  \
+         be_union_branch.h  \
+         be_union_label.h  \
+         be_visitor.h  \
+         be_visitor_argument.h  \
+         be_visitor_array.h  \
+         be_visitor_attribute.h  \
+         be_visitor_constant.h  \
+         be_visitor_context.h  \
+         be_visitor_decl.h  \
+         be_visitor_enum.h  \
+         be_visitor_exception.h  \
+         be_visitor_factory.h  \
+         be_visitor_field.h  \
+         be_visitor_interface.h  \
+         be_visitor_interface_fwd.h  \
+         be_visitor_module.h  \
+         be_visitor_operation.h  \
+         be_visitor_root.h  \
+         be_visitor_scope.h  \
+         be_visitor_sequence.h  \
+         be_visitor_structure.h  \
+         be_visitor_typecode.h  \
+         be_visitor_typedef.h  \
+         be_visitor_union.h  \
+         be_visitor_union_branch.h
+
+dist-hook:
+	list=`find * -name CVS -prune -o -type d -print`; for p in $$list; do \
+          $(mkinstalldirs) $(distdir)/$$p; \
+          cp $$p/*.h $(distdir)/$$p; \
+        done
diff --git a/TAO/TAO_IDL/driver/Makefile.am b/TAO/TAO_IDL/driver/Makefile.am
new file mode 100644
index 00000000000..333da3c8a0b
--- /dev/null
+++ b/TAO/TAO_IDL/driver/Makefile.am
@@ -0,0 +1,32 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for the TAO IDL compiler --- 'driver' sub-directory
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+           -I$(top_srcdir)/TAO_IDL/include \
+           -I$(top_srcdir)/TAO_IDL/be_include
+
+noinst_LIBRARIES = libdriver.a
+
+libdriver_a_SOURCES = \
+         drv_args.cpp  \
+         drv_fork.cpp  \
+         drv_init.cpp  \
+         drv_link.cpp  \
+         drv_preproc.cpp  \
+         drv_private.cpp
+
+## FIXME: What should CPP_LOCATION be?
+##        Is the "+=" a portable make feature?
+CXXFLAGS += \
+           -DCPP_LOCATION=\"$(CXX)\"
diff --git a/TAO/TAO_IDL/fe/Makefile.am b/TAO/TAO_IDL/fe/Makefile.am
new file mode 100644
index 00000000000..8a77d59f628
--- /dev/null
+++ b/TAO/TAO_IDL/fe/Makefile.am
@@ -0,0 +1,88 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for the TAO IDL compiler --- 'fe' sub-directory
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+           -I$(top_srcdir)/TAO_IDL/include
+
+noinst_LIBRARIES = libfe.a
+
+libfe_a_SOURCES = \
+         fe_declarator.cpp  \
+         fe_extern.cpp  \
+         fe_init.cpp  \
+         fe_interface_header.cpp  \
+         fe_lookup.cpp  \
+         fe_private.cpp  \
+         lex.yy.cpp  \
+         y.tab.cpp
+
+noinst_HEADERS = y.tab.h
+
+##BUILT_SOURCES = fe_lookup.cpp lex.yy.cpp y.tab.cpp y.tab.h
+
+fe_lookup.cpp: keywords.dat
+	rm -f fe_lookup.cpp
+	echo "// \$$Id\$$" > fe_lookup.cpp
+	echo "#include	\"idl.h\"" >> fe_lookup.cpp
+	echo "#include	\"idl_extern.h\"" >> fe_lookup.cpp
+	echo "#include	\"fe_private.h\"" >> fe_lookup.cpp
+	$(GPERF) -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_  \
+			-L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$$ keywords.dat \
+			 >> fe_lookup.cpp
+
+lex.yy.cpp: idl.ll
+	@echo "WARNING: Potentially outdated fe/lex.yy.cpp"
+	@echo "         either touch(1) the file or explicitly"
+	@echo "         generate it using:"
+	@echo "    make lex.yy.cpp.target"
+
+.PHONY: lex.yy.cpp.target
+
+lex.yy.cpp.target:
+	$(LEX) -t idl.ll | \
+	sed -e "s/yy/tao_yy/g" \
+            -e "s/YY/TAO_YY/g" \
+            -e "s@#include <unistd\.h>@#include \"ace/OS.h\"@" \
+            -e "/#include </d" \
+            -e "s@ECHO@TAO_YY_ECHO@" \
+            -e 's/\$$Hea''der.*\$$/$$I''d$$/' > lex.yy.cpp
+	echo timestamp > $@
+
+y.tab.cpp: idl.yy
+	@echo "WARNING: Potentially outdated fe/y.tab.cpp"
+	@echo "         either touch(1) the file or explicitly"
+	@echo "         generate it using:"
+	@echo "    make y.tab"
+
+.PHONY: y.tab
+
+y.tab: idl.yy
+	$(YACC) -d idl.yy
+	sed -e "s/char \*getenv/char *ace_foo/g" \
+            -e "s/= getenv/= ACE_OS::getenv/g" \
+            -e "s/yynewerror://g" \
+            -e "s/yy/tao_yy/g" \
+            -e "s/YY/TAO_YY/g" \
+	    -e "s/y\.tab\.c/y.tab.cpp/g" < y.tab.c > /tmp/$(USER).Y
+	sed -e "s/yy/tao_yy/g" \
+            -e "s/YY/TAO_YY/g" < y.tab.h > /tmp/$(USER).YH
+	cp /tmp/$(USER).Y y.tab.cpp
+	cp /tmp/$(USER).YH y.tab.h
+	rm -f /tmp/$(USER).Y /tmp/$(USER).YH y.tab.c y.tab.h
+	patch < y.tab.cpp.diff
+	echo timestamp > $@
+
+noinst_DATA = keywords.dat
+
+EXTRA_DIST = idl.ll idl.yy keywords.dat y.tab.cpp.diff
diff --git a/TAO/TAO_IDL/include/Makefile.am b/TAO/TAO_IDL/include/Makefile.am
new file mode 100644
index 00000000000..b0c60ddc06d
--- /dev/null
+++ b/TAO/TAO_IDL/include/Makefile.am
@@ -0,0 +1,80 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for the TAO IDL compiler --- 'include' sub-directory
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+## SUBDIRS = utl_tmpl
+
+noinst_HEADERS = \
+         ast.h  \
+         ast_argument.h  \
+         ast_array.h  \
+         ast_attribute.h  \
+         ast_concrete_type.h  \
+         ast_constant.h  \
+         ast_decl.h  \
+         ast_enum.h  \
+         ast_enum_val.h  \
+         ast_exception.h  \
+         ast_expression.h  \
+         ast_extern.h  \
+         ast_field.h  \
+         ast_generator.h  \
+         ast_interface.h  \
+         ast_interface_fwd.h  \
+         ast_module.h  \
+         ast_native.h  \
+         ast_operation.h  \
+         ast_predefined_type.h  \
+         ast_root.h  \
+         ast_sequence.h  \
+         ast_string.h  \
+         ast_structure.h  \
+         ast_type.h  \
+         ast_typedef.h  \
+         ast_union.h  \
+         ast_union_branch.h  \
+         ast_union_label.h  \
+         be_extern.h  \
+         drv_extern.h  \
+         drv_link.h  \
+         drv_private.h  \
+         fe_declarator.h  \
+         fe_extern.h  \
+         fe_interface_header.h  \
+         fe_private.h  \
+         global_extern.h  \
+         idl.h  \
+         idl_bool.h  \
+         idl_defines.h  \
+         idl_extern.h  \
+         idl_fwd.h  \
+         idl_global.h  \
+         idl_narrow.h  \
+         intlmacros.h  \
+         nr_extern.h  \
+         util.h  \
+         utl_decllist.h  \
+         utl_error.h  \
+         utl_exceptlist.h  \
+         utl_exprlist.h  \
+         utl_identifier.h  \
+         utl_idlist.h  \
+         utl_indenter.h  \
+         utl_labellist.h  \
+         utl_list.h  \
+         utl_namelist.h  \
+         utl_scope.h  \
+         utl_scoped_name.h  \
+         utl_stack.h  \
+         utl_string.h  \
+         utl_strlist.h
diff --git a/TAO/TAO_IDL/narrow/Makefile.am b/TAO/TAO_IDL/narrow/Makefile.am
new file mode 100644
index 00000000000..262a433ad11
--- /dev/null
+++ b/TAO/TAO_IDL/narrow/Makefile.am
@@ -0,0 +1,21 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for the TAO IDL compiler --- 'narrow' sub-directory
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+           -I$(top_srcdir)/TAO_IDL/include
+
+noinst_LIBRARIES = libnarrow.a
+
+libnarrow_a_SOURCES = \
+         narrow.cpp
diff --git a/TAO/TAO_IDL/util/Makefile.am b/TAO/TAO_IDL/util/Makefile.am
new file mode 100644
index 00000000000..a37e8a78177
--- /dev/null
+++ b/TAO/TAO_IDL/util/Makefile.am
@@ -0,0 +1,37 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for the TAO IDL compiler --- 'util' sub-directory
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+## SUBDIRS = utl_tmpl
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
+           -I$(top_srcdir)/TAO_IDL/include
+
+noinst_LIBRARIES = libutil.a
+
+libutil_a_SOURCES = \
+         utl_decllist.cpp  \
+         utl_error.cpp  \
+         utl_exceptlist.cpp  \
+         utl_exprlist.cpp  \
+         utl_global.cpp  \
+         utl_identifier.cpp  \
+         utl_idlist.cpp  \
+         utl_indenter.cpp  \
+         utl_labellist.cpp  \
+         utl_list.cpp  \
+         utl_namelist.cpp  \
+         utl_scope.cpp  \
+         utl_stack.cpp  \
+         utl_string.cpp  \
+         utl_strlist.cpp
diff --git a/TAO/configure.in b/TAO/configure.in
new file mode 100644
index 00000000000..981d94f30d1
--- /dev/null
+++ b/TAO/configure.in
@@ -0,0 +1,608 @@
+dnl
+dnl $Id$
+
+AC_REVISION($Revision 0.5 $)dnl
+
+dnl
+dnl An autoconf script to automatically configure TAO.
+dnl Process this file with autoconf to produce a configure script.
+dnl
+
+dnl
+dnl The autoconf documentation states that this is the recommended
+dnl sequence for this file:
+dnl
+dnl   `AC_INIT(FILE)'
+dnl   checks for programs
+dnl   checks for libraries
+dnl   checks for header files
+dnl   checks for typedefs
+dnl   checks for structures
+dnl   checks for variables
+dnl   checks for compiler characteristics
+dnl   checks for library functions
+dnl   checks for system services
+dnl   `AC_OUTPUT([FILE...])'
+dnl
+dnl I followed this convention, and added a few sections.
+dnl                      -- Gonzo
+
+ 
+dnl
+dnl SECTION 1: `AC_INIT(FILE)'
+dnl
+dnl This macro must be the very first invoked.
+dnl Its argument names a file that must exist in the directory where
+dnl autoconf will run, just to check things.
+dnl AC_INIT(ace_unique.m4)
+dnl
+AC_INIT(tao/TAO.cpp)
+
+dnl Require GNU Autoconf 2.13 or better.
+AC_PREREQ(2.13)
+
+dnl Check what platform we are running on.
+AC_CANONICAL_SYSTEM
+
+dnl Allow the standard program name transformations.
+dnl We probably don't need AC_ARG_PROGRAM any longer since AM_INIT_AUTOMAKE
+dnl handles this functionality.  -- Ossama
+dnl AC_ARG_PROGRAM
+
+dnl Cause GNU Automake to initialize the state of things and run
+dnl some sanity checks
+TAO_PACKAGE="tao"
+dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
+changequote(, )dnl
+TAO_VERSION=`head -1 ${srcdir}/VERSION | sed 's/.*version \([0-9.]*\).*/\1/'`
+changequote([, ])dnl
+
+AM_INIT_AUTOMAKE("$TAO_PACKAGE", "$TAO_VERSION-aceconf-0.5", )
+
+dnl Generate a header file with all settings.
+dnl AM_CONFIG_HEADER(tao/config.h)
+
+dnl Move before the AC_ARG_ENABLE stuff to prevent autoconf complaints.
+dnl This is a bit messy but it makes life easier for me.
+dnl                          -Ossama
+dnl
+dnl SECTION: checks for programs
+dnl
+
+dnl Check if system supports "#! /bin/sh" line in scripts
+AC_SYS_INTERPRETER
+
+dnl Check the C compiler and preprocessor.
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_CC_C_O
+
+dnl Check the C++ compiler and preprocessor.
+AC_PROG_CXX
+AC_PROG_CXXCPP
+
+dnl This checks for a binary called gm4, gnum4 or m4, and assigns
+dnl whatever was found (or "gonzo") to the M4 macro.
+dnl AC_CHECK_PROGS(M4, gm4 gnum4 m4, gonzo)
+
+dnl Look for the best awk-style program available.
+AC_PROG_AWK
+
+dnl Set some version information
+TAO_CURRENT="0"
+TAO_AGE="0"
+TAO_REVISION="0"
+
+if test -n "$AWK"; then
+  TAO_MAJOR=`echo "$TAO_VERSION" | sed 's/\./ /g' | $AWK '{ print \[$]1 }'`
+  TAO_MINOR=`echo "$TAO_VERSION" | sed 's/\./ /g' | $AWK '{ print \[$]2 }'`
+  TAO_BETA=`echo "$TAO_VERSION" | sed 's/\./ /g' | $AWK '{ print \[$]3 }'`
+
+dnl This is a terrible kludge to fool libtool into making it produce a shared
+dnl library with the "right" version information.
+dnl We really should switch to a version scheme that is compatible with
+dnl libtool.
+dnl               -Ossama
+TAO_CURRENT=`expr $TAO_MAJOR + $TAO_MINOR`
+TAO_AGE=$TAO_MINOR
+TAO_REVISION=$TAO_BETA
+
+fi
+
+AC_SUBST(TAO_CURRENT)
+AC_SUBST(TAO_AGE)
+AC_SUBST(TAO_REVISION)
+
+dnl Do the usual install settings; don't forget to include a
+dnl install-sh script, in case the is no BDS compatible install
+dnl installed (no pun intended) in your machine.
+dnl 
+dnl We don't need this anymore since AM_INIT_AUTOMAKE calls AM_PROG_INSTALL
+dnl yes "AM_PROG_INSTALL," not "AC_PROG_INSTALL." -- Ossama
+dnl AC_PROG_INSTALL
+
+dnl Special handling for some UNIX variants and Cygwin32
+AC_AIX
+AC_ISC_POSIX
+AC_MINIX
+AC_CYGWIN
+
+dnl The user's/default C++ flags are stored in "CXXFLAGS."  We use
+dnl the variable "TAO_CXXFLAGS" to set the C++ flags we want.  At the end
+dnl of the configuration process we combine TAO_CXXFLAGS and CXXFLAGS
+dnl into CXXFLAGS (e.g., CXXFLAGS="$TAO_CXXFLAGS $CXXFLAGS").  CXXFLAGS
+dnl goes after TAO_CXXFLAGS so that the user's C++ flag command line
+dnl choices always override the configure script's choices.
+TAO_CXXFLAGS=""
+TAO_CFLAGS=""
+
+dnl Set the test language as C++
+AC_LANG_CPLUSPLUS
+
+dnl Check if we support symlinks
+AC_PROG_LN_S
+
+dnl Check if a lexical analyzer exists (lex, flex, etc.)
+AM_PROG_LEX
+
+dnl Check if some implementation of YACC exists (yacc, byacc, bison, etc.)
+AC_PROG_YACC
+dnl if test -z "$YACC"; then
+dnl   ./missing yacc
+dnl fi
+
+dnl Check for ace-config script
+AC_CHECK_PROG(ACE_CONFIG, ace-config, ace-config,) dnl
+if test -z "$ACE_CONFIG"; then
+  AC_MSG_WARN(ace-config script not found)
+  AC_MSG_WARN(TAO may not find all of the necessary ACE related libraries)
+fi
+
+dnl We actually check for this in the user AC_ARG_WITH(--with-gperf) 
+dnl block since it is more convenient to put it there.
+dnl Check for gperf program
+dnl AC_CHECK_PROGS(GPERF, gperf-ace gperf,) dnl
+
+dnl Check for profiling progam
+AC_CHECK_PROGS(PROF, gprof prof,) dnl
+
+dnl Since we are linking TAO with the C++ compiler, and since
+dnl libtool checks linker characteristics using the C compiler,
+dnl temporarily state that the C compiler is the C++ compiler.
+TEMP_CC="$CC"
+CC="$CXX"
+
+dnl Disable building of static libraries by default
+AM_DISABLE_STATIC
+
+dnl Check for libtool and turn on Automake processing for Libtool
+AM_PROG_LIBTOOL
+
+
+dnl Restore the C compiler variable
+CC="$TEMP_CC"
+
+dnl
+dnl SECTION 2: Configure script command line options
+dnl
+AC_ARG_ENABLE(fast,
+              [  --enable-fast           enable -fast flag, e.g. Sun C++ [default=no]],
+              [
+               case "${enableval}" in
+                yes)
+                  TAO_CXXFLAGS="$TAO_CXXFLAGS -fast"
+                  TAO_CFLAGS="$TAO_CFLAGS -fast"
+                  ;;
+                no)
+                  ;;
+                *)
+                  AC_MSG_ERROR(bad value ${enableval} for --enable-fast)
+                  ;;
+               esac
+              ],)
+
+AC_ARG_ENABLE(optimize,
+              [  --enable-optimize       enable additional optimizations [default=no]],
+              [
+               case "${enableval}" in
+                yes)
+                  AC_MSG_WARN(Optimization configure support not implemented yet.)
+                  ;;
+                no)
+                  AC_MSG_WARN(Optimization configure support not implemented yet.)
+                  ;;
+                *)
+                  AC_MSG_ERROR(bad value ${enableval} for --enable-optimize)
+                  ;;
+               esac
+              ],)
+
+AC_ARG_ENABLE(profile,
+              [  --enable-profile        enable profiling                [default=no]],
+              [
+               case "${enableval}" in
+                yes)
+                  if test -z "$PROF"; then
+                    AC_MSG_WARN(No profiling program found.  Assuming 'prof' exists)
+                    TAO_CXXFLAGS="$TAO_CXXFLAGS -p"
+                    TAO_CFLAGS="$TAO_CFLAGS -p"
+                  else
+                    case "$PROF" in
+                    gprof)
+                      echo "Building with 'gprof' support"
+                      TAO_CXXFLAGS="$TAO_CXXFLAGS -pg"
+                      TAO_CFLAGS="$TAO_CFLAGS -pg"
+                      ;;
+                    prof)
+                      echo "Building with 'prof' support"
+                      TAO_CXXFLAGS="$TAO_CXXFLAGS -p"
+                      TAO_CFLAGS="$TAO_CFLAGS -p"
+                      ;;
+                    *)
+                      dnl We shouldn't get here.
+                      AC_MSG_WARN(Assuming 'prof' exists)
+                      TAO_CXXFLAGS="$TAO_CXXFLAGS -p"
+                      TAO_CFLAGS="$TAO_CFLAGS -p"
+                      ;;
+                    esac
+                  fi
+                  ;;
+                no)
+                  dnl Do nothing
+                  ;;
+                *)
+                  AC_MSG_ERROR(bad value ${enableval} for --enable-profile)
+                  ;;
+               esac
+              ],)
+
+AC_ARG_ENABLE(purify,
+              [  --enable-purify         Purify all executables          [default=no]],
+              [
+               case "${enableval}" in
+                yes)
+                  AC_CHECK_PROG(PURIFY, purify, purify,)
+                  if test -n "$PURIFY"; then
+                    PURE_CACHE_BASE_DIR="/tmp/purifycache"
+                    PURE_CACHE_DIR=${PURE_CACHE_BASE_DIR}-${LOGNAME}-${notdir ${CXX} }
+                    PURELINK="$PURIFY -best-effort -chain-length=20 \
+             -cache-dir=$PURE_CACHE_DIR \
+             -fds-inuse-at-exit=no -ignore-signals=SIGINT -inuse-at-exit \
+             -max_threads=100"
+                    TAO_CXXFLAGS="$TAO_CXXFLAGS -DTAO_HAS_PURIFY"
+                    TAO_CFLAGS="$TAO_CFLAGS -DTAO_HAS_PURIFY"
+                  else
+                    AC_MSG_WARN(Purify program was not found.)
+                    AC_MSG_WARN(Disabling purify support.)
+                  fi
+                  ;;
+                no)
+                  PURELINK=""
+                  ;;
+                *)
+                  AC_MSG_ERROR(bad value ${enableval} for --enable-purify)
+                  ;;
+               esac
+              ], PURELINK="")
+
+AC_ARG_ENABLE(quantify,
+              [  --enable-quantify       Quantify all executables        [default=no]],
+              [
+               case "${enableval}" in
+                yes)
+                  AC_CHECK_PROG(QUANTIFY, quantify, quantify,)
+                  if test -n "$QUANTIFY"; then
+                    PURE_CACHE_BASE_DIR="/tmp/purifycache"
+                    PURE_CACHE_DIR=${PURE_CACHE_BASE_DIR}-${LOGNAME}-${notdir ${CXX} }
+                    PRELINK="$QUANTIFY  -best-effort -max_threads=100 \
+             -cache-dir=$PURE_CACHE_DIR"
+                    TAO_CXXFLAGS="$TAO_CXXFLAGS -DTAO_HAS_QUANTIFY"
+                    TAO_CFLAGS="$TAO_CFLAGS -DTAO_HAS_QUANTIFY"
+                  else
+                    AC_MSG_WARN(Quantify program was not found.)
+                    AC_MSG_WARN(Disabling quantify support.)
+                  fi
+                  ;;
+                no)
+                  PRELINK=""
+                  ;;
+                *)
+                  AC_MSG_ERROR(bad value ${enableval} for --enable-quantify)
+                  ;;
+               esac
+              ], PRELINK="")
+
+AC_ARG_WITH(ace-includes,
+              [  --with-ace-includes=DIR ACE include files are in DIR],
+              [
+               case "${withval}" in
+                yes)
+                  AC_MSG_ERROR(specify a directory where the 'ace' include directory exists.)
+                  ;;
+                no)
+                  AC_MSG_ERROR(specify a directory where the 'ace' include directory exists.)
+                  ;;
+                *)
+                  if test -d "${withval}"; then
+                    ACE_INCLUDEDIR="${withval}"
+                    CXXFLAGS="${CXXFLAGS} -I${ACE_INCLUDEDIR}"
+                  else
+                    AC_MSG_ERROR(header directory '${withval}' does not exist.)
+                  fi
+                  ;;
+               esac
+              ],)
+
+AC_ARG_WITH(ace-libs,
+              [  --with-ace-libs=DIR     ACE library files are in DIR],
+              [
+               case "${withval}" in
+                yes)
+                  AC_MSG_ERROR(specify a directory where the ACE libraries exist.)
+                  ;;
+                no)
+                  AC_MSG_ERROR(specify a directory where the ACE libraries exist.)
+                  ;;
+                *)
+                  if test -d "${withval}"; then
+                    ACE_LIBDIR="${withval}"
+                    LDFLAGS="${LDFLAGS} -L${ACE_LIBDIR}"
+                  else
+                    AC_MSG_ERROR(library directory '${withval}' does not exist.)
+                  fi
+                  ;;
+               esac
+              ],)
+
+AC_ARG_WITH(gperf,
+              [  --with-gperf=PROG       gperf program                   [default=gperf]],
+              [
+               case "${withval}" in
+                yes)
+                  AC_MSG_ERROR(Specify the gperf program.)
+                  ;;
+                no)
+                  AC_MSG_ERROR(Specify the gperf program.)
+                  ;;
+                *)
+                  AC_CHECK_PROGS(GPERF, ${withval} gperf-ace gperf,) dnl
+                  if test -n "$GPERF"; then
+                    AC_DEFINE_UNQUOTED(ACE_GPERF, "${withval}")
+                  else
+                    AC_MSG_ERROR(gperf program ${withval} does not exist.)
+                  fi
+                  ;;
+               esac
+              ],
+              [
+               if test -z "$GPERF"; then
+                 AC_MSG_WARN(No gperf program found.  TAO will not use perfect hashing.)
+               else
+                 AC_DEFINE_UNQUOTED(ACE_GPERF, "${GPERF}")
+               fi
+              ])
+
+dnl Check for a working ACE installation
+ac_save_CXXFLAGS="$CXXFLAGS"
+ac_save_LDFLAGS="$LDFLAGS"
+ac_save_LIBS="$LIBS"
+if test -n "$ACE_CONFIG"; then
+  CXXFLAGS=`$ACE_CONFIG --cxxflags ace`
+  LDFLAGS=`$ACE_CONFIG --libs-only-L ace`
+  LIBS=`$ACE_CONFIG --libs-only-l ace`
+fi
+CXXFLAGS="$ac_save_CXXFLAGS $CXXFLAGS"
+LDFLAGS="$ac_save_LDFLAGS $LDFLAGS"
+LIBS="$ac_save_LIBS -lACE $LIBS"
+AC_MSG_CHECKING(for a working ACE installation)
+AC_CACHE_VAL(ac_cv_lib_ace_ace_os_exit,
+[
+ cat > conftest.$ac_ext <<EOF
+
+#include <ace/OS.h>
+changequote(, )dnl
+int main(int argc, char *argv[])
+changequote([, ])dnl
+{
+ ACE_OS::exit(0);
+}
+EOF
+
+ if (eval "$CXX -o conftest conftest.$ac_ext $CXXFLAGS $LDFLAGS $LIBS") 2>&5; then
+   ac_cv_lib_ace_ace_os_exit="yes"
+   rm -f conftest*
+ else
+   ac_cv_lib_ace_ace_os_exit="no"
+   dnl rm -f conftest*
+ fi
+])
+if test "$ac_cv_lib_ace_ace_os_exit" = "yes"; then
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+  AC_MSG_WARN(no functional ACE library found)
+  AC_MSG_ERROR(specify needed compiler flags using CXXFLAGS variable first)
+fi
+
+dnl We only set the following if the ace-config script doesn't exist!
+if test -z "$ACE_CONFIG"; then
+
+  dnl Check if platform supports exceptions using ACE headers
+  AC_MSG_CHECKING(if ACE supports exceptions)
+  AC_EGREP_CPP(TAO_EXCEPTIONS,
+    [
+#include <ace/config.h>
+
+#if defined (ACE_HAS_EXCEPTIONS)
+       TAO_EXCEPTIONS
+#endif
+    ],
+    [
+     AC_MSG_RESULT(yes)
+    ] ,
+    [
+     AC_MSG_RESULT(no)
+     if test -n "$GXX"; then
+dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
+changequote(, )dnl
+       if g++ --version | egrep -v '^2\.[0-7]' > /dev/null; then
+changequote([, ])dnl
+         if test -z "$ACE_CONFIG"; then
+           TAO_CXXFLAGS="$TAO_CXXFLAGS -fno-exceptions"
+         fi
+       fi
+     fi
+     if test -n "$GCC"; then
+dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
+changequote(, )dnl
+       if gcc --version | egrep -v '^2\.[0-7]' > /dev/null; then
+changequote([, ])dnl
+         if test -z "$ACE_CONFIG"; then
+           TAO_CFLAGS="$TAO_CFLAGS -fno-exceptions" 
+         fi
+       fi
+     fi
+    ])
+
+  dnl Check if platform supports run-time type identification using ACE headers
+  AC_MSG_CHECKING(if ACE supports GNU C++ repositories)
+  AC_EGREP_CPP(TAO_GNU_REPO,
+    [
+#include <ace/config.h>
+
+#if defined (ACE_HAS_GNU_REPO)
+       TAO_GNU_REPO
+#endif
+    ],
+    [
+     AC_MSG_RESULT(yes)
+     if test -n "$GXX" && test -z "$ACE_CONFIG"; then
+       TAO_CXXFLAGS="$TAO_CXXFLAGS -frepo"
+     fi
+    ] ,
+    [
+     AC_MSG_RESULT(no)
+     if test -n "$GXX" && test -z "$ACE_CONFIG"; then
+       TAO_CXXFLAGS="$TAO_CXXFLAGS -fno-implicit-templates"
+     fi
+    ])
+
+  dnl Check if platform supports run-time type identification using ACE headers
+  AC_MSG_CHECKING(if ACE supports run-time type identification)
+  AC_EGREP_CPP(TAO_RTTI,
+    [
+#include <ace/config.h>
+
+#if !defined (ACE_LACKS_RTTI)
+       TAO_RTTI
+#endif
+    ],
+    [
+     AC_MSG_RESULT(yes)
+       if test -z "$GXX" && test -z "$ACE_CONFIG"; then
+         case "$target" in
+           *solaris*)
+              TAO_CXXFLAGS="$TAO_CXXFLAGS -features=rtti"
+              ;;
+           *)
+              ;;
+         esac
+       fi
+    ],
+    [
+     AC_MSG_RESULT(no)
+    ])
+
+fi dnl test -z "$ACE_CONFIG"
+
+dnl Check if templates require source on platform using ACE headers
+AC_MSG_CHECKING(if ACE and TAO require template source)
+AC_EGREP_CPP(TAO_TEMPLATES_SOURCE,
+  [
+#include <ace/config.h>
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+       TAO_TEMPLATES_SOURCE
+#endif
+  ],
+  [
+   tao_cv_feature_templates_require_source="yes"
+   AC_MSG_RESULT(yes)
+  ],
+  [
+   tao_cv_feature_templates_require_source="no"
+   AC_MSG_RESULT(no)
+  ])
+AM_CONDITIONAL(TEMPLATES_REQUIRE_SOURCE,
+               test X$tao_cv_feature_templates_require_source = Xyes)
+
+
+dnl Additional flags to set by the configure script
+
+if test -n "$GXX" && test -z "$ACE_CONFIG"; then
+  TAO_CXXFLAGS="$TAO_CXXFLAGS -Wall -Wpointer-arith -Wno-switch"
+else
+  TAO_CXXFLAGS="$TAO_CXXFLAGS -Wno-switch"
+fi
+
+if test -n "$GCC" && test -z "$ACE_CONFIG"; then
+  TAO_CFLAGS="$TAO_CFLAGS -Wall -Wpointer-arith -Wno-switch"
+fi
+
+dnl Combine package set flags with user's flags.
+dnl User's flags go after package flags to allow user to override
+dnl package defaults.
+dnl X_CFLAGS comes from AC_PATH_XTRA.  It may include, for example,
+dnl additional include file paths or macros that need to be defined
+dnl in order for X11 related files to be compiled properly.
+CXXFLAGS="$TAO_CXXFLAGS $CXXFLAGS"
+CXXCPPFLAGS="$TAO_CXXCPPFLAGS $CXXCPPFLAGS"
+CFLAGS="$TAO_CFLAGS $CFLAGS"
+CPPFLAGS="$TAO_CPPFLAGS $CPPFLAGS"
+LDFLAGS="$TAO_LDFLAGS $LDFLAGS"
+
+dnl Prepend purify and quantify command lines if purify and quantify are
+dnl enabled.  Otherwise, PURELINK and PRELINK will just be "blank."
+LD="$PURELINK $PRELINK $LD"
+dnl LDFLAGS="$ACE_LDFLAGS $LDFLAGS"
+
+dnl AC_SUBST(LDFLAGS)
+dnl AC_SUBST(LIBOBJS)
+
+dnl These definitions are expanded in the makefile and ace-config
+TAO_LIBDIR='-L${libdir}'
+TAO_LIBS="${LIBS}"
+TAO_INCLUDEDIR='-I${includedir}'
+
+AC_SUBST(TAO_LIBDIR)
+AC_SUBST(TAO_LIBS)
+AC_SUBST(TAO_INCLUDEDIR)
+
+dnl Force CXXFLAGS to be substituted in Makefiles that don't "need" them.
+AC_SUBST(CXXFLAGS)
+
+dnl
+dnl SECTION 16: `AC_OUTPUT([FILE...])'
+dnl
+dnl
+dnl We can finally create all the files listed here; Makefile is
+dnl created from Makefile.in, etc.  Top-level Makefiles should be
+dnl created first.
+AC_OUTPUT([
+           Makefile
+           TAO_IDL/Makefile
+           TAO_IDL/ast/Makefile
+           TAO_IDL/be/Makefile
+           TAO_IDL/be_include/Makefile
+           TAO_IDL/driver/Makefile
+           TAO_IDL/fe/Makefile
+           TAO_IDL/include/Makefile
+           TAO_IDL/narrow/Makefile
+           TAO_IDL/util/Makefile
+           tao/Makefile
+           tao-config
+          ])
+
+echo ""
+echo "Configuration of TAO is now complete."
+echo ""
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am
new file mode 100644
index 00000000000..6ee4dd3b1b1
--- /dev/null
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am
@@ -0,0 +1,29 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Concurrency Service
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+bin_PROGRAMS = Concurrency_Service
+
+Concurrency_Service_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+Concurrency_Service_SOURCES = \
+        Concurrency_Service.cpp
+
+noinst_HEADERS = \
+        Concurrency_Service.h
+
+EXTRA_DIST = README
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am
new file mode 100644
index 00000000000..296a1166e22
--- /dev/null
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile.am
@@ -0,0 +1,29 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's CosEvent Service
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+bin_PROGRAMS = CosEvent_Service
+
+CosEvent_Service_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+CosEvent_Service_SOURCES = \
+        CosEvent_Service.cpp
+
+noinst_HEADERS = \
+        CosEvent_Service.h
+
+EXTRA_DIST = README
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am
new file mode 100644
index 00000000000..97ea89e65e6
--- /dev/null
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile.am
@@ -0,0 +1,28 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Dump Schedule Service
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+bin_PROGRAMS = Dump_Schedule
+
+Dump_Schedule_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+Dump_Schedule_SOURCES = \
+        Dump_Schedul.cpp
+
+## noinst_HEADERS = 
+
+## EXTRA_DIST = README
diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am
new file mode 100644
index 00000000000..658d762aa30
--- /dev/null
+++ b/TAO/orbsvcs/Event_Service/Makefile.am
@@ -0,0 +1,29 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Event Service
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+bin_PROGRAMS = Event_Service
+
+Event_Service_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+Event_Service_SOURCES = \
+        Event_Service.cpp
+
+noinst_HEADERS = \
+        Event_Service.h
+
+## EXTRA_DIST = README
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
new file mode 100644
index 00000000000..d4784df84ce
--- /dev/null
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
@@ -0,0 +1,32 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Implementation Repository Service
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+bin_PROGRAMS = ImplRepo_Service
+
+ImplRepo_Service_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+ImplRepo_Service_SOURCES = \
+        ImplRepo.cpp \
+        ImplRepo_i.cpp \
+        Repository.cpp
+
+noinst_HEADERS = \
+        ImplRepo_i.h \
+        Repository.h
+
+## EXTRA_DIST = README
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
new file mode 100644
index 00000000000..46979fd61f9
--- /dev/null
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
@@ -0,0 +1,35 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Life Cycle Service
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+bin_PROGRAMS = LifeCycle_Service
+
+LifeCycle_Service_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+LifeCycle_Service_SOURCES = \
+        Criteria_Evaluator.cpp \
+        Factory_Trader.cpp \
+        LifeCycle_Service.cpp \
+        LifeCycle_Service_i.cpp
+
+noinst_HEADERS = \
+        Criteria_Evaluator.h \
+        Factory_Trader.h \
+        LifeCycle_Service.h \
+        LifeCycle_Service_i.h
+
+## EXTRA_DIST = README
diff --git a/TAO/orbsvcs/Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Makefile.am
new file mode 100644
index 00000000000..47861d6a42c
--- /dev/null
+++ b/TAO/orbsvcs/Logging_Service/Makefile.am
@@ -0,0 +1,30 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Logging Service
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+bin_PROGRAMS = Logging_Service
+
+Logging_Service_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+Logging_Service_SOURCES = \
+        Logging_Service.cpp \
+        Logging_Service_i.cpp
+
+noinst_HEADERS = \
+        Logging_Service_i.h
+
+## EXTRA_DIST = README
diff --git a/TAO/orbsvcs/Makefile.am b/TAO/orbsvcs/Makefile.am
new file mode 100644
index 00000000000..8f27d07c80f
--- /dev/null
+++ b/TAO/orbsvcs/Makefile.am
@@ -0,0 +1,25 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for the TAO orbsvcs library
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+SUBDIRS = \
+        orbsvcs \
+        Naming_Service \
+        Scheduling_Service \
+        Event_Service \
+        Dump_Schedule \
+        Concurrency_Service \
+        LifeCycle_Service \
+        Trading_Service \
+        Logging_Service \
+        tests
diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am
new file mode 100644
index 00000000000..243ebe82375
--- /dev/null
+++ b/TAO/orbsvcs/Naming_Service/Makefile.am
@@ -0,0 +1,29 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Naming Service
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+bin_PROGRAMS = Naming_Service
+
+Naming_Service_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+Naming_Service_SOURCES = \
+        Naming_Service.cpp
+
+noinst_HEADERS = \
+        Naming_Service.h
+
+EXTRA_DIST = README
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am
new file mode 100644
index 00000000000..02865b18f6d
--- /dev/null
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile.am
@@ -0,0 +1,28 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Scheduling Service
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+bin_PROGRAMS = Scheduling_Service
+
+Scheduling_Service_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+Scheduling_Service_SOURCES = \
+        Scheduling_Service.cpp
+
+## noinst_HEADERS =
+
+## EXTRA_DIST = README
diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am
new file mode 100644
index 00000000000..a60c7f37596
--- /dev/null
+++ b/TAO/orbsvcs/Time_Service/Makefile.am
@@ -0,0 +1,40 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Time Service
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+bin_PROGRAMS = Time_Service_Server Time_Service_Clerk
+
+Time_Service_Server_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+Time_Service_Server_SOURCES = \
+        IR_Helper.cpp \
+        Server_i.cpp \
+        Time_Service_Server.cpp
+
+Time_Service_Clerk_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+Time_Service_Clerk_SOURCES = \
+        Clerk_i.cpp \
+        Time_Service_Clerk.cpp
+
+noinst_HEADERS = \
+        Clerk_i.h \
+        IR_Helper.h \
+        Server_i.h
+
+EXTRA_DIST = README
diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am
new file mode 100644
index 00000000000..447c80fb89a
--- /dev/null
+++ b/TAO/orbsvcs/Trading_Service/Makefile.am
@@ -0,0 +1,29 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Trading Service
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+bin_PROGRAMS = Trading_Service
+
+Trading_Service_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+Trading_Service_SOURCES = \
+        Trading_Service.cpp
+
+noinst_HEADERS = \
+        Trading_Service.h
+
+EXTRA_DIST = README
diff --git a/TAO/orbsvcs/orbsvcs/AV/Makefile.am b/TAO/orbsvcs/orbsvcs/AV/Makefile.am
new file mode 100644
index 00000000000..3da9661b33f
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/AV/Makefile.am
@@ -0,0 +1,35 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Audio/Visual (AV) Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_AV.la
+
+libTAO_AV_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_AV_la_SOURCES = \
+        AVStreams_i.cpp \
+        Endpoint_Strategy.cpp \
+        Endpoint_Strategy_T.cpp \
+        sfp.cpp
+
+noinst_HEADERS = \
+        AVStreams_i.h \
+        Endpoint_Strategy.h \
+        Endpoint_Strategy_T.h \
+        sfp.h
+
+EXTRA_DIST = README
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am b/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am
new file mode 100644
index 00000000000..0d7e846020d
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am
@@ -0,0 +1,34 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Concurrency Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Concurrency.la
+
+libTAO_Concurrency_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Concurrency_la_SOURCES = \
+        CC_Lock.cpp \
+        CC_LockSet.cpp \
+        CC_LockSetFactory.cpp \
+        Concurrency_Utils.cpp
+
+noinst_HEADERS = \
+        CC_Lock.h \
+        CC_LockSet.h \
+        CC_LockSetFactory.h \
+        Concurrency_Utils.h
+
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am b/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am
new file mode 100644
index 00000000000..06c43124200
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am
@@ -0,0 +1,35 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's CosEvent Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_CosEvent.la
+
+libTAO_CosEvent_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_CosEvent_la_SOURCES = \
+        ConsumerAdmin_i.cpp \
+        EventChannel_i.cpp \
+        ProxyPushConsumer_i.cpp \
+        ProxyPushSupplier_i.cpp \
+        SupplierAdmin_i.cpp
+
+noinst_HEADERS = \
+        ConsumerAdmin_i.h \
+        EventChannel_i.h \
+        ProxyPushConsumer_i.h \
+        ProxyPushSupplier_i.h \
+        SupplierAdmin_i.h
diff --git a/TAO/orbsvcs/orbsvcs/Event/Makefile.am b/TAO/orbsvcs/orbsvcs/Event/Makefile.am
new file mode 100644
index 00000000000..a87f40e0493
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Event/Makefile.am
@@ -0,0 +1,142 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Event Channel library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Event.la
+
+libTAO_Event_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Event_la_SOURCES = \
+        BCU.cpp \
+        Dispatching_Modules.cpp \
+        EC_Basic_Factory.cpp \
+        EC_Basic_Filter_Builder.cpp \
+        EC_Busy_Lock.cpp \
+        EC_Command.cpp \
+        EC_Conjunction_Filter.cpp \
+        EC_ConsumerAdmin.cpp \
+        EC_Disjunction_Filter.cpp \
+        EC_Dispatching.cpp \
+        EC_Event_Channel.cpp \
+        EC_Factory.cpp \
+        EC_Filter.cpp \
+        EC_Filter_Builder.cpp \
+        EC_Gateway.cpp \
+        EC_Gateway_UDP.cpp \
+        EC_Null_Factory.cpp \
+        EC_ObserverStrategy.cpp \
+        EC_Per_Supplier_Filter.cpp \
+        EC_ProxyConsumer.cpp \
+        EC_ProxyPushSupplier_Set.cpp \
+        EC_ProxyPushSupplier_Set_T.cpp \
+        EC_ProxySupplier.cpp \
+        EC_QOS_Info.cpp \
+        EC_Reactive_Timeout_Generator.cpp \
+        EC_SupplierAdmin.cpp \
+        EC_SupplierFiltering.cpp \
+        EC_Timeout_Filter.cpp \
+        EC_Timeout_Generator.cpp \
+        EC_Type_Filter.cpp \
+        EC_UDP_Admin.cpp \
+        Event_Channel.cpp \
+        Event_Manip.cpp \
+        GPlot_File.cpp \
+        Local_ESTypes.cpp \
+        Memory_Pools.cpp \
+        Module_Factory.cpp \
+        RT_Task.cpp \
+        ReactorTask.cpp \
+        Timer_Module.cpp
+
+noinst_HEADERS = \
+        BCU.h \
+        Debug_Macros.h \
+        Dispatching_Modules.h \
+        Dispatching_Modules.i \
+        EC_Basic_Factory.h \
+        EC_Basic_Factory.i \
+        EC_Basic_Filter_Builder.h \
+        EC_Basic_Filter_Builder.i \
+        EC_Busy_Lock.h \
+        EC_Busy_Lock.i \
+        EC_Command.h \
+        EC_Command.i \
+        EC_Conjunction_Filter.h \
+        EC_Conjunction_Filter.i \
+        EC_ConsumerAdmin.h \
+        EC_ConsumerAdmin.i \
+        EC_Disjunction_Filter.h \
+        EC_Disjunction_Filter.i \
+        EC_Dispatching.h \
+        EC_Dispatching.i \
+        EC_Event_Channel.h \
+        EC_Event_Channel.i \
+        EC_Factory.h \
+        EC_Factory.i \
+        EC_Filter.h \
+        EC_Filter.i \
+        EC_Filter_Builder.h \
+        EC_Filter_Builder.i \
+        EC_Gateway.h \
+        EC_Gateway_UDP.h \
+        EC_Gateway_UDP.i \
+        EC_Null_Factory.h \
+        EC_Null_Factory.i \
+        EC_ObserverStrategy.h \
+        EC_ObserverStrategy.i \
+        EC_Per_Supplier_Filter.h \
+        EC_Per_Supplier_Filter.i \
+        EC_ProxyConsumer.h \
+        EC_ProxyConsumer.i \
+        EC_ProxyPushSupplier_Set.h \
+        EC_ProxyPushSupplier_Set.i \
+        EC_ProxyPushSupplier_Set_T.h \
+        EC_ProxyPushSupplier_Set_T.i \
+        EC_ProxySupplier.h \
+        EC_ProxySupplier.i \
+        EC_QOS_Info.h \
+        EC_QOS_Info.i \
+        EC_Reactive_Timeout_Generator.h \
+        EC_Reactive_Timeout_Generator.i \
+        EC_SupplierAdmin.h \
+        EC_SupplierAdmin.i \
+        EC_SupplierFiltering.h \
+        EC_SupplierFiltering.i \
+        EC_Timeout_Filter.h \
+        EC_Timeout_Filter.i \
+        EC_Timeout_Generator.h \
+        EC_Timeout_Generator.i \
+        EC_Type_Filter.h \
+        EC_Type_Filter.i \
+        EC_UDP_Admin.h \
+        Event_Channel.h \
+        Event_Channel.i \
+        Fast_Reactor.h \
+        GPlot_File.h \
+        GPlot_File.i \
+        Local_ESTypes.h \
+        Local_ESTypes.i \
+        Memory_Pools.h \
+        Memory_Pools.i \
+        Module_Factory.h \
+        RT_Task.h \
+        RT_Task.i \
+        ReactorTask.h \
+        Timer_Module.h \
+        Timer_Module.i
+
+EXTRA_DIST = README
diff --git a/TAO/orbsvcs/orbsvcs/Log/Makefile.am b/TAO/orbsvcs/orbsvcs/Log/Makefile.am
new file mode 100644
index 00000000000..5f013201668
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Log/Makefile.am
@@ -0,0 +1,27 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Logging Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Logger.la
+
+libTAO_Logger_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Logger_la_SOURCES = \
+        Logger_i.cpp
+
+noinst_HEADERS = \
+        Logger_i.h
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
new file mode 100644
index 00000000000..080fabdf479
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -0,0 +1,96 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for the TAO orbsvcs library
+##            orbsvcs subdirectory
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+## # Uncomment out the following line (or invoke make with
+## # TAO_LACKS_EVENT_CHANNEL_ANY=1)
+## # if you don't want support for anys in the Event Channel.
+## #### TAO_LACKS_EVENT_CHANNEL_ANY = 1
+## ifneq ($(TAO_LACKS_EVENT_CHANNEL_ANY),)
+##   override TAO_LACKS_EVENT_CHANNEL_ANY = -DTAO_LACKS_EVENT_CHANNEL_ANY
+## endif
+
+# TODO: This should be a configure script option
+# Uncomment out the following line (or invoke make with
+# if you don't want support for anys in the Event Channel.
+#TAO_LACKS_EVENT_CHANNEL_ANY = -DTAO_LACKS_EVENT_CHANNEL_ANY
+
+TAO_IDLFLAGS = \
+        -Wb,export_macro=TAO_ORBSVCS_Export \
+        -Wb,export_include=orbsvcs_export.h \
+        $(TAO_LACKS_EVENT_CHANNEL_ANY)
+
+# Build a libtool library, liborbsvcs.la for installation in libdir.
+lib_LTLIBRARIES = liborbsvcs.la
+liborbsvcs_la_SOURCES = \
+        CosConcurrencyControlS.h \
+        CosConcurrencyControlS.cpp \
+        CosConcurrencyControlC.h \
+        CosConcurrencyControlC.cpp \
+        CosNamingS.h \
+        CosNamingS.cpp \
+        CosNamingC.h \
+        CosNamingC.cpp \
+        CosLifeCycleS.h \
+        CosLifeCycleS.cpp \
+        CosLifeCycleC.h \
+        CosLifeCycleC.cpp \
+        CosPropertyServiceS.h \
+        CosPropertyServiceS.cpp \
+        CosPropertyServiceC.h \
+        CosPropertyServiceC.cpp \
+        CosTimeBaseS.h \
+        CosTimeBaseS.cpp \
+        CosTimeBaseC.h \
+        CosTimeBaseC.cpp \
+        LoggerS.h \
+        LoggerS.cpp \
+        LoggerC.h \
+        LoggerC.cpp \
+        RtecEventCommS.h \
+        RtecEventCommS.cpp \
+        RtecEventCommC.h \
+        RtecEventCommC.cpp \
+        RtecSchedulerS.h \
+        RtecSchedulerS.cpp \
+        RtecSchedulerC.h \
+        RtecSchedulerC.cpp \
+        RtecEventChannelAdminS.h \
+        RtecEventChannelAdminS.cpp \
+        RtecEventChannelAdminC.h \
+        RtecEventChannelAdminC.cpp \
+        RtecUDPAdminS.h \
+        RtecUDPAdminS.cpp \
+        RtecUDPAdminC.h \
+        RtecUDPAdminC.cpp \
+        LifeCycleServiceS.h \
+        LifeCycleServiceS.cpp \
+        LifeCycleServiceC.h \
+        LifeCycleServiceC.cpp \
+        CosTradingS.h \
+        CosTradingS.cpp \
+        CosTradingC.h \
+        CosTradingC.cpp \
+        AVStreamsS.h \
+        AVStreamsS.cpp \
+        AVStreamsC.h \
+        AVStreamsC.cpp \
+        Null_MediaCtrlS.h \
+        Null_MediaCtrlS.cpp \
+        Null_MediaCtrlC.h \
+        Null_MediaCtrlC.cpp \
+        \
+        
+
+VPATH=.:Naming:Time:Log:Concurrency:Property:Trader:Sched:Event:CosEvent:AV:
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Makefile.am b/TAO/orbsvcs/orbsvcs/Naming/Makefile.am
new file mode 100644
index 00000000000..bd0c6589747
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Naming/Makefile.am
@@ -0,0 +1,35 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Naming Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Naming.la
+
+libTAO_Naming_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Naming_la_SOURCES = \
+        Entries.cpp \
+        Hash_Naming_Context.cpp \
+        Naming_Context.cpp \
+        Naming_Utils.cpp
+
+noinst_HEADERS = \
+        Entries.h \
+        Hash_Naming_Context.h \
+        Naming_Context.h \
+        Naming_Utils.h
+
+EXTRA_DIST = README
diff --git a/TAO/orbsvcs/orbsvcs/Property/Makefile.am b/TAO/orbsvcs/orbsvcs/Property/Makefile.am
new file mode 100644
index 00000000000..446c94f7f12
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Property/Makefile.am
@@ -0,0 +1,27 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Property Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Property.la
+
+libTAO_Property_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Property_la_SOURCES = \
+        CosPropertyService_i.cpp
+
+noinst_HEADERS = \
+        CosPropertyService_i.h
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Makefile.am b/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
new file mode 100644
index 00000000000..c30c1cc1086
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
@@ -0,0 +1,37 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Scheduling Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Sched.la
+
+libTAO_Sched_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Sched_la_SOURCES = \
+        Config_Scheduler.cpp \
+        DynSched.cpp \
+        SchedEntry.cpp \
+        Scheduler.cpp \
+        Scheduler_Generic.cpp \
+        Strategy_Scheduler.cpp
+
+noinst_HEADERS = \
+        Config_Scheduler.h \
+        DynSched.h \
+        SchedEntry.h \
+        Scheduler.h \
+        Scheduler_Generic.h \
+        Strategy_Scheduler.h
diff --git a/TAO/orbsvcs/orbsvcs/Time/Makefile.am b/TAO/orbsvcs/orbsvcs/Time/Makefile.am
new file mode 100644
index 00000000000..da50550bca2
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Time/Makefile.am
@@ -0,0 +1,35 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Time Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Time.la
+
+libTAO_Time_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Time_la_SOURCES = \
+        TAO_TIO.cpp \
+        TAO_Time_Service_Clerk.cpp \
+        TAO_Time_Service_Server.cpp \
+        TAO_UTO.cpp \
+        Timer_Helper.cpp
+
+noinst_HEADERS = \
+        TAO_TIO.h \
+        TAO_Time_Service_Clerk.h \
+        TAO_Time_Service_Server.h \
+        TAO_UTO.h \
+        Timer_Helper.h
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Makefile.am b/TAO/orbsvcs/orbsvcs/Trader/Makefile.am
new file mode 100644
index 00000000000..6b75e083567
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Trader/Makefile.am
@@ -0,0 +1,51 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's Trading Service library
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+lib_LTLIBRARIES = libTAO_Trader.la
+
+libTAO_Trader_la_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libTAO_Trader_la_SOURCES = \
+        Constraint_Interpreter.cpp \
+        Constraint_Nodes.cpp \
+        Constraint_Visitors.cpp \
+        Constraint_l.cpp \
+        Constraint_y.cpp \
+        Offer_Database.cpp \
+        Offer_Iterators.cpp \
+        Offer_Iterators_T.cpp \
+        Service_Type_Repository.cpp \
+        Trader.cpp \
+        Trader_Interfaces.cpp \
+        Trader_T.cpp \
+        Trader_Utils.cpp
+
+noinst_HEADERS = \
+        Constraint_Interpreter.h \
+        Constraint_Nodes.h \
+        Constraint_Tokens.h \
+        Constraint_Visitors.h \
+        Locking.h \
+        Offer_Database.h \
+        Offer_Iterators.h \
+        Offer_Iterators_T.h \
+        Service_Type_Repository.h \
+        Trader.h \
+        Trader_Interfaces.h \
+        Trader_T.h \
+        Trader_Utils.h
diff --git a/TAO/orbsvcs/tests/AVStreams/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Makefile.am
new file mode 100644
index 00000000000..a7d36a0e1fe
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/Makefile.am
@@ -0,0 +1,22 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Top-level Makefile for TAO's AVStreams Tests
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+SUBDIRS = \
+        benchmark \
+        mpeg \
+        server_discovery \
+        sfp
+
+EXTRA_DIST = README
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile.am b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile.am
new file mode 100644
index 00000000000..7361ab6b9e8
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile.am
@@ -0,0 +1,46 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's AVStreams Service -- benchmark directory
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+noinst_PROGRAMS = server client #child
+
+server_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+server_SOURCES = \
+        server.cpp \
+        child.cpp
+
+client_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+client_SOURCES = \
+        client.cpp
+
+## chile_LDADD = \
+## 	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+##
+## child_SOURCES = \
+##         child.cpp
+
+noinst_HEADERS = \
+        child.h \
+        client.h \
+        server.h
+
+noinst_DATA = svc.conf clnt.conf
+
+EXTRA_DIST = $(noinst_DATA)
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/Makefile.am
new file mode 100644
index 00000000000..1a6e6484914
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/Makefile.am
@@ -0,0 +1,27 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's AVStreams Tests -- mpeg directory
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+SUBDIRS = \
+        source
+
+EXTRA_DIST = \
+        INSTALL.UCB \
+        PatchLevel \
+        README \
+        README.MI \
+        README.OGI \
+        README.UCB \
+        vcr.1 \
+        vcrs.1
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile.am
new file mode 100644
index 00000000000..7f6ca007e13
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile.am
@@ -0,0 +1,28 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's AVStreams Tests -- mpeg/source directory
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+SUBDIRS = \
+        client \
+        mpeg_client \
+        mpeg_mib \
+        mpeg_server \
+        mpeg_shared \
+        server
+
+EXTRA_DIST = TODO
+
+dist-hook:
+        $(mkinstalldirs) $(distdir)/$(subdir)
+        tar cf - ./include | (cd $(distdir)/$(subdir); tar xfBp -)
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile.am
new file mode 100644
index 00000000000..638be06e202
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile.am
@@ -0,0 +1,28 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's AVStreams Tests -- mpeg/source/client directory
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+noinst_PROGRAMS = vcr
+
+vcr_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+vcr_SOURCES = \
+        vcr.cpp
+
+noinst_DATA = svc.conf
+
+EXTRA_DIST = $(noinst_DATA)
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile.am
new file mode 100644
index 00000000000..448264323fc
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile.am
@@ -0,0 +1,76 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's AVStreams Tests -- 
+##                    mpeg/source/mpeg_client directory
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+noinst_LTLIBRARIES = libmpeg_client
+
+libmpeg_client_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libmpeg_client_SOURCES = \
+        24bit.cpp \
+        2x2.cpp \
+        Command_Handler.cpp \
+        ab.cpp \
+        audio.cpp \
+        ctr.cpp \
+        decoders.cpp \
+        file.cpp \
+        fs2.cpp \
+        fs2fast.cpp \
+        fs4.cpp \
+        global.cpp \
+        gray.cpp \
+        hybrid.cpp \
+        hybriderr.cpp \
+        info.cpp \
+        jrevdct.cpp \
+        mb_ordered.cpp \
+        mono.cpp \
+        motionvector.cpp \
+        ordered.cpp \
+        ordered2.cpp \
+        para.cpp \
+        parseblock.cpp \
+        prog.cpp \
+        ui.cpp \
+        util.cpp \
+        util32.cpp \
+        vb.cpp \
+        vd.cpp \
+        video.cpp \
+        vp.cpp
+
+noinst_HEADERS = \
+        Command_Handler.h \
+        ab.h \
+        decoders.h \
+        dither.h \
+        fs2.h \
+        fs4.h \
+        global.h \
+        mibload.h \
+        newproto.h \
+        proto.h \
+        ui.h \
+        util.h \
+        vb.h \
+        video.h
+
+dist-hook:
+        $(mkinstalldirs) $(distdir)/$(subdir)
+        tar cf - ./interface | (cd $(distdir)/$(subdir); tar xfBp -)
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile.am
new file mode 100644
index 00000000000..4c667eec5ba
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile.am
@@ -0,0 +1,41 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's AVStreams Tests -- 
+##                    mpeg/source/mpeg_mib directory
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+noinst_LTLIBRARIES = libmpeg_mib
+
+libmpeg_mib_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libmpeg_mib_SOURCES = \
+        mibButton.cpp \
+        mibDrawArea.cpp \
+        mibFrame.cpp \
+        mibLabel.cpp \
+        mibList.cpp \
+        mibMenu.cpp \
+        mibRadioBox.cpp \
+        mibScale.cpp \
+        mibScrollBar.cpp \
+        mibTextBig.cpp \
+        mibTextBox.cpp \
+        mibToggle.cpp \
+        mibload.cpp
+
+noinst_HEADERS = \
+        mibload.h \
+        mibwidgets.h
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile.am
new file mode 100644
index 00000000000..783d7abc8d6
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile.am
@@ -0,0 +1,45 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's AVStreams Tests -- 
+##                    mpeg/source/mpeg_server directory
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+noinst_LTLIBRARIES = libmpeg_server
+
+libmpeg_server_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libmpeg_server_SOURCES = \
+        Audio_Control_State.cpp \
+        Audio_Control_i.cpp \
+        Audio_Server.cpp \
+        Globals.cpp \
+        Video_Control_State.cpp \
+        Video_Control_i.cpp \
+        Video_Server.cpp \
+        as.cpp \
+        las.cpp \
+        lvs.cpp \
+        vs.cpp
+
+noinst_HEADERS = \
+        Audio_Control_State.h \
+        Audio_Control_i.h \
+        Audio_Server.h \
+        Globals.h \
+        Video_Control_State.h \
+        Video_Control_i.h \
+        Video_Server.h \
+        server_proto.h
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile.am
new file mode 100644
index 00000000000..54db7b32bdf
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile.am
@@ -0,0 +1,78 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's AVStreams Tests -- 
+##                    mpeg/source/mpeg_shared directory
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+noinst_LTLIBRARIES = libmpeg_shared
+
+libmpeg_shared_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libmpeg_shared_SOURCES = \
+        com.cpp \
+        fileio.cpp \
+        filters.cpp \
+        routine.cpp \
+        sendpt.cpp \
+        Video_ControlS.cpp \
+        Video_ControlC.cpp \
+        Audio_ControlS.cpp \
+        Audio_ControlC.cpp \
+        ReceiverS.cpp \
+        ReceiverC.cpp \
+        MMDevice_ExporterC.cpp \
+        MMDevice_ExporterS.cpp
+
+noinst_HEADERS = \
+        com.h \
+        fileio.h \
+        filters.h \
+        routine.h \
+        sendpt.h \
+        Video_ControlS.h \
+        Video_ControlC.h \
+        Audio_ControlS.h \
+        Audio_ControlC.h \
+        ReceiverS.h \
+        ReceiverC.h \
+        MMDevice_ExporterC.h \
+        MMDevice_ExporterS.h
+
+IDL_SOURCES = \
+        Audio_Control.idl \
+        MMDevice_Exporter.idl \
+        Receiver.idl \
+        Video_Control.idl
+
+BUILT_SOURCES = \
+        Video_ControlS.cpp \
+        Video_ControlS.h \
+        Video_ControlC.cpp \
+        Video_ControlC.h \
+        Audio_ControlS.cpp \
+        Audio_ControlS.h \
+        Audio_ControlC.cpp \
+        Audio_ControlC.h \
+        ReceiverS.cpp \
+        ReceiverS.h \
+        ReceiverC.cpp \
+        ReceiverC.h \
+        MMDevice_ExporterC.cpp \
+        MMDevice_ExporterC.h \
+        MMDevice_ExporterS.cpp \
+        MMDevice_ExporterS.h
+
+EXTRA_DIST = $(IDL_SOURCES)
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile.am
new file mode 100644
index 00000000000..01fd2ccd54f
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile.am
@@ -0,0 +1,66 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's AVStreams Tests -- mpeg/source/server directory
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+noinst_PROGRAMS = augmented_server server vs as
+
+augmented_server_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+augmented_server_SOURCES = \
+        Video_RepositoryC.cpp \
+        augmented_server.cpp \
+        Property_Exporter.cpp \
+        Machine_Properties.cpp \
+        Video_Repository.cpp
+
+server_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+server_SOURCES = \
+        server.cpp
+
+vs_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+vs_SOURCES = \
+        vs.cpp
+
+as_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+as_SOURCES = \
+        as.cpp
+
+noinst_HEADERS = \
+        Machine_Properties.h \
+        Property_Exporter.h \
+        Video_Repository.h \
+        as.h \
+        augmented_server.h \
+        server.h \
+        vs.h
+
+IDL_SOURCES = \
+        Video_Repository.idl
+
+BUILT_SOURCES = \
+        Video_RepositoryS.cpp
+        Video_RepositoryS.h
+        Video_RepositoryC.cpp
+        Video_RepositoryC.h
+
+EXTRA_DIST = $(IDL_SOURCES)
diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile.am b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile.am
new file mode 100644
index 00000000000..b828e4ffc7f
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile.am
@@ -0,0 +1,52 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's AVStreams Tests -- server_discovery directory
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+noinst_LTLIBRARIES = libavdemo
+
+libavdemo_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+libavdemo_shared_SOURCES = \
+        Server_Discovery.cpp \
+        Trader_Client.cpp \
+        main.cpp
+
+noinst_HEADERS = \
+        Server_0005fDiscovery_0005fUtil.h \
+        Trader_Client.h
+
+IDL_SOURCES = \
+        Video_Repository.idl
+
+JAVA_SOURCES = \
+        Queue.java \
+        Server_Discovery.java \
+        Server_Discovery_Browser.java \
+        Server_Discovery_Perf.java \
+        Server_Discovery_Selection.java \
+        Server_Discovery_Util.java \
+        Strip_Chart.java
+
+noinst_DATA = \
+        graph02.gif \
+        graph09.gif \
+        mmedia3.gif \
+        server01.gif \
+        server02.gif \
+        www1.gif
+
+EXTRA_DIST = AV_Demo README $(IDL_SOURCES) $(JAVA_SOURCES) $(noinst_DATA)
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile.am b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile.am
new file mode 100644
index 00000000000..47dfa79d6b1
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile.am
@@ -0,0 +1,35 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile for TAO's AVStreams Tests -- sfp directory
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+noinst_PROGRAMS = client server
+
+client_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+server_LDADD = \
+	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
+
+client_SOURCES = \
+        client.cpp
+
+server_SOURCES = \
+        server.cpp
+
+noinst_HEADERS = \
+        common.h
+
+EXTRA_DIST = README
diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am
new file mode 100644
index 00000000000..2b22bb1a699
--- /dev/null
+++ b/TAO/orbsvcs/tests/Makefile.am
@@ -0,0 +1,39 @@
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Top-level Makefile for TAO's ORB Services Tests
+##
+##---------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+SUBDIRS = \
+        AVStreams \
+        Concurrency \
+        CosEC_Basic \
+        CosEC_Multiple \
+        EC_Basic \
+        EC_Custom_Marshal \
+        EC_Mcast \
+        EC_Multiple \
+        EC_Throughput \
+        Event_Latency \
+        ImplRepo \
+        Logger \
+        Property \
+        Sched \
+        Sched_Conf \
+        Simple_Naming \
+        Simulator \
+        Time \
+        Trading
+
+noinst_SCRIPTS = start_services
+
+EXTRA_DIST = $(noinst_SCRIPTS)
diff --git a/TAO/tao-config.1.in b/TAO/tao-config.1.in
new file mode 100644
index 00000000000..6dad8e66486
--- /dev/null
+++ b/TAO/tao-config.1.in
@@ -0,0 +1,56 @@
+.\" Process this file with
+.\" groff -man -Tascii tao-config.1
+.\"
+.TH tao-config 1 "DECEMBER 1998" "Library Configuration" "User Manuals"
+.SH NAME
+tao-config \- Display TAO Library Configuration
+.SH SYNOPSIS
+.B tao-config 
+.I OPTION 
+.B [
+.I OPTION
+.B ... ] 
+.B [
+.I LIBRARY
+.B ]
+.SH DESCRIPTION
+.B tao-config
+is a script that is used to display what compiler flags and libraries were
+used when TAO was built.
+.SH OPTIONS
+.IP --version
+TAO version information
+.IP --help
+display help message and exit
+.IP --cxx
+C++ compiler used for compiling
+.IP --cxxflags
+C++ pre-processor and compiler flags
+.IP --libs
+library linking information
+.IP --libs-only-L
+the -L/-R part of
+.I --libs
+.IP --libs-only-l
+the -l part of 
+.I --libs
+.SH LIBRARY
+.I LIBRARY
+refers to the library for which the specified configuration is desired.  Valid
+libraries are:
+.IP orbsvcs
+the TAO ORB services library
+.IP tao
+the TAO library
+.SH FILES
+.I @libdir@/taoConf.sh
+.RS
+Additional TAO related library configuration information.
+.RE
+.SH BUGS
+No option to display which C++ compiler was used to compile TAO currently
+exists.
+.SH AUTHOR
+Ossama Othman <othman@astrosun.tn.cornell.edu>
+.SH "SEE ALSO"
+.BR ace-config (1)
diff --git a/TAO/tao-config.in b/TAO/tao-config.in
new file mode 100644
index 00000000000..53c654e8565
--- /dev/null
+++ b/TAO/tao-config.in
@@ -0,0 +1,209 @@
+#!/bin/sh
+#
+# $Id$
+
+set -e
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+
+bindir=@bindir@
+sbindir=@sbindir@
+libexecdir=@libexecdir@
+datadir=@datadir@
+sysconfdir=@sysconfdir@
+sharedstatedir=@sharedstatedir@
+localstatedir=@localstatedir@
+libdir=@libdir@
+infodir=@infodir@
+mandir=@mandir@
+includedir=@includedir@
+
+pkgdatadir=${datadir}/@PACKAGE@
+pkglibdir=${libdir}/@PACKAGE@
+pkgincludedir=${includedir}/@PACKAGE@
+
+usage()
+{
+    cat <<EOF
+Usage: tao-config [OPTIONS]... [LIBRARY]...
+
+Generic options
+  --version	output TAO version information
+  --help	display this help and exit
+
+Compilation support options
+  --cxx         print C++ compiler used for compiling
+  --cxxflags	print C++ pre-processor and compiler flags
+  --libs	print library linking information
+  --libs-only-L	only print the -L/-R part of --libs
+  --libs-only-l only print the -l part of --libs
+
+Install directories ace-libs was configured to
+  --prefix  --exec-prefix  --bindir  --sbindir  --libexecdir  --datadir
+  --sysconfdir  --sharedstatedir  --localstatedir  --libdir  --infodir
+  --mandir  --includedir
+
+Known values for LIBRARY are:
+
+    ace         (calls ace-config)
+    orbsvcs
+    tao
+
+If LIBRARY is none of these,
+    
+    ${libdir}/<LIBRARY>Conf.sh
+
+is looked in for the necessary information. 
+EOF
+
+    exit $1
+}
+
+if test $# -eq 0; then
+    usage 1
+fi
+
+cxx=false
+cxxflags=false
+libs_L=false
+libs_l=false
+
+while test $# -gt 0; do
+    case "$1" in
+    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+    *) optarg= ;;
+    esac
+
+    case $1 in
+    --version)
+	echo @PACKAGE@ @VERSION@
+	exit 0
+	;;
+    --exec-prefix)
+	echo $exec_prefix
+	exit 0
+	;;
+    --prefix)
+	echo $prefix
+	exit 0
+	;;
+    --*dir)
+	dirname=\$`echo $1 | sed -e 's,^--,,'`
+	dirname=`eval echo $dirname`
+	test -z "$dirname" && exit 1
+	echo $dirname
+	exit 0
+	;;
+    --help)
+	usage 0
+	;;
+    --cxx)
+        cxx=true
+        ;;
+    --cxxflags)
+       	cxxflags=true
+       	;;
+    --libs)
+       	libs_L=true
+	libs_l=true
+       	;;
+    --libs-only-L)
+	libs_L=true
+	;;
+    --libs-only-l)
+	libs_l=true
+	;;
+    --*)
+	usage 1
+	;;
+    ace)
+        # The ACE compiler should be the same as TAO's compiler!
+        the_compiler="`ace-config --cxx tao`"
+        the_libs="$the_libs `ace-config --libs ace`"
+        the_flags="$the_flags `ace-config --cxxflags ace`"
+	;;
+    tao)
+        the_compiler="@CXX@"
+       	the_libs="$the_libs @TAO_LIBDIR@ @TAO_LIBS@"
+  	the_flags="$the_flags @TAO_INCLUDEDIR@ @CXXFLAGS@"
+	;;
+    orbsvcs)
+        echo "Currently unsupported."
+        exit 1
+#      	the_libs="$the_libs @TAO_LIBDIR@ @ORBSVCS_LIBS@"
+#  	the_flags="$the_flags @TAO_INCLUDEDIR@ @CXXFLAGS@"
+	;;
+    *)
+	cnf_sh=${libdir}/${1}Conf.sh
+	if test -f ${cnf_sh}; then
+	    . ${cnf_sh}
+	    up_name=`echo $1 | tr a-z A-Z`
+            cnf_compiler=\$${up_name}_COMPILER
+	    cnf_libdir=\$${up_name}_LIBDIR
+	    cnf_libs=\$${up_name}_LIBS
+	    cnf_flags=\$${up_name}_INCLUDEDIR
+            the_compiler="`eval echo $cnf_compiler`"
+	    the_libs="$the_libs `eval echo $cnf_libdir` `eval echo $cnf_libs`"
+	    the_flags="$the_flags `eval echo $cnf_flags`"
+	else
+	    echo Unknown library \`$1\' 1>&2
+	fi
+	;;
+    esac
+    shift
+done
+
+if $cxx; then
+    all_flags="$the_compiler"
+fi
+
+if $cxxflags; then
+    all_flags="$all_flags $the_flags"
+fi
+
+if $libs_L || $libs_l; then
+    all_flags="$all_flags $the_libs"
+fi
+
+if test -z "$all_flags" || test "x$all_flags" = "x "; then
+    exit 1
+fi
+
+# Straight out any possible duplicates, but be careful to
+# get `-lfoo -lbar -lbaz' for `-lfoo -lbaz -lbar -lbaz'
+other_flags=
+lib_L_flags=
+rev_libs=
+for i in $all_flags; do
+    case "$i" in
+    # a library, save it for later, in reverse order
+    -l*) rev_libs="$i $rev_libs" ;;
+    -L*|-R*)
+	if $libs_L; then
+	    case " $lib_L_flags " in
+	    *\ $i\ *) ;;			# already there
+	    *) lib_L_flags="$lib_L_flags $i" ;;	# add it to output
+	    esac 
+	fi;;
+    *)
+	case " $other_flags " in
+	*\ $i\ *) ;;				# already there
+	*) other_flags="$other_flags $i" ;;	# add it to output
+        esac ;;
+    esac
+done
+
+ord_libs=
+if $libs_l; then
+    for i in $rev_libs; do
+	case " $ord_libs " in
+	*\ $i\ *) ;;			# already there
+	*) ord_libs="$i $ord_libs" ;;	# add it to output in reverse order
+	esac
+    done
+fi
+
+echo $other_flags $lib_L_flags $ord_libs
+
+exit 0
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
new file mode 100644
index 00000000000..4717b956454
--- /dev/null
+++ b/TAO/tao/Makefile.am
@@ -0,0 +1,244 @@
+##----------------------------------------------------------------------------
+##       $Id$
+##
+##       Makefile.am for TAO
+##----------------------------------------------------------------------------
+
+##
+##  Process this file with automake to create Makefile.in
+##
+
+## The number in AUTOMAKE_OPTIONS is the minimum required version automake
+## needed to process this file.
+AUTOMAKE_OPTIONS = 1.4
+
+INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+
+# Build a libtool library, libTAO.la for installation in libdir.
+lib_LTLIBRARIES = libTAO.la
+libTAO_la_SOURCES = \
+         Active_Object_Map.cpp  \
+         Any.cpp  \
+         CDR.cpp  \
+         Client_Strategy_Factory.cpp  \
+         Connect.cpp  \
+         CurrentC.cpp  \
+         CurrentS.cpp  \
+         DynAnyC.cpp  \
+         DynAnyS.cpp  \
+         DynAny_i.cpp  \
+         DynArray_i.cpp  \
+         DynEnum_i.cpp  \
+         DynSequence_i.cpp  \
+         DynStruct_i.cpp  \
+         DynUnion_i.cpp  \
+         Environment.cpp  \
+         Exception.cpp  \
+         Forwarding_Servant.cpp  \
+         GIOP.cpp  \
+         IIOP_Interpreter.cpp  \
+         IIOP_ORB.cpp  \
+         IIOP_Object.cpp  \
+         InconsistentTypeCodeC.cpp  \
+         Invocation.cpp  \
+         Managed_Types.cpp  \
+         Marshal.cpp  \
+         NVList.cpp  \
+         ORB.cpp  \
+         ORB_Core.cpp  \
+         Object.cpp  \
+         Object_KeyC.cpp  \
+         Operation_Table.cpp  \
+         POA.cpp  \
+         POAC.cpp  \
+         POAS.cpp  \
+         PolicyC.cpp  \
+         PolicyS.cpp  \
+         Principal.cpp  \
+         Request.cpp  \
+         Sequence.cpp  \
+         Servant_Base.cpp  \
+         Server_Request.cpp  \
+         Server_Strategy_Factory.cpp  \
+         Stub.cpp  \
+         TAO.cpp  \
+         TAO_Internal.cpp  \
+         Typecode.cpp  \
+         Typecode_Constants.cpp  \
+         Union.cpp  \
+         append.cpp  \
+         debug.cpp  \
+         decode.cpp  \
+         deep_free.cpp  \
+         default_client.cpp  \
+         default_server.cpp  \
+         encode.cpp  \
+         params.cpp  \
+         skip.cpp
+
+## The following is an excerpt from the "libtool" manual, written by
+## Gordon Matzigkeit:
+##
+## This flag accepts an argument of the form `current[:revision[:age]]'. So,
+## passing `-version-info 3:12:1' sets current to 3, revision to 12, and age
+## to 1. 
+## If either revision or age are omitted, they default to 0. Also note that
+## age must be less than or equal to the current interface number. 
+##
+## Here are a set of rules to help you update your library version
+## information: 
+##
+##     1.Start with version information of `0:0:0' for each libtool library. 
+##     2.Update the version information only immediately before a public
+##       release of your software. More frequent updates are unnecessary, and
+##       only guarantee that the current interface number gets larger faster. 
+##     3.If the library source code has changed at all since the last update,
+##       then increment revision (`c:r:a' becomes `c:r+1:a'). 
+##     4.If any interfaces have been added, removed, or changed since the last
+##       update, increment current, and set revision to 0. 
+##     5.If any interfaces have been added since the last public release, then
+##       increment age. 
+##     6.If any interfaces have been removed since the last public release,
+##       then set age to 0. 
+##
+## Never try to set the interface numbers so that they correspond to the
+## release number of your package. This is an abuse that only fosters
+## misunderstanding of the purpose of library versions. Instead, use the
+## `-release' flag (see section 6.4 Managing release information), but be
+## warned that every release of your package will not be binary compatibility
+## with any other release. 
+
+## The below "-version-info" isn't being used the way libtool intends
+## it to be used but we do it that way to make the version numbers
+## that TAO uses match those created by libtool from "-version-info."
+##libTAO_la_LDFLAGS = -version-info 2:41:2   ## 2-2=0 --> libTAO.so.0.2.41
+libTAO_la_LDFLAGS = -version-info @TAO_CURRENT@:@TAO_REVISION@:@TAO_AGE@
+
+## These are source files that are needed by the header files if the
+## ACE_TEMPLATES_REQUIRE_SOURCE or ACE_TEMPLATES_REQUIRE_PRAGMA
+## macro is defined.
+if TEMPLATES_REQUIRE_SOURCE
+TEMPLATE_FILES = \
+         DynUnion_i_T.cpp  \
+         ORB_Strategies_T.cpp  \
+         Sequence_T.cpp  \
+         poa_T.cpp  \
+         varout.cpp
+else
+TEMPLATE_FILES = 
+endif
+
+pkgincludedir = $(prefix)/include/tao
+pkginclude_HEADERS = \
+         Active_Object_Map.h  \
+         Active_Object_Map.i  \
+         Align.h  \
+         Any.h  \
+         Any.i  \
+         CDR.h  \
+         CDR.i  \
+         Client_Strategy_Factory.h  \
+         Connect.h  \
+         Connect.i  \
+         CurrentC.h  \
+         CurrentC.i  \
+         DynAnyC.h  \
+         DynAnyC.i  \
+         DynAny_i.h  \
+         DynArray_i.h  \
+         DynEnum_i.h  \
+         DynSequence_i.h  \
+         DynStruct_i.h  \
+         DynUnion_i.h  \
+         DynUnion_i_T.h  \
+         Environment.h  \
+         Environment.i  \
+         Exception.h  \
+         Exception.i  \
+         Forwarding_Servant.h  \
+         GIOP.h  \
+         GIOP.i  \
+         IIOP_Interpreter.h  \
+         IIOP_ORB.h  \
+         IIOP_ORB.i  \
+         IIOP_Object.h  \
+         IIOP_Object.i  \
+         InconsistentTypeCodeC.h  \
+         Invocation.h  \
+         Invocation.i  \
+         Managed_Types.h  \
+         Managed_Types.i  \
+         Marshal.h  \
+         Marshal.i  \
+         NVList.h  \
+         NVList.i  \
+         ORB.h  \
+         ORB.i  \
+         ORB_Core.h  \
+         ORB_Core.i  \
+         ORB_Strategies_T.h  \
+         ORB_Strategies_T.i  \
+         Object.h  \
+         Object.i  \
+         Object_KeyC.h  \
+         Object_KeyC.i  \
+         Object_Table.h  \
+         Object_Table.i  \
+         Operation_Table.h  \
+         POA.h  \
+         POA.i  \
+         POAC.h  \
+         POAC.i  \
+         POAS.h  \
+         POAS.i  \
+         POA_CORBA.h  \
+         PolicyC.h  \
+         PolicyC.i  \
+         Principal.h  \
+         Principal.i  \
+         Request.h  \
+         Request.i  \
+         Sequence.h  \
+         Sequence.i  \
+         Sequence_T.h  \
+         Sequence_T.i  \
+         Servant_Base.h  \
+	 Servant_Base.i  \
+         Server_Request.h  \
+         Server_Request.i  \
+         Server_Strategy_Factory.h  \
+         Stub.h  \
+         Stub.i  \
+         TAO.h  \
+         TAO_Internal.h  \
+         TAO_Internal.i  \
+         Timeprobe.h  \
+         Typecode.h  \
+         Typecode.i  \
+         Union.h  \
+         config.h  \
+         corba.h  \
+         debug.h  \
+         default_client.h  \
+         default_client.i  \
+         default_server.h  \
+         default_server.i  \
+         orbconf.h  \
+         params.h  \
+         params.i  \
+         poa_T.h  \
+         poa_macros.h  \
+         singletons.h  \
+         try_macros.h  \
+         varout.h  \
+         varout.i  \
+         $(TEMPLATE_FILES)
+## Make sure $(TEMPLATE_FILES) is in the above header list!
+
+
+## noinst_PROGRAMS = t-sizes
+
+## t_sizes_SOURCES = t-sizes.cpp
+
+EXTRA_DIST = \
+         t-sizes.cpp
diff --git a/TAO/taoConf.sh.in b/TAO/taoConf.sh.in
new file mode 100644
index 00000000000..60955b5ff8f
--- /dev/null
+++ b/TAO/taoConf.sh.in
@@ -0,0 +1,8 @@
+#
+# Configuration of the TAO distribution
+#
+
+TAO_COMPILER="@CXX@"
+TAO_LIBDIR="@TAO_LIBDIR@"
+TAO_INCLUDEDIR="@TAO_INCLUDEDIR@ @CXXFLAGS@"
+TAO_LIBS="@TAO_LIBS@"
author	Ossama Othman <ossama-othman@users.noreply.github.com>	1999-04-07 20:22:42 +0000
committer	Ossama Othman <ossama-othman@users.noreply.github.com>	1999-04-07 20:22:42 +0000
commit	90239344d42bdf5c22cdb2c4655febedf031cb5c (patch)
tree	6be1dac3126b665bbef648289f7f5e062a68da46
parent	e8494c8bed7970087c16a0a296898bcf93f74e2e (diff)
download	ATCD-90239344d42bdf5c22cdb2c4655febedf031cb5c.tar.gz