From 50503c94d7416880f72797fea3894e3784d9d20b Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Mon, 17 Nov 2003 15:49:06 +0000 Subject: [PATCH] * 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. --- ChangeLog | 14 ++++++++++++++ Makefile.am | 2 +- configure.ac | 9 +++++---- tests/Makefile.am | 5 +++++ 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a12622018..8beddb9c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2003-11-17 Gary V. Vaughan + + * 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 * ltmain.in: In compile mode, delay parsing of -shared, -static, diff --git a/Makefile.am b/Makefile.am index 89c6af06a..4ccffad5f 100644 --- 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 8e13a92d2..7fd4cae68 100644 --- 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 64d70eb9d..8fcca7331 100644 --- 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: -- 2.47.2