Tag
Hash :
b1fe8738
Author :
Date :
2003-01-21T18:02:34
* lib/am/distdir.am (top_distdir, distdir): Define these variables only in top level Makefile. Redefine $(top_distdir) as $(distdir). (distdir): Fix passing of $(top_distdir) to sub-makes. * automake.in (handle_dist): Do not define the DISTDIR and TOP_DISTDIR transformations. We don't need them anymore. * automake.texi (Dist): Reorder the dist-hook section, and move the DIST_SUBDIRS paragraph earlier. Document distdir and top_distdir. * tests/subpkg.test: Update to check for $(distdir) and $(top_distdir).
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101
#! /bin/sh
# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
#
# This file is part of GNU Automake.
#
# GNU Automake is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# GNU Automake is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with autoconf; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
# Check subpackage handling.
required=gcc
. ./defs || exit 1
set -e
cat >>configure.in <<'END'
AC_CONFIG_SUBDIRS([lib])
AC_PROG_CC
AC_OUTPUT
END
cat >Makefile.am <<'EOF'
SUBDIRS = lib
# Yes, This program is named LDADD. So what?
bin_PROGRAMS = LDADD
LDADD_LDADD = lib/liblib.a
# It's ok to override distdir.
distdir = subpack-1
# Make sure $(distdir) and $(top_distdir) work as expected.
dist-hook:
test -f $(distdir)/LDADD.c
test -f $(top_distdir)/LDADD.c
EOF
cat >LDADD.c <<'EOF'
int lib ();
int
main ()
{
return lib ();
}
EOF
mkdir lib
mkdir lib/src
cat >lib/configure.ac <<'EOF'
AC_INIT([lib], [2.3])
AM_INIT_AUTOMAKE
AC_PROG_CC
AC_PROG_RANLIB
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
EOF
cat >lib/Makefile.am <<'EOF'
noinst_LIBRARIES = liblib.a
liblib_a_SOURCES = src/x.c
dist-hook:
test ! -f $(distdir)/LDADD.c
test -f $(top_distdir)/LDADD.c
test -f $(distdir)/src/x.c
test ! -f $(top_distdir)/src/x.c
EOF
cat >lib/src/x.c <<'EOF'
int lib ()
{
return 0;
}
EOF
$ACLOCAL
$AUTOCONF
$AUTOMAKE
cd lib
$ACLOCAL
$AUTOCONF
$AUTOMAKE
cd ..
./configure
$MAKE distcheck
test -f subpack-1.tar.gz