* configure.ac (CONF_SUBDIRS): Make these relative to

tests/Makefile.am.
(DIST_MAKEFILE_LIST): Adjust to compensate for having removed the
`tests/' part in CONF_SUBDIRS.
* tests/Makefile.am (DIST_SUBDIRS): Distribute these directories.
(SUBDIRS): Set to `.', a NOP, to workaround an automake bug which
ignores DIST_SUBDIRS unless SUBDIRS is also set.
* Makefile.am (DIST_SUBDIRS): Don't try to distribute the tests
subdirectories from here, since the recursive automake dist rule
only works with direct child directories.  Defer to
tests/Makefile.am in this case.

diff --git a/ChangeLog b/ChangeLog
index a12622018b04a1c9e08cce2cc8d5b1ef486e1208..8beddb9c9fdec64903dcc80c7faddbdb558b95ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2003-11-17  Gary V. Vaughan  <gary@gnu.org>
+
+       * configure.ac (CONF_SUBDIRS): Make these relative to
+       tests/Makefile.am.
+       (DIST_MAKEFILE_LIST): Adjust to compensate for having removed the
+       `tests/' part in CONF_SUBDIRS.
+       * tests/Makefile.am (DIST_SUBDIRS): Distribute these directories.
+       (SUBDIRS): Set to `.', a NOP, to workaround an automake bug which
+       ignores DIST_SUBDIRS unless SUBDIRS is also set.
+       * Makefile.am (DIST_SUBDIRS): Don't try to distribute the tests
+       subdirectories from here, since the recursive automake dist rule
+       only works with direct child directories.  Defer to
+       tests/Makefile.am in this case.
+
 2003-11-15  Scott James Remnant  <scott@netsplit.com>
 
        * ltmain.in: In compile mode, delay parsing of -shared, -static,

diff --git a/Makefile.am b/Makefile.am
index 89c6af06a603dbc9c44daa9aa044982973eab3c5..4ccffad5f156c2d2cacecf5823835a4f651a0701 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ ACLOCAL_AMFLAGS  = -I m4
 
 BUILD_SUBDIRS = . libltdl doc tests
 SUBDIRS = $(BUILD_SUBDIRS)
-DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS)
+DIST_SUBDIRS = $(BUILD_SUBDIRS)
 
 aclocal_macros = m4/libtool.m4 m4/ltdl.m4
 

diff --git a/configure.ac b/configure.ac
index 8e13a92d2f3127391d359ca1aff66ace70b40249..7fd4cae68f09b77de7b146c08b2e11435eeb826d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,14 +80,15 @@ if test x"${enable_ltdl_install+set}" != xset; then
 fi
 AC_CONFIG_SUBDIRS([libltdl])
 
-# all subdirectories that are configured on demand, but that must be
-# included in the distribution
-CONF_SUBDIRS="tests/cdemo tests/demo tests/depdemo tests/f77demo tests/mdemo tests/mdemo2 tests/pdemo tests/tagdemo"
+# All subdirectories that are configured on demand, but that must be
+# included in the distribution.  This substitution is for tests/Makefile.am,
+# so the directory names are relative to that directory.
+CONF_SUBDIRS="cdemo demo depdemo f77demo mdemo mdemo2 pdemo tagdemo"
 AC_SUBST([CONF_SUBDIRS])
 
 DIST_MAKEFILE_LIST=
 for dir in $CONF_SUBDIRS; do
-  DIST_MAKEFILE_LIST="$DIST_MAKEFILE_LIST$dir/Makefile "
+  DIST_MAKEFILE_LIST="${DIST_MAKEFILE_LIST}tests/$dir/Makefile "
 done
 AC_SUBST([DIST_MAKEFILE_LIST])
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 64d70eb9db35239053f8177536d068faa1ab1a8e..8fcca733195aeb29638063f1e85e64edcab1b043 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -73,6 +73,11 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
        OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" FFLAGS="$(FFLAGS)"
 
 EXTRA_DIST = defs $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS)
+DIST_SUBDIRS = $(CONF_SUBDIRS)
+
+# FIXME: Automake-1.7b (at least) only honours DIST_SUBDIRS if SUBDIRS is
+#        also set.  Remove this line when that bug is fixed.
+SUBDIRS = .
 
 # We need to remove any files that the above tests created.
 clean-local: