[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: 44-gary-dist-demo-dirs.patch
From: |
Gary V. Vaughan |
Subject: |
FYI: 44-gary-dist-demo-dirs.patch |
Date: |
Mon, 17 Nov 2003 15:53:38 +0000 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.5) Gecko/20030925 Thunderbird/0.3 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Applied to HEAD.
- --
~ ())_. Gary V. Vaughan gary@(lilith.warpmail.net|gnu.org)
~ ( '/ Research Scientist http://www.oranda.demon.co.uk ,_())____
~ / )= GNU Hacker http://www.gnu.org/software/libtool \' `&
`(_~)_ Tech' Author http://sources.redhat.com/autobook =`---d__/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQE/uO8CFRMICSmD1gYRAofTAJ9mNqQvfMUTeUHH60zxUQzvyTXBMgCgmWTc
SSkwWzqLPHQg9a1TImoC0kQ=
=e//T
-----END PGP SIGNATURE-----
Index: ChangeLog
from Gary V. Vaughan <address@hidden>
* 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.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.77
diff -u -p -u -r1.77 Makefile.am
--- Makefile.am 14 Nov 2003 17:31:23 -0000 1.77
+++ Makefile.am 17 Nov 2003 15:48:07 -0000
@@ -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
Index: configure.ac
===================================================================
RCS file: /cvsroot/libtool/libtool/configure.ac,v
retrieving revision 1.22
diff -u -p -u -r1.22 configure.ac
--- configure.ac 14 Nov 2003 11:12:21 -0000 1.22
+++ configure.ac 17 Nov 2003 15:48:07 -0000
@@ -80,14 +80,15 @@ if test x"${enable_ltdl_install+set}" !=
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])
Index: tests/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/Makefile.am,v
retrieving revision 1.35
diff -u -p -u -r1.35 Makefile.am
--- tests/Makefile.am 15 Oct 2003 11:01:11 -0000 1.35
+++ tests/Makefile.am 17 Nov 2003 15:48:07 -0000
@@ -73,6 +73,11 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$
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:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: 44-gary-dist-demo-dirs.patch,
Gary V. Vaughan <=