[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-120-g08b71d9

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=08b71d934beb67be2d2d190d05ae6402f75d12d2

The branch, master has been updated
       via  08b71d934beb67be2d2d190d05ae6402f75d12d2 (commit)
      from  eed743342cfa0ff8cc69666243233229e7417f8f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 08b71d934beb67be2d2d190d05ae6402f75d12d2
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Jan 30 21:40:57 2008 +0100

    * tests/subst3.test: New test.
    * tests/Makefile.am: Update.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                          |    3 +
 tests/Makefile.am                  |    1 +
 tests/Makefile.in                  |    1 +
 tests/{nobase.test => subst3.test} |  101 ++++++++++++++++++++++++------------
 4 files changed, 72 insertions(+), 34 deletions(-)
 copy tests/{nobase.test => subst3.test} (52%)

diff --git a/ChangeLog b/ChangeLog
index d07b135..becda79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-01-30  Ralf Wildenhues  <address@hidden>
 
+       * tests/subst3.test: New test.
+       * tests/Makefile.am: Update.
+
        * tests/instsh2.test: Split off testing of `install-sh -C' ...
        * tests/instsh3.test: ... to this new test, requiring non-root.
        * tests/Makefile.am: Adjust.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8405c7a..42a330f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -545,6 +545,7 @@ subpkg2.test \
 subpkg3.test \
 subst.test \
 subst2.test \
+subst3.test \
 substref.test \
 substre2.test \
 substtarg.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1bcb573..8a10b4b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -694,6 +694,7 @@ subpkg2.test \
 subpkg3.test \
 subst.test \
 subst2.test \
+subst3.test \
 substref.test \
 substre2.test \
 substtarg.test \
diff --git a/tests/nobase.test b/tests/subst3.test
similarity index 52%
copy from tests/nobase.test
copy to tests/subst3.test
index f65bb86..b0f5b43 100755
--- a/tests/nobase.test
+++ b/tests/subst3.test
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure nobase_* works.
+# Test installation with substitutions.  This test is based on nobase.test.
 
 required='gcc'
 . ./defs || exit 1
@@ -25,6 +25,18 @@ set -e
 cat >> configure.in <<'EOF'
 AC_PROG_CC
 AC_PROG_RANLIB
+if test -n "$doit"; then
+  AC_SUBST([basehdr], [sub/base.h])
+  AC_SUBST([nobasehdr], [sub/nobase.h])
+  AC_SUBST([basedata], [sub/base.dat])
+  AC_SUBST([nobasedata], [sub/nobase.dat])
+  AC_SUBST([basescript], [sub/base.sh])
+  AC_SUBST([nobasescript], [sub/nobase.sh])
+  AC_SUBST([baseprog], ['sub/base$(EXEEXT)'])
+  AC_SUBST([nobaseprog], ['sub/nobase$(EXEEXT)'])
+  AC_SUBST([baselib], [sub/libbase.a])
+  AC_SUBST([nobaselib], [sub/libnobase.a])
+fi
 AC_OUTPUT
 EOF
 
@@ -32,50 +44,38 @@ cat > Makefile.am << 'EOF'
 foodir = $(prefix)/foo
 fooexecdir = $(prefix)/foo
 
-foo_HEADERS = sub/base.h sub/base-gen.h
-nobase_foo_HEADERS = sub/nobase.h sub/nobase-gen.h
+foo_HEADERS = @basehdr@
+nobase_foo_HEADERS = @nobasehdr@
+EXTRA_HEADERS = sub/base.h sub/nobase.h
 
-dist_foo_DATA = sub/base.dat sub/base-gen.dat
-nobase_dist_foo_DATA = sub/nobase.dat sub/nobase-gen.dat
+dist_foo_DATA = @basedata@
+nobase_dist_foo_DATA = @nobasedata@
 
-dist_fooexec_SCRIPTS = sub/base.sh sub/base-gen.sh
-nobase_dist_fooexec_SCRIPTS = sub/nobase.sh sub/nobase-gen.sh
+dist_fooexec_SCRIPTS = @basescript@
+nobase_dist_fooexec_SCRIPTS = @nobasescript@
+EXTRA_SCRIPTS = sub/base.sh sub/nobase.sh
 
-fooexec_PROGRAMS = sub/base
-nobase_fooexec_PROGRAMS = sub/nobase
+fooexec_PROGRAMS = @baseprog@
+nobase_fooexec_PROGRAMS = @nobaseprog@
+EXTRA_PROGRAMS = sub/base sub/nobase
 sub_base_SOURCES = source.c
 sub_nobase_SOURCES = source.c
 
-fooexec_LIBRARIES = sub/libbase.a
-nobase_fooexec_LIBRARIES = sub/libnobase.a
+fooexec_LIBRARIES = @baselib@
+nobase_fooexec_LIBRARIES = @nobaselib@
+EXTRA_LIBRARIES = sub/libbase.a sub/libnobase.a
 sub_libbase_a_SOURCES = source.c
 sub_libnobase_a_SOURCES = source.c
 
-generated_files = sub/base-gen.h sub/nobase-gen.h sub/base-gen.dat \
-sub/nobase-gen.dat sub/base-gen.sh sub/nobase-gen.sh
-
-$(generated_files):
-       echo "generated file $@" > $@
-
-CLEANFILES = $(generated_files)
-
 test-install-data: install-data
        test   -f inst/foo/sub/nobase.h
        test ! -f inst/foo/nobase.h
-       test   -f inst/foo/sub/nobase-gen.h
-       test ! -f inst/foo/nobase-gen.h
        test   -f inst/foo/base.h
-       test   -f inst/foo/base-gen.h
        test   -f inst/foo/sub/nobase.dat
        test ! -f inst/foo/nobase.dat
-       test   -f inst/foo/sub/nobase-gen.dat
-       test ! -f inst/foo/nobase-gen.dat
        test   -f inst/foo/base.dat
-       test   -f inst/foo/base-gen.dat
        test ! -f inst/foo/sub/pnobase.sh
-       test ! -f inst/foo/sub/pnobase-gen.sh
        test ! -f inst/foo/pbase.sh
-       test ! -f inst/foo/pbase-gen.sh
        test ! -f inst/foo/sub/pnobase$(EXEEXT)
        test ! -f inst/foo/pbase$(EXEEXT)
        test ! -f inst/foo/sub/libnobase.a
@@ -84,16 +84,38 @@ test-install-data: install-data
 test-install-exec: install-exec
        test   -f inst/foo/sub/pnobase.sh
        test ! -f inst/foo/pnobase.sh
-       test   -f inst/foo/sub/pnobase-gen.sh
-       test ! -f inst/foo/pnobase-gen.sh
        test   -f inst/foo/pbase.sh
-       test   -f inst/foo/pbase-gen.sh
        test   -f inst/foo/sub/pnobase$(EXEEXT)
        test ! -f inst/foo/pnobase$(EXEEXT)
        test   -f inst/foo/pbase$(EXEEXT)
        test   -f inst/foo/sub/libnobase.a
        test ! -f inst/foo/libnobase.a
        test   -f inst/foo/libbase.a
+
+test-install-nothing-data: install-data
+       test ! -f inst/foo/sub/nobase.h
+       test ! -f inst/foo/nobase.h
+       test ! -f inst/foo/base.h
+       test ! -f inst/foo/sub/nobase.dat
+       test ! -f inst/foo/nobase.dat
+       test ! -f inst/foo/base.dat
+       test ! -f inst/foo/sub/pnobase.sh
+       test ! -f inst/foo/pbase.sh
+       test ! -f inst/foo/sub/pnobase$(EXEEXT)
+       test ! -f inst/foo/pbase$(EXEEXT)
+       test ! -f inst/foo/sub/libnobase.a
+       test ! -f inst/foo/libbase.a
+
+test-install-nothing-exec: install-exec
+       test ! -f inst/foo/sub/pnobase.sh
+       test ! -f inst/foo/pnobase.sh
+       test ! -f inst/foo/pbase.sh
+       test ! -f inst/foo/sub/pnobase$(EXEEXT)
+       test ! -f inst/foo/pnobase$(EXEEXT)
+       test ! -f inst/foo/pbase$(EXEEXT)
+       test ! -f inst/foo/sub/libnobase.a
+       test ! -f inst/foo/libnobase.a
+       test ! -f inst/foo/libbase.a
 EOF
 
 mkdir sub
@@ -119,26 +141,37 @@ rm -f install-sh
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a --copy
-./configure --prefix "`pwd`/inst" --program-prefix=p
+./configure --prefix "`pwd`/inst" --program-prefix=p doit=yes
 
 $MAKE
 $MAKE test-install-data
 $MAKE test-install-exec
 $MAKE uninstall
+$MAKE clean
 
 test `find inst/foo -type f -print | wc -l` = 0
 
-$MAKE install-strip
+./configure --prefix "`pwd`/inst" --program-prefix=p doit=
+
+$MAKE
+$MAKE test-install-nothing-data
+$MAKE test-install-nothing-exec
+$MAKE uninstall
+
 
 # Likewise, in a VPATH build.
 
-$MAKE uninstall
 $MAKE distclean
 mkdir build
 cd build
-../configure --prefix "`pwd`/inst" --program-prefix=p
+../configure --prefix "`pwd`/inst" --program-prefix=p doit=yes
 $MAKE
 $MAKE test-install-data
 $MAKE test-install-exec
 $MAKE uninstall
 test `find inst/foo -type f -print | wc -l` = 0
+
+../configure --prefix "`pwd`/inst" --program-prefix=p doit=
+$MAKE
+$MAKE test-install-nothing-data
+$MAKE test-install-nothing-exec


hooks/post-receive
--
GNU Automake