From 3e9ab5eb18589cc6a86d692d77afec5bf9c2a9ba Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Wed, 15 Oct 2003 08:09:07 +0000 Subject: [PATCH] * 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. --- ChangeLog | 8 ++++++++ tests/cdemo/Makefile.am | 4 +--- tests/demo/Makefile.am | 4 +--- tests/depdemo/Makefile.am | 4 +--- tests/f77demo/Makefile.am | 4 +--- tests/mdemo/Makefile.am | 5 ++--- tests/mdemo2/Makefile.am | 4 +--- tests/pdemo/Makefile.am | 4 +--- tests/tagdemo/Makefile.am | 4 +--- 9 files changed, 17 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 352752d87..ba20b81f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-10-15 Gary V. Vaughan + + * 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 * libtoolize.in (func_mkdir_p): Synch with tests/defs; if there diff --git a/tests/cdemo/Makefile.am b/tests/cdemo/Makefile.am index 3ac137d48..cfe804d56 100644 --- 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 87fd42a48..e044ee913 100644 --- 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 2acf50b5b..2d58ae74f 100644 --- 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 2757a0979..ba29fdb13 100644 --- 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 a005d167c..99066ae2b 100644 --- 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 f68e950b2..8258cbeaa 100644 --- 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 a8fcc4dff..557060293 100644 --- 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 f8f804ca5..28eeee7b1 100644 --- 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 -- 2.47.2