ChangeLogTag:Fri Feb 14 10:02:30 2003 Ossama Othman <ossama@uci.edu>

4 files changed, 85 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ac67b01516..a2c7ee373e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+Fri Feb 14 10:02:30 2003  Ossama Othman  <ossama@uci.edu>
+
+	* Makefile.am (all-local):
+
+	  Create a link to the $(top_srcdir)/bin directory if one doesn't
+	  exist.  It is needed for the automated regression tests we run.
+
+	  (distclean-local):
+
+	  Added this Automake recognized target.  It will clean up the
+	  `bin' link and accompanying stamp file if they exist.
+
+	* tests/Makefile.am (all-local):
+
+	  Create a stamp file to mark whether or not the scripts and data
+	  files are actually links to those in $(top_srcdir)/tests.
+
+	  (bin):
+
+	  Moved the rules in this target to all-local target in
+	  $(top_srcdir)/Makefile.am.  The link to the `bin' directory
+	  should be made in the top-level directory, not the `tests'
+	  directory.  This should address problems in running the
+	  automated regression tests.
+
+	  Removed this target.  It is longer needed.
+
+	  (distclean-local):
+
+	  Only delete the scripts and data files if the stamp file created
+	  by the all-local target exists.  Prevents those in the source
+	  directory from being erased once builds in the source directory
+	  are re-enabled.
+
 Tue Feb 11 14:27:08 2003  Ossama Othman  <ossama@uci.edu>
 
 	* tests/Makefile.am (all-local):
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 5ac67b01516..a2c7ee373e1 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,37 @@
+Fri Feb 14 10:02:30 2003  Ossama Othman  <ossama@uci.edu>
+
+	* Makefile.am (all-local):
+
+	  Create a link to the $(top_srcdir)/bin directory if one doesn't
+	  exist.  It is needed for the automated regression tests we run.
+
+	  (distclean-local):
+
+	  Added this Automake recognized target.  It will clean up the
+	  `bin' link and accompanying stamp file if they exist.
+
+	* tests/Makefile.am (all-local):
+
+	  Create a stamp file to mark whether or not the scripts and data
+	  files are actually links to those in $(top_srcdir)/tests.
+
+	  (bin):
+
+	  Moved the rules in this target to all-local target in
+	  $(top_srcdir)/Makefile.am.  The link to the `bin' directory
+	  should be made in the top-level directory, not the `tests'
+	  directory.  This should address problems in running the
+	  automated regression tests.
+
+	  Removed this target.  It is longer needed.
+
+	  (distclean-local):
+
+	  Only delete the scripts and data files if the stamp file created
+	  by the all-local target exists.  Prevents those in the source
+	  directory from being erased once builds in the source directory
+	  are re-enabled.
+
 Tue Feb 11 14:27:08 2003  Ossama Othman  <ossama@uci.edu>
 
 	* tests/Makefile.am (all-local):
diff --git a/Makefile.am b/Makefile.am
index 497e4812c70..ab8fd3643d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,6 +62,11 @@ confexec_DATA = aceConf.sh
 ## needed anyway.
 ACE_EXTRA_DIST = ChangeLogs bin docs m4
 
+## Automake recognized target.  Appends these rules to the "all"
+## target.
+all-local:
+	@test -d bin || ($(LN_S) $(top_srcdir)/bin bin && touch ace-bin-stamp)
+
 ## Clean up some additional files/directories possibly created during
 ## the configure script tests.
 clean-local:
@@ -80,3 +85,7 @@ dist-hook:
 	list=`find $(distdir) -type d -name CVS -print`; for p in $$list; do \
           rm -rf $$p; \
         done
+
+## Clean up files and directories created by this Makefile.
+distclean-local:
+	-test -f ace-bin-stamp && rm bin ace-bin-stamp
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0f6512f082c..ee67d816895 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -457,13 +457,11 @@ EXTRA_DIST = $(noinst_SCRIPTS) $(noinst_DATA)
 
 ## Automake recognized target.  Appends these rules to the "all"
 ## target.
-all-local: bin
+all-local:
 	@for p in $(noinst_SCRIPTS) $(noinst_DATA); do \
 	  test -f $$p \
 	  || $(LN_S) $(top_srcdir)/tests/$$p $$p; done
-
-bin:
-	@$(LN_S) $(top_srcdir)/bin $@
+	@touch tests-link-stamp
 
 ## Clean up template repositories, etc.
 clean-local:
@@ -471,6 +469,11 @@ clean-local:
 	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
 
 ## Clean up files and directories created by this Makefile.
+##   @todo Remove "bin" from the below list of files to remove.  It
+##         exists simply to clean up existing workspaces that may
+##         still have that link.  Also remove the "-f" option once
+##         "bin" is removed since it won't be needed after doing so.
 distclean-local:
-	-rm -f bin $(noinst_SCRIPTS) $(noinst_DATA)
+	-test -f tests-link-stamp \
+	   && rm -f $(noinst_SCRIPTS) $(noinst_DATA) tests-link-stamp bin
 	-rm -rf log