automake
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

71-amdep-uses-if.patch


From: Akim Demaille
Subject: 71-amdep-uses-if.patch
Date: Mon, 19 Mar 2001 10:22:40 +0100

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        Use AM_CONDITIONAL and if/endif for AMDEP.

        * m4/depend.m4 (AM_DEP_TRACK): Use AM_CONDITIONAL to define AMDEP.
        * automake.in (&add_depend2): Transform %AMDEP% into `AMDEP' (leading
        to a configure time if/endif), or to `FALSE' (static removal of
        the code).
        (&handle_dependencies): Adjust to use `AMDEP_TRUE'.
        * depend2.am: Use if/endif.

        Adjust the 101 tests that use dependencies so that they
        properly invoke aclocal before automake.  They need to `see'
        `AM_CONDITIONAL([AMDEP], ...)'.

Index: automake.in
--- automake.in Wed, 14 Mar 2001 22:57:29 +0100 akim (am/f/39_automake.i 1.191 
755)
+++ automake.in Wed, 14 Mar 2001 23:00:37 +0100 akim (am/f/39_automake.i 1.191 
755)
@@ -3043,7 +3043,7 @@ sub add_depend2
     my %transform = ('PFX'  => $pfx,
                     'FPFX' => $fpfx,
                     'LIBTOOL' => $seen_libtool,
-                    'AMDEP'   => $use_dependencies);
+                    'AMDEP'   => $use_dependencies ? 'AMDEP' : 'FALSE');

     # This function can be called even when we don't want dependency
     # tracking.  This happens when we need an explicit rule for some
@@ -3139,7 +3139,7 @@ sub handle_dependencies
            # We define this as a conditional variable because BSD
            # make can't handle backslashes for continuing comments on
            # the following line.
-           &define_pretty_variable ('DEP_FILES', 'AMDEP', @deplist);
+           &define_pretty_variable ('DEP_FILES', 'AMDEP_TRUE', @deplist);

            # Generate each `include' individually.  Irix 6 make will
            # not properly include several files resulting from a
@@ -3148,7 +3148,7 @@ sub handle_dependencies
            $output_rules .= "\n";
            foreach my $iter (@deplist)
            {
-               $output_rules .= "address@hidden@address@hidden@ " . $iter . 
"\n";
+               $output_rules .= '@AMDEP_TRUE@@_am_include@ ' . $iter . "\n";
            }

            $output_rules .= &file_contents ('depend');
Index: depend2.am
--- depend2.am Sat, 10 Mar 2001 19:30:41 +0100 akim (am/g/43_depend2.am 1.9 644)
+++ depend2.am Wed, 14 Mar 2001 23:00:37 +0100 akim (am/g/43_depend2.am 1.9 644)
@@ -21,25 +21,38 @@
 ## - once per language for generic compilation rules
 ## - once for each file which requires specific flags.

address@hidden@%FPFX%DEPMODE = @%FPFX%DEPMODE@
+## Note it is on purpose we wrote `if %AMDEP%', since %AMDEP% becomes
+## '@AMDEP_TRUE@' if dependencies are to be used, otherwise FALSE.
+
+if %AMDEP%
+?GENERIC?%FPFX%DEPMODE = @%FPFX%DEPMODE@
+endif %AMDEP%

 ?GENERIC?%EXT%.o:
 ?!GENERIC?%OBJ%: %SOURCE%
address@hidden@ source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
address@hidden@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' 
@AMDEPBACKSLASH@
address@hidden@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+if %AMDEP%
+       source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@
+       depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' 
@AMDEPBACKSLASH@
+       $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif %AMDEP%
        %COMPILE% -c -o %OBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%

-?LIBTOOL??GENERIC?%EXT%.lo:
-?LIBTOOL??!GENERIC?%LTOBJ%: %SOURCE%
address@hidden@ source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
address@hidden@ depfile='$(DEPDIR)/%BASE%.Plo' 
tmpdepfile='$(DEPDIR)/%BASE%.TPlo' @AMDEPBACKSLASH@
address@hidden@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
-?LIBTOOL?      %LTCOMPILE% -c -o %LTOBJ% `test -f %SOURCE% || echo 
'$(srcdir)/'`%SOURCE%
+if %?LIBTOOL?%
+?GENERIC?%EXT%.lo:
+?!GENERIC?%LTOBJ%: %SOURCE%
+if  %AMDEP%
+       source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
+       depfile='$(DEPDIR)/%BASE%.Plo' tmpdepfile='$(DEPDIR)/%BASE%.TPlo' 
@AMDEPBACKSLASH@
+       $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif  %AMDEP%
+       %LTCOMPILE% -c -o %LTOBJ% `test -f %SOURCE% || echo 
'$(srcdir)/'`%SOURCE%
+endif %?LIBTOOL?%

 ?GENERIC?%EXT%.obj:
 ?!GENERIC?%OBJOBJ%: %SOURCE%
address@hidden@ source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
address@hidden@ depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' 
@AMDEPBACKSLASH@
address@hidden@ $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+if %AMDEP%
+       source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@
+       depfile='$(DEPDIR)/%BASE%.Po' tmpdepfile='$(DEPDIR)/%BASE%.TPo' 
@AMDEPBACKSLASH@
+       $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
+endif %AMDEP%
        %COMPILE% -c -o %OBJOBJ% `cygpath -w %SOURCE%`
Index: m4/depend.m4
--- m4/depend.m4 Fri, 09 Feb 2001 04:02:17 +0100 akim (am/f/27_depend.m4 1.4 
644)
+++ m4/depend.m4 Wed, 14 Mar 2001 23:00:37 +0100 akim (am/f/27_depend.m4 1.4 
644)
@@ -111,22 +111,11 @@ AC_DEFUN([AM_DEP_TRACK],
 [AC_ARG_ENABLE(dependency-tracking,
 [  --disable-dependency-tracking Speeds up one-time builds
   --enable-dependency-tracking  Do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" = xno; then
-  AMDEP="#"
-else
+if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
-  if test ! -f "$am_depcomp"; then
-    AMDEP="#"
-  else
-    AMDEP=
-  fi
-fi
-AC_SUBST(AMDEP)
-if test -z "$AMDEP"; then
   AMDEPBACKSLASH='\'
-else
-  AMDEPBACKSLASH=
 fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 pushdef([subst], defn([AC_SUBST]))
 subst(AMDEPBACKSLASH)
 popdef([subst])
Index: tests/ansi2.test
--- tests/ansi2.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/e/39_ansi2.test 
1.1 775)
+++ tests/ansi2.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/e/39_ansi2.test 
1.1 775)
@@ -17,6 +17,7 @@
 : > ansi2knr.c
 : > ansi2knr.1

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '^all[-a-z]*:.*ANSI2KNR' Makefile.in
Index: tests/ansi4.test
--- tests/ansi4.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/e/37_ansi4.test 
1.1 775)
+++ tests/ansi4.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/e/37_ansi4.test 
1.1 775)
@@ -21,6 +21,7 @@
 : > ansi2knr.c
 : > hello.c

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 fgrep 'ansi2knr.$(' Makefile.in || exit 1
Index: tests/backsl.test
--- tests/backsl.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/e/35_backsl.tes 
1.1 775)
+++ tests/backsl.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/e/35_backsl.tes 
1.1 775)
@@ -13,6 +13,7 @@
    frob
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '^_SOURCE' Makefile.in && exit 1
Index: tests/badprog.test
--- tests/badprog.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/e/32_badprog.te 
1.1 775)
+++ tests/badprog.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/e/32_badprog.te 
1.1 775)
@@ -14,4 +14,5 @@
 a_b_SOURCES = ab.c
 END

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/canon.test
--- tests/canon.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/e/30_canon.test 
1.1 775)
+++ tests/canon.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/e/30_canon.test 
1.1 775)
@@ -11,5 +11,6 @@
 sniff-glue_SOURCES = sg.c
 END

+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0
Index: tests/canon3.test
--- tests/canon3.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/e/28_canon3.tes 
1.1 775)
+++ tests/canon3.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/e/28_canon3.tes 
1.1 775)
@@ -14,6 +14,7 @@

 : > perm-number.c

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep 'perm_number\.c' Makefile.in && exit 1
Index: tests/canon4.test
--- tests/canon4.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/e/27_canon4.tes 
1.1 775)
+++ tests/canon4.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/e/27_canon4.tes 
1.1 775)
@@ -14,6 +14,7 @@
 libx_y_a_SOURCES = xy.c
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '^libx-y.*=' Makefile.in && exit 1
Index: tests/canon5.test
--- tests/canon5.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/e/26_canon5.tes 
1.1 775)
+++ tests/canon5.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/e/26_canon5.tes 
1.1 775)
@@ -12,6 +12,7 @@
 123test_SOURCES = 123.c
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 cat > Makefile.am << 'END'
Index: tests/comment2.test
--- tests/comment2.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/e/13_comment2.t 1.1 775)
+++ tests/comment2.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/e/13_comment2.t 1.1 775)
@@ -13,6 +13,7 @@
 bin_PROGRAMS = sim_products receive_th receive_pos # image_proc
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '^image_proc' Makefile.in && exit 1
Index: tests/compile_f_c_cxx.test
--- tests/compile_f_c_cxx.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/e/12_compile_f_ 1.1 775)
+++ tests/compile_f_c_cxx.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/e/12_compile_f_ 1.1 775)
@@ -23,6 +23,7 @@
 : > bar.c
 : > baz.cc

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1


Index: tests/cond3.test
--- tests/cond3.test Sat, 10 Mar 2001 11:44:56 +0100 akim (am/e/8_cond3.test 
1.3 775)
+++ tests/cond3.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/e/8_cond3.test 
1.3 775)
@@ -38,6 +38,7 @@
 targ_SOURCES = $(SONE) $(STWO) $(STHREE)
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 # `b top' so that
Index: tests/cond4.test
--- tests/cond4.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/e/7_cond4.test 
1.1 775)
+++ tests/cond4.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/e/7_cond4.test 
1.1 775)
@@ -26,6 +26,7 @@
 targ_SOURCES = main.c $(OPT1) $(OPT2)
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 test "`grep TWO_FALSE Makefile.in | wc -l`" -eq 2
Index: tests/cond5.test
--- tests/cond5.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/e/6_cond5.test 
1.1 775)
+++ tests/cond5.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/e/6_cond5.test 
1.1 775)
@@ -28,6 +28,7 @@

 # The bug is that automake hangs.  So we give it a few seconds and
 # then kill it.
+$ACLOCAL || exit 1
 $AUTOMAKE &
 pid=$!

Index: tests/cond8.test
--- tests/cond8.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/e/3_cond8.test 
1.1 775)
+++ tests/cond8.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/e/3_cond8.test 
1.1 775)
@@ -16,4 +16,5 @@
 endif
 END

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/condlib.test
--- tests/condlib.test Sat, 17 Feb 2001 17:56:59 +0100 akim (am/h/23_condlib.te 
1.1 755)
+++ tests/condlib.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/h/23_condlib.te 
1.1 755)
@@ -21,6 +21,7 @@
 BUILT_SOURCES = $(nodist_librsaref_a_SOURCES)
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 fgrep librsaref.a.c Makefile.in && exit 1
Index: tests/conf2.test
--- tests/conf2.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/d/49_conf2.test 
1.1 775)
+++ tests/conf2.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/49_conf2.test 
1.1 775)
@@ -21,4 +21,5 @@
 : > config.h.in
 : > two.h.in

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/confh4.test
--- tests/confh4.test Mon, 19 Feb 2001 02:58:32 +0100 akim (am/d/44_confh4.tes 
1.2 775)
+++ tests/confh4.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/44_confh4.tes 
1.2 775)
@@ -26,6 +26,7 @@
 : > include/Makefile.am
 : > include/config.h.in

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 egrep '^DEFS =.* -I(\.|\$\(top_builddir\))/include' Makefile.in
Index: tests/config.test
--- tests/config.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/d/43_config.tes 
1.1 775)
+++ tests/config.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/43_config.tes 
1.1 775)
@@ -22,6 +22,7 @@
 mkdir subdir
 : > subdir/config.h.in

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '^subdir/config.h:' Makefile.in
Index: tests/confincl.test
--- tests/confincl.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/d/42_confincl.t 1.1 775)
+++ tests/confincl.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/d/42_confincl.t 1.1 775)
@@ -14,6 +14,7 @@
 bin_PROGRAMS = fred
 EOF

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 if grep '@CONFIG_INCLUDE_SPEC@' Makefile.in; then
Index: tests/confsub.test
--- tests/confsub.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/d/41_confsub.te 
1.1 775)
+++ tests/confsub.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/41_confsub.te 
1.1 775)
@@ -29,6 +29,7 @@

 mv depcomp subdir

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 # Make sure subdir Makefile.in doesn't itself look in the subdir.
Index: tests/cxxansi.test
--- tests/cxxansi.test Wed, 31 Jan 2001 00:08:51 +0100 akim (am/h/12_cxxansi.te 
1.1 755)
+++ tests/cxxansi.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/h/12_cxxansi.te 
1.1 755)
@@ -22,6 +22,7 @@
 : > doe.C
 : > jane.C

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 fgrep '$U' Makefile.in && exit 1
Index: tests/cxxlibobj.test
--- tests/cxxlibobj.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/d/36_cxxlibobj. 1.1 775)
+++ tests/cxxlibobj.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/d/36_cxxlibobj. 1.1 775)
@@ -20,6 +20,7 @@
 : > doe.C
 : > jane.C

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep CC Makefile.in
Index: tests/cxxlink.test
--- tests/cxxlink.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/d/35_cxxlink.te 
1.1 775)
+++ tests/cxxlink.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/35_cxxlink.te 
1.1 775)
@@ -17,6 +17,7 @@
 : > lava.c
 : > lamp.cxx

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 # Look for this macro not at the beginning of any line; that will have
Index: tests/cxxnoc.test
--- tests/cxxnoc.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/d/34_cxxnoc.tes 
1.1 775)
+++ tests/cxxnoc.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/34_cxxnoc.tes 
1.1 775)
@@ -16,6 +16,7 @@
 : > doe.C
 : > jane.C

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep CC Makefile.in | grep -v MKDEP && exit 1
Index: tests/cxxo.test
--- tests/cxxo.test Sun, 04 Mar 2001 20:02:14 +0100 akim (am/d/33_cxxo.test 1.2 
775)
+++ tests/cxxo.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/33_cxxo.test 1.2 
775)
@@ -14,6 +14,7 @@

 : > doe.C

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 fgrep 'doe.$(OBJEXT)' Makefile.in
Index: tests/cygwin32.test
--- tests/cygwin32.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/d/32_cygwin32.t 1.1 775)
+++ tests/cygwin32.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/d/32_cygwin32.t 1.1 775)
@@ -19,6 +19,7 @@
 : > www.c
 : > xtra.c

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '^CYGWIN' Makefile.in && exit 1
Index: tests/defun2.test
--- tests/defun2.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/d/29_defun2.tes 
1.1 775)
+++ tests/defun2.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/29_defun2.tes 
1.1 775)
@@ -20,4 +20,5 @@ AC_DEFUN([AC_FUNC_GETLOADAVG],

 : > memcmp.c

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/depend.test
--- tests/depend.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/d/25_depend.tes 
1.1 775)
+++ tests/depend.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/25_depend.tes 
1.1 775)
@@ -14,6 +14,7 @@
    fred.c
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 # In this case we no longer expect to find DEP_FILES.
Index: tests/depend3.test
--- tests/depend3.test Sun, 11 Mar 2001 10:13:22 +0100 akim (am/d/24_depend3.te 
1.2 775)
+++ tests/depend3.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/24_depend3.te 
1.2 775)
@@ -33,4 +33,5 @@
 TerraVision_DEPENDENCIES = $(DEPS)
 END

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/discover.test
--- tests/discover.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/d/23_discover.t 1.1 775)
+++ tests/discover.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/d/23_discover.t 1.1 775)
@@ -24,5 +24,6 @@

 : > fsusage.c

+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0
Index: tests/double.test
--- tests/double.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/d/21_double.tes 
1.1 775)
+++ tests/double.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/21_double.tes 
1.1 775)
@@ -11,4 +11,5 @@
 bin_PROGRAMS = spice nutmeg help sconvert multidec nutmeg
 END

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/empty2.test
--- tests/empty2.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/d/16_empty2.tes 
1.1 775)
+++ tests/empty2.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/16_empty2.tes 
1.1 775)
@@ -14,6 +14,7 @@
 pavel_SOURCES =
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep 'pavel\.[co]' Makefile.in && exit 1
Index: tests/empty3.test
--- tests/empty3.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/d/15_empty3.tes 
1.1 775)
+++ tests/empty3.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/15_empty3.tes 
1.1 775)
@@ -12,6 +12,7 @@
 bin_PROGRAMS = pavel
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep 'pavel\.[co]' Makefile.in
Index: tests/empty4.test
--- tests/empty4.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/d/14_empty4.tes 
1.1 775)
+++ tests/empty4.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/14_empty4.tes 
1.1 775)
@@ -18,6 +18,7 @@
 zoo_LDADD = $(zoo_DEPENDENCIES)
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 fgrep zoo. Makefile.in && exit 1
 exit 0
Index: tests/exsource.test
--- tests/exsource.test Sat, 17 Feb 2001 17:56:59 +0100 akim 
(am/d/10_exsource.t 1.3 755)
+++ tests/exsource.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/d/10_exsource.t 1.3 755)
@@ -27,6 +27,7 @@
 : > www.c
 : > xtra.c

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '@_am_include@ .*/xtra\.P' Makefile.in
Index: tests/ext.test
--- tests/ext.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/d/9_ext.test 1.1 
775)
+++ tests/ext.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/9_ext.test 1.1 
775)
@@ -14,6 +14,7 @@
 foo_SOURCES = 1.f 2.for 3.f90 4.F 5.r 6.m
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 for ext in f for f90 F r m
Index: tests/extra.test
--- tests/extra.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/d/8_extra.test 
1.1 775)
+++ tests/extra.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/d/8_extra.test 
1.1 775)
@@ -16,6 +16,7 @@
 EXTRA_PROGRAMS = zardoz
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep "^zardoz" Makefile.in || exit 1
Index: tests/header.test
--- tests/header.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/47_header.tes 
1.1 755)
+++ tests/header.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/47_header.tes 
1.1 755)
@@ -24,6 +24,7 @@
 : > joe.c
 : > qq.h

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep 'address@hidden' Makefile.in && exit 1
Index: tests/implicit.test
--- tests/implicit.test Sun, 04 Mar 2001 20:02:14 +0100 akim 
(am/c/46_implicit.t 1.2 775)
+++ tests/implicit.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/c/46_implicit.t 1.2 775)
@@ -13,6 +13,7 @@
 noinst_PROGRAMS = libapp_1
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '^libapp_1_OBJECTS' Makefile.in | fgrep '.$(OBJEXT)'
Index: tests/interp.test
--- tests/interp.test Sun, 04 Mar 2001 20:02:14 +0100 akim (am/c/33_interp.tes 
1.2 775)
+++ tests/interp.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/33_interp.tes 
1.2 775)
@@ -14,6 +14,7 @@
 qqq_SOURCES = $(s1)
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 fgrep 'z.$(OBJEXT)' Makefile.in
Index: tests/interp2.test
--- tests/interp2.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/32_interp2.te 
1.1 775)
+++ tests/interp2.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/32_interp2.te 
1.1 775)
@@ -17,4 +17,5 @@
 x_LDADD = $(X_EXTRA_LIBS)
 END

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/ldadd.test
--- tests/ldadd.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/28_ldadd.test 
1.1 775)
+++ tests/ldadd.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/28_ldadd.test 
1.1 775)
@@ -30,5 +30,6 @@
 : > config.sub
 : > q.c

+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0
Index: tests/ldflags.test
--- tests/ldflags.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/27_ldflags.te 
1.1 755)
+++ tests/ldflags.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/27_ldflags.te 
1.1 755)
@@ -33,4 +33,5 @@
 : > config.sub
 : > q.c

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/lex.test
--- tests/lex.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/26_lex.test 1.1 
775)
+++ tests/lex.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/26_lex.test 1.1 
775)
@@ -17,6 +17,7 @@

 : > joe.l

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '\$(LEX)' Makefile.in
Index: tests/lex2.test
--- tests/lex2.test Tue, 06 Mar 2001 00:39:56 +0100 akim (am/c/25_lex2.test 1.2 
775)
+++ tests/lex2.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/25_lex2.test 1.2 
775)
@@ -18,5 +18,6 @@

 : > joe.l

+$ACLOCAL || exit 1
 $AUTOMAKE --Wno-error 2> output || exit 1
 test -n "`cat output`"
Index: tests/lex3.test
--- tests/lex3.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/24_lex3.test 1.1 
775)
+++ tests/lex3.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/24_lex3.test 1.1 
775)
@@ -18,6 +18,7 @@

 : > joe.l

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 fgrep joel Makefile.in && exit 1
Index: tests/lex4.test
--- tests/lex4.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/23_lex4.test 1.1 
775)
+++ tests/lex4.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/23_lex4.test 1.1 
775)
@@ -18,6 +18,7 @@

 : > joe.ll

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 fgrep joe.Po Makefile.in
Index: tests/libobj.test
--- tests/libobj.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/22_libobj.tes 
1.1 775)
+++ tests/libobj.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/22_libobj.tes 
1.1 775)
@@ -28,4 +28,5 @@
 : > fsusage.c
 : > mountlist.c

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/libobj10.test
--- tests/libobj10.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/c/12_libobj10.t 1.1 775)
+++ tests/libobj10.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/c/12_libobj10.t 1.1 775)
@@ -23,6 +23,7 @@
 libfoo_a_LIBADD = @LIBOBJS@
 END

+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1

 echo 'BUILT_SOURCES = foo.c' >> Makefile.am
Index: tests/libobj2.test
--- tests/libobj2.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/21_libobj2.te 
1.1 775)
+++ tests/libobj2.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/21_libobj2.te 
1.1 775)
@@ -30,6 +30,7 @@

 mv depcomp subdir

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep 'fsusage\.c' subdir/Makefile.in
Index: tests/libobj4.test
--- tests/libobj4.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/19_libobj4.te 
1.1 775)
+++ tests/libobj4.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/19_libobj4.te 
1.1 775)
@@ -14,4 +14,5 @@
 AC_REPLACE_FUNCS(foo)
 END

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/libobj5.test
--- tests/libobj5.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/18_libobj5.te 
1.1 775)
+++ tests/libobj5.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/18_libobj5.te 
1.1 775)
@@ -18,5 +18,6 @@

 : > foo.c

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 fgrep foo.c Makefile.in
Index: tests/libobj6.test
--- tests/libobj6.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/17_libobj6.te 
1.1 775)
+++ tests/libobj6.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/17_libobj6.te 
1.1 775)
@@ -27,4 +27,5 @@
 : > fsusage.c
 : > mountlist.c

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/libobj7.test
--- tests/libobj7.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/16_libobj7.te 
1.1 775)
+++ tests/libobj7.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/16_libobj7.te 
1.1 775)
@@ -27,6 +27,7 @@
 : > dirname.c
 : > strsignal.c

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 sed -n -e ': again
Index: tests/libobj8.test
--- tests/libobj8.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/14_libobj8.te 
1.1 775)
+++ tests/libobj8.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/14_libobj8.te 
1.1 775)
@@ -33,6 +33,7 @@
 : > ansi2knr.1
 : > ansi2knr.c

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep 'strsignal_.c:' Makefile.in
Index: tests/libobj9.test
--- tests/libobj9.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/13_libobj9.te 
1.1 775)
+++ tests/libobj9.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/13_libobj9.te 
1.1 775)
@@ -27,4 +27,5 @@

 : > mountlist.c

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
Index: tests/library.test
--- tests/library.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/11_library.te 
1.1 775)
+++ tests/library.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/11_library.te 
1.1 775)
@@ -17,4 +17,5 @@
 libfoo_a_DEPENDENCIES = libzot.a
 END

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/link_c_cxx.test
--- tests/link_c_cxx.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/c/10_link_c_cxx 1.1 775)
+++ tests/link_c_cxx.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/c/10_link_c_cxx 1.1 775)
@@ -18,6 +18,7 @@
 : > lava.c
 : > lamp.cxx

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1


Index: tests/link_f_c.test
--- tests/link_f_c.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/c/9_link_f_c.t 
1.1 775)
+++ tests/link_f_c.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/c/9_link_f_c.t 
1.1 775)
@@ -18,6 +18,7 @@
 : > lava.c
 : > lamp.f

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1


Index: tests/link_f_c_cxx.test
--- tests/link_f_c_cxx.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/c/8_link_f_c_c 1.1 775)
+++ tests/link_f_c_cxx.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/c/8_link_f_c_c 1.1 775)
@@ -20,6 +20,7 @@
 : > lamp.cxx
 : > lamp2.f

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1


Index: tests/link_f_cxx.test
--- tests/link_f_cxx.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/c/7_link_f_cxx 1.1 775)
+++ tests/link_f_cxx.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/c/7_link_f_cxx 1.1 775)
@@ -18,6 +18,7 @@
 : > lava.cxx
 : > lamp.f

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1


Index: tests/listval.test
--- tests/listval.test Wed, 31 Jan 2001 00:08:51 +0100 akim (am/h/11_listval.te 
1.1 755)
+++ tests/listval.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/h/11_listval.te 
1.1 755)
@@ -23,4 +23,5 @@
 : > config.guess
 : > config.sub

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/ltlibobjs.test
--- tests/ltlibobjs.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/c/4_ltlibobjs. 1.1 775)
+++ tests/ltlibobjs.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/c/4_ltlibobjs. 1.1 775)
@@ -21,4 +21,5 @@
 : > config.guess
 : > config.sub

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/nodep.test
--- tests/nodep.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/b/49_nodep.test 
1.1 775)
+++ tests/nodep.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/b/49_nodep.test 
1.1 775)
@@ -19,6 +19,7 @@

 : > y.c

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '%' Makefile.in && exit 1
Index: tests/nodist.test
--- tests/nodist.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/b/47_nodist.tes 
1.1 775)
+++ tests/nodist.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/b/47_nodist.tes 
1.1 775)
@@ -18,6 +18,7 @@
 : > b.c
 : > c.c

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '^am_eyeball_OBJECTS' Makefile.in || exit 1
Index: tests/nostdinc.test
--- tests/nostdinc.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/b/45_nostdinc.t 1.1 775)
+++ tests/nostdinc.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/b/45_nostdinc.t 1.1 775)
@@ -14,6 +14,7 @@
 foo_SOURCES = foo.c
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 fgrep -e '-I.' Makefile.in && exit 1
Index: tests/number.test
--- tests/number.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/b/44_number.tes 
1.1 775)
+++ tests/number.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/b/44_number.tes 
1.1 775)
@@ -13,6 +13,7 @@
 bin_PROGRAMS = zardoz
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 count=`grep -c '^zardoz_OBJECTS' Makefile.in`
Index: tests/objc.test
--- tests/objc.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/b/43_objc.test 1.1 
775)
+++ tests/objc.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/b/43_objc.test 1.1 
775)
@@ -17,6 +17,7 @@

 : > foo.m

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '^LINK' Makefile.in
Index: tests/parse.test
--- tests/parse.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/b/32_parse.test 
1.1 775)
+++ tests/parse.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/b/32_parse.test 
1.1 775)
@@ -23,6 +23,7 @@
 doz.c
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 fgrep zar.cdoz Makefile.in && exit 1
Index: tests/pluseq4.test
--- tests/pluseq4.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/b/28_pluseq4.te 
1.1 775)
+++ tests/pluseq4.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/b/28_pluseq4.te 
1.1 775)
@@ -13,5 +13,6 @@

 : > foo.c

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1
 fgrep '@CC@ -Dwhatever' Makefile.in
Index: tests/pluseq7.test
--- tests/pluseq7.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/b/25_pluseq7.te 
1.1 775)
+++ tests/pluseq7.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/b/25_pluseq7.te 
1.1 775)
@@ -18,5 +18,6 @@

 : > q.c

+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0
Index: tests/pr72.test
--- tests/pr72.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/b/20_pr72.test 1.1 
755)
+++ tests/pr72.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/b/20_pr72.test 1.1 
755)
@@ -20,6 +20,7 @@
 : > config.guess
 : > config.sub

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '^LINK ' Makefile.in
Index: tests/prefix.test
--- tests/prefix.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/b/17_prefix.tes 
1.1 775)
+++ tests/prefix.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/b/17_prefix.tes 
1.1 775)
@@ -13,4 +13,5 @@
 bni_PROGRAMS = zardoz
 EOF

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/primary2.test
--- tests/primary2.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/b/15_primary2.t 1.1 775)
+++ tests/primary2.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/b/15_primary2.t 1.1 775)
@@ -11,5 +11,6 @@
 EXTRA_PROGRAMS = joe @more@
 END

+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0
Index: tests/ranlib.test
--- tests/ranlib.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/b/13_ranlib.tes 
1.1 775)
+++ tests/ranlib.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/b/13_ranlib.tes 
1.1 775)
@@ -17,4 +17,5 @@
 : > config.guess
 : > config.sub

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/recurs.test
--- tests/recurs.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/b/12_recurs.tes 
1.1 775)
+++ tests/recurs.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/b/12_recurs.tes 
1.1 775)
@@ -17,5 +17,6 @@
 foo = $(bin_PROGRAMS)
 END

+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0
Index: tests/recurs2.test
--- tests/recurs2.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/b/11_recurs2.te 
1.1 775)
+++ tests/recurs2.test Wed, 14 Mar 2001 23:01:43 +0100 akim (am/b/11_recurs2.te 
1.1 775)
@@ -20,4 +20,5 @@
 > chgrp.1
 > chgrp.x

-$AUTOMAKE
\ No newline at end of file
+$ACLOCAL || exit 1
+$AUTOMAKE
Index: tests/sourcesub.test
--- tests/sourcesub.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/b/4_sourcesub. 1.1 775)
+++ tests/sourcesub.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/b/4_sourcesub. 1.1 775)
@@ -14,5 +14,6 @@
 EXTRA_x_SOURCES = y.c
 END

+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0
Index: tests/space.test
--- tests/space.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/b/3_space.test 
1.1 755)
+++ tests/space.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/b/3_space.test 
1.1 755)
@@ -11,4 +11,5 @@
 foo_SOURCES = foo.c
 END

+$ACLOCAL || exit 1
 $AUTOMAKE
Index: tests/specflags.test
--- tests/specflags.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/b/2_specflags. 1.1 775)
+++ tests/specflags.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/b/2_specflags. 1.1 775)
@@ -16,6 +16,7 @@
 END

 # Make sure `compile' is required.
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1

 : > compile
Index: tests/specflags2.test
--- tests/specflags2.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/b/1_specflags2 1.1 775)
+++ tests/specflags2.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/b/1_specflags2 1.1 775)
@@ -19,6 +19,7 @@
 END

 # Make sure `compile' is required.
+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1

 : > compile
Index: tests/specflags3.test
--- tests/specflags3.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/b/0_specflags3 1.1 775)
+++ tests/specflags3.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/b/0_specflags3 1.1 775)
@@ -16,6 +16,7 @@

 : > compile

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep -e '-o foo-foo' Makefile.in
Index: tests/specflags4.test
--- tests/specflags4.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/51_specflags4 1.1 775)
+++ tests/specflags4.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/51_specflags4 1.1 775)
@@ -20,6 +20,7 @@

 : > compile

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 fgrep 'test1.o.o' Makefile.in && exit 1
Index: tests/specflags5.test
--- tests/specflags5.test Sat, 13 Jan 2001 18:11:09 +0100 akim 
(am/50_specflags5 1.1 775)
+++ tests/specflags5.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/50_specflags5 1.1 775)
@@ -17,6 +17,7 @@

 : > compile

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 fgrep '$(foo_CFLAGS)' Makefile.in
Index: tests/spell2.test
--- tests/spell2.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/48_spell2.tes 
1.1 775)
+++ tests/spell2.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/48_spell2.tes 
1.1 775)
@@ -12,5 +12,6 @@
 qardoz_LDADD = -ljoe
 END

+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0
Index: tests/stdlib.test
--- tests/stdlib.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/44_stdlib.tes 
1.1 775)
+++ tests/stdlib.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/44_stdlib.tes 
1.1 775)
@@ -13,6 +13,7 @@
 noinst_LIBRARIES = foo
 END

+$ACLOCAL || exit 1
 $AUTOMAKE 2> output.log && exit 1
 # We're specifically testing for line-number information.
 # Well, when it is implemented.
Index: tests/subdir3.test
--- tests/subdir3.test Wed, 31 Jan 2001 00:08:51 +0100 akim (am/41_subdir3.te 
1.2 755)
+++ tests/subdir3.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/41_subdir3.te 
1.2 755)
@@ -19,6 +19,7 @@
 : > y.c
 : > x/z.c

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep '^z\.o: x/z\.c$' Makefile.in
Index: tests/subdir4.test
--- tests/subdir4.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/40_subdir4.te 
1.1 755)
+++ tests/subdir4.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/40_subdir4.te 
1.1 755)
@@ -45,6 +45,7 @@
 pkgdata_DATA =
 END

+$ACLOCAL || exit 1
 $AUTOMAKE --gnu || exit 1

 # Make sure that depcomp is *not* included in the definition
Index: tests/subobj.test
--- tests/subobj.test Sun, 04 Mar 2001 20:02:14 +0100 akim (am/39_subobj.tes 
1.2 775)
+++ tests/subobj.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/39_subobj.tes 
1.2 775)
@@ -17,6 +17,7 @@

 : > compile

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 fgrep 'generic/a.$(OBJEXT)' Makefile.in || exit 1
Index: tests/subobj2.test
--- tests/subobj2.test Sun, 04 Mar 2001 20:02:14 +0100 akim (am/38_subobj2.te 
1.2 775)
+++ tests/subobj2.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/38_subobj2.te 
1.2 775)
@@ -16,6 +16,7 @@

 : > compile

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 fgrep 'generic/a.$(OBJEXT)' Makefile.in || exit 1
Index: tests/subobj4.test
--- tests/subobj4.test Wed, 31 Jan 2001 00:08:51 +0100 akim (am/h/9_subobj4.te 
1.1 755)
+++ tests/subobj4.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/h/9_subobj4.te 
1.1 755)
@@ -35,6 +35,7 @@
 : > compile
 : > d2/z.c

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep 'CC.*z' d1/Makefile.in
Index: tests/suffix.test
--- tests/suffix.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/35_suffix.tes 
1.1 775)
+++ tests/suffix.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/35_suffix.tes 
1.1 775)
@@ -12,6 +12,7 @@
 noinst_PROGRAMS = foo
 END

+$ACLOCAL || exit 1
 $AUTOMAKE -i || exit 1

 grep '^\.c\.o' Makefile.in > /dev/null || exit 1
Index: tests/suffix2.test
--- tests/suffix2.test Mon, 05 Mar 2001 22:33:22 +0100 akim (am/34_suffix2.te 
1.3 755)
+++ tests/suffix2.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/34_suffix2.te 
1.3 755)
@@ -27,6 +27,7 @@

 set -e

+$ACLOCAL || exit 1
 $AUTOMAKE -a

 grep -c '^\.c\.o:' Makefile.in   | grep '^1$'
Index: tests/suffix3.test
--- tests/suffix3.test Tue, 06 Mar 2001 00:39:56 +0100 akim (am/33_suffix3.te 
1.2 775)
+++ tests/suffix3.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/33_suffix3.te 
1.2 775)
@@ -16,6 +16,7 @@
 foo_SOURCES = foo.zoo
 END

+$ACLOCAL || exit 1
 $AUTOMAKE --Wno-error || exit 1

 fgrep foo.cc Makefile.in && exit 1
Index: tests/target.test
--- tests/target.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/26_target.tes 
1.1 775)
+++ tests/target.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/26_target.tes 
1.1 775)
@@ -15,5 +15,6 @@

 echo > consud.c

+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0
Index: tests/xsource.test
--- tests/xsource.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/8_xsource.te 
1.1 775)
+++ tests/xsource.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/8_xsource.te 
1.1 775)
@@ -19,5 +19,6 @@
 : > z.c
 : > x/z.c

+$ACLOCAL || exit 1
 $AUTOMAKE && exit 1
 exit 0
Index: tests/yacc.test
--- tests/yacc.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/7_yacc.test 1.1 
775)
+++ tests/yacc.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/7_yacc.test 1.1 
775)
@@ -15,6 +15,7 @@
 zardoz_SOURCES = zardoz.y
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep 'zardoz.c' Makefile.in
Index: tests/yacc2.test
--- tests/yacc2.test Sun, 11 Mar 2001 16:56:28 +0100 akim (am/6_yacc2.test 1.2 
775)
+++ tests/yacc2.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/6_yacc2.test 1.2 
775)
@@ -21,6 +21,7 @@



+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 # If zardoz.h IS mentioned, fail
Index: tests/yacc3.test
--- tests/yacc3.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/5_yacc3.test 1.1 
775)
+++ tests/yacc3.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/5_yacc3.test 1.1 
775)
@@ -17,6 +17,7 @@
        @echo $(DIST_COMMON)
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 # It should not be disted here
Index: tests/yaccpp.test
--- tests/yaccpp.test Sat, 13 Jan 2001 18:11:09 +0100 akim (am/4_yaccpp.tes 1.1 
775)
+++ tests/yaccpp.test Wed, 14 Mar 2001 23:00:37 +0100 akim (am/4_yaccpp.tes 1.1 
775)
@@ -14,6 +14,7 @@
 zardoz_SOURCES = zardoz.yy
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep zardoz.cc Makefile.in
Index: tests/noinstdir.test
--- tests/noinstdir.test Wed, 07 Mar 2001 21:02:27 +0100 akim 
(am/h/34_noinstdir. 1.1 755)
+++ tests/noinstdir.test Wed, 14 Mar 2001 23:00:37 +0100 akim 
(am/h/34_noinstdir. 1.1 755)
@@ -23,6 +23,7 @@
 AC_PROG_RANLIB
 END

+$ACLOCAL || exit 1
 $AUTOMAKE || exit 1

 grep 'noinstdir' Makefile.in && exit 1



reply via email to

[Prev in Thread] Current Thread [Next in Thread]