ChangeLogTag: Tue Dec 27 15:33:28 2005 J.T. Conklin <jtc@acorntoolworks.com>

2 files changed, 62 insertions, 22 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9d4bc84ae6b..5b383d59bf2 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Tue Dec 27 15:33:28 2005  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* Makefile.am:
+
+	  Remove DISTCLEANFILES definitions.  We no longer ship
+	  tao-config and tao-config.1.
+
+	* Makefile.am:
+
+	  Build examples and interop-tests subdirectories.
+
+	* Makefile.am:
+
+	  I accidently clobbered this file by checking in the MPC
+	  generated version.   Restore to revision 1.13, the last
+	  known good version.
+
 Tue Dec 27 15:11:18 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* Release
@@ -57,13 +74,6 @@ Tue Dec 27 11:34:29 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 	  directories.  This is too risky to complete within this beta
 	  cycle.
 
-	* tests/Makefile.am:
-
-	  Disable building CSD_Strategy_Tests subdirectory.
-	  These *.mpc files need major changes to support separate build
-	  directories.  This is too risky to complete within this beta
-	  cycle.
-
 	* examples/Load_Balancing/Makefile.am:
 	* examples/Load_Balancing_persistent/Makefile.am:
 	* examples/POA/Adapter_Activator/Makefile.am:
diff --git a/TAO/Makefile.am b/TAO/Makefile.am
index c9bf23fb7a4..3a9628ad79e 100644
--- a/TAO/Makefile.am
+++ b/TAO/Makefile.am
@@ -1,26 +1,56 @@
-##  Process this file with automake to create Makefile.in
+##---------------------------------------------------------------------------
+##       $Id$
+##
+##       Top-level Makefile for TAO
 ##
-## $Id$
+##---------------------------------------------------------------------------
+
 ##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
+##  Process this file with automake to create Makefile.in
 ##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
+
+AUTOMAKE_OPTIONS = foreign
+
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = -I m4 -I ../m4
 
 SUBDIRS = \
         TAO_IDL \
         tao \
-        orbsvcs \
-        examples \
+	orbsvcs \
+	examples \
         docs \
-        performance-tests \
-        interop-tests \
-        tests \
-        utils
+	performance-tests \
+	interop-tests \
+	utils
 
+## For some reason, automake doesn't include acconfig.h in the distribution
+EXTRA_DIST =  \
+  PROBLEM-REPORT-FORM \
+  VERSION \
+  COPYING.sun \
+  LICENSE.sun \
+  README.sun
 
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = -I m4 -I ../m4
-AUTOMAKE_OPTIONS = foreign
+## release:
+##         $(MAKE) dist distdir=$(PACKAGE)$(VERSION)
+release:
+	$(MAKE) dist
+
+## Directories to include in the distribution but which I am too lazy to
+## create Makefile.am files for.  A Makefile.am for these directories isn't
+## needed anyway.
+TAO_EXTRA_DIST = docs
+
+dist-hook:
+	(cd $(top_srcdir); tar cf - $(TAO_EXTRA_DIST)) | (cd $(distdir); \
+          tar xfBp -)
+	list=`find $(distdir) -type d -name CVS -print`; for p in $$list; do \
+          rm -rf $$p; \
+        done
 
+## Clean up some additional files/directories possibly created during
+## the configure script tests.
+clean-local:
+	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations