* tests/cdemo/Makefile.am, tests/demo/Makefile.am,

tests/depdemo/Makefile.am, tests/f77demo/Makefile.am,
tests/mdemo/Makefile.am, tests/mdemo2/Makefile.am,
tests/pdemo/Makefile.am, tests/tagdemo/Makefile.am (top_distdir):
Removed. `autoreconf' needs literals in ACLOCAL_AMFLAGS.

diff --git a/ChangeLog b/ChangeLog
index 352752d877b0745c1ced2d42a65dffd6c47eb9ec..ba20b81f1d7e330e19a6f300a43c965175620238 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-15  Gary V. Vaughan  <gary@gnu.org>
+
+       * tests/cdemo/Makefile.am, tests/demo/Makefile.am,
+       tests/depdemo/Makefile.am, tests/f77demo/Makefile.am,
+       tests/mdemo/Makefile.am, tests/mdemo2/Makefile.am,
+       tests/pdemo/Makefile.am, tests/tagdemo/Makefile.am (top_distdir):
+       Removed. `autoreconf' needs literals in ACLOCAL_AMFLAGS.
+
 2003-10-14  Gary V. Vaughan  <gary@gnu.org>
 
        * libtoolize.in (func_mkdir_p): Synch with tests/defs; if there

diff --git a/tests/cdemo/Makefile.am b/tests/cdemo/Makefile.am
index 3ac137d482355441d3ecc892ba8bfdc667ccd452..cfe804d56c2da5b8160bc6d3bd48ff2a4f993985 100644 (file)
--- a/tests/cdemo/Makefile.am
+++ b/tests/cdemo/Makefile.am
@@ -17,10 +17,8 @@
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
 
-top_distdir = ../..
-
 AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS  = -I $(top_distdir)/m4
+ACLOCAL_AMFLAGS  = -I ../../m4
 
 noinst_LTLIBRARIES = libfoo.la
 

diff --git a/tests/demo/Makefile.am b/tests/demo/Makefile.am
index 87fd42a4882e4670cae4cd3dc26aad0207327730..e044ee913a66fd21301840946303e23b4dcc816a 100644 (file)
--- a/tests/demo/Makefile.am
+++ b/tests/demo/Makefile.am
@@ -17,10 +17,8 @@
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
 
-top_distdir = ../..
-
 AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS  = -I$(top_distdir)/m4
+ACLOCAL_AMFLAGS  = -I ../../m4
 
 # Build a libtool library, libhello.la for installation in libdir.
 lib_LTLIBRARIES = libhello.la

diff --git a/tests/depdemo/Makefile.am b/tests/depdemo/Makefile.am
index 2acf50b5b14cb7f6e72729cc97890d236cacdec9..2d58ae74f73102feda37813bc255f100f969b7b6 100644 (file)
--- a/tests/depdemo/Makefile.am
+++ b/tests/depdemo/Makefile.am
@@ -17,10 +17,8 @@
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
 
-top_distdir = ../..
-
 AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS  = -I $(top_distdir)/m4
+ACLOCAL_AMFLAGS  = -I ../../m4
 
 SUBDIRS = l1 l2 l3 l4
 

diff --git a/tests/f77demo/Makefile.am b/tests/f77demo/Makefile.am
index 2757a09798f89e074f60dd300d543a7f44892226..ba29fdb13b430ea6e035043a4a137efa3717102b 100644 (file)
--- a/tests/f77demo/Makefile.am
+++ b/tests/f77demo/Makefile.am
@@ -17,10 +17,8 @@
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
 
-top_distdir = ../..
-
 AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS  = -I $(top_distdir)/m4
+ACLOCAL_AMFLAGS  = -I ../../m4
 
 noinst_LTLIBRARIES = libfoo.la libmix.la
 

diff --git a/tests/mdemo/Makefile.am b/tests/mdemo/Makefile.am
index a005d167c0f52117b3797346e099742f25fa9a42..99066ae2b081921ce3e735d9c02e6338e68d933a 100644 (file)
--- a/tests/mdemo/Makefile.am
+++ b/tests/mdemo/Makefile.am
@@ -17,10 +17,8 @@
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
 
-top_distdir = ../..
-
 AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS  = -I $(top_distdir)/m4
+ACLOCAL_AMFLAGS  = -I ../../m4
 
 INCLUDES = $(INCLTDL)
 
@@ -48,6 +46,7 @@ bin_PROGRAMS = mdemo mdemo_static
 
 ## use @LIBLTDL@ because some broken makes do not accept macros in targets
 ## we can only do this because our LIBLTDL does not contain ${top_builddir}
+top_distdir = ../..
 @LIBLTDL@: $(top_distdir)/libtool $(top_distdir)/libltdl/libtool \
     $(top_distdir)/libltdl/config.h $(srcdir)/$(top_distdir)/libltdl/ltdl.c \
     $(srcdir)/$(top_distdir)/libltdl/ltdl.h

diff --git a/tests/mdemo2/Makefile.am b/tests/mdemo2/Makefile.am
index f68e950b2e0301798de1b429c2bc47e9832845e0..8258cbeaabc8c11734590984db0cb58dfcabcf94 100644 (file)
--- a/tests/mdemo2/Makefile.am
+++ b/tests/mdemo2/Makefile.am
@@ -17,10 +17,8 @@
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
 
-top_distdir = ../..
-
 AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS  = -I $(top_distdir)/m4
+ACLOCAL_AMFLAGS  = -I ../../m4
 
 AM_CPPFLAGS = -I$(top_distdir)/libltdl
 

diff --git a/tests/pdemo/Makefile.am b/tests/pdemo/Makefile.am
index a8fcc4dfff6b540117f0ead23f99e65bb869fd07..5570602938154cc15ee7966b596ca775b971206f 100644 (file)
--- a/tests/pdemo/Makefile.am
+++ b/tests/pdemo/Makefile.am
@@ -17,10 +17,8 @@
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
 
-top_distdir = ../..
-
 AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS  = -I $(top_distdir)/m4
+ACLOCAL_AMFLAGS  = -I ../../m4
 
 # Build a libtool library, libhello.la for installation in libdir.
 lib_LTLIBRARIES = libhello.la

diff --git a/tests/tagdemo/Makefile.am b/tests/tagdemo/Makefile.am
index f8f804ca59f8669f4a8ba844b0b0442bcf0e3a4b..28eeee7b1f533a30d58e464c742b9da4eb70207a 100644 (file)
--- a/tests/tagdemo/Makefile.am
+++ b/tests/tagdemo/Makefile.am
@@ -17,10 +17,8 @@
 ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 ## Boston, MA 02111-1307, USA.
 
-top_distdir = ../..
-
 AUTOMAKE_OPTIONS = no-dependencies foreign
-ACLOCAL_AMFLAGS  = -I $(top_distdir)/m4
+ACLOCAL_AMFLAGS  = -I ../../m4
 
 noinst_LTLIBRARIES = libfoo.la
 lib_LTLIBRARIES = libbaz.la