Makefile.am: Add ../config to ACLOCAL_AMFLAGS.

2004-12-08  Kelley Cook  <kcook@gcc.gnu.org>

	* Makefile.am: Add ../config to ACLOCAL_AMFLAGS.
	* aclocal.m4, Makefile.in, testsuite/Makefile.in: Regenerate.

From-SVN: r91926

diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index d3639a081ef0de21bcd5fd442c3070486bf37688..d2fc9ee45aa524b377598634fd76c4b3fe24bbdc 100644 (file)
--- a/libmudflap/ChangeLog
+++ b/libmudflap/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-08  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * Makefile.am: Add ../config to ACLOCAL_AMFLAGS.
+       * aclocal.m4, Makefile.in, testsuite/Makefile.in: Regenerate.
+
 2004-12-02  Richard Sandiford  <rsandifo@redhat.com>
 
        * configure.ac: Use TL_AC_GCC_VERSION to set gcc_version.

diff --git a/libmudflap/Makefile.am b/libmudflap/Makefile.am
index 6342e39b15c5baf19522373b65c572ecec718fb6..e55738c72a012f420472be05328f982d000b0fd3 100644 (file)
--- a/libmudflap/Makefile.am
+++ b/libmudflap/Makefile.am
@@ -5,7 +5,7 @@
 ##
 
 AUTOMAKE_OPTIONS = 1.8 foreign
-ACLOCAL_AMFLAGS = -I ..
+ACLOCAL_AMFLAGS = -I .. -I ../config
 MAINT_CHARSET = latin1
 SUBDIRS = testsuite
 

diff --git a/libmudflap/Makefile.in b/libmudflap/Makefile.in
index f961db328dd7ca9261c762e868f1244d64bd04a6..84506f83f8b638ce81e71220b8dd046f791180b9 100644 (file)
--- a/libmudflap/Makefile.in
+++ b/libmudflap/Makefile.in
@@ -49,9 +49,8 @@ DIST_COMMON = $(am__configure_deps) $(include_HEADERS) \
        $(srcdir)/mf-runtime.h.in $(top_srcdir)/configure ChangeLog
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \
-       $(top_srcdir)/../config/gcc-version.m4 \
-       $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../config/gcc-version.m4 \
+       $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -222,7 +221,7 @@ target_vendor = @target_vendor@
 toolexecdir = @toolexecdir@
 toolexeclibdir = @toolexeclibdir@
 AUTOMAKE_OPTIONS = 1.8 foreign
-ACLOCAL_AMFLAGS = -I ..
+ACLOCAL_AMFLAGS = -I .. -I ../config
 MAINT_CHARSET = latin1
 SUBDIRS = testsuite
 AM_CFLAGS = -Wall $(SECTION_FLAGS)

diff --git a/libmudflap/aclocal.m4 b/libmudflap/aclocal.m4
index dc5fcd60234b3a0e334a86552a04f7f76437e9b7..5c41d5d4c04b78f1d8a07719bb644300561724f2 100644 (file)
--- a/libmudflap/aclocal.m4
+++ b/libmudflap/aclocal.m4
@@ -1127,5 +1127,5 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([../libtool.m4])
 m4_include([../config/gcc-version.m4])
+m4_include([../libtool.m4])

diff --git a/libmudflap/testsuite/Makefile.in b/libmudflap/testsuite/Makefile.in
index 8e7a8e65f982c1b02e0ddfdcb9c59e23b712bd3b..1b60def8f15f2aa7c806a79fa82d4cb68c518307 100644 (file)
--- a/libmudflap/testsuite/Makefile.in
+++ b/libmudflap/testsuite/Makefile.in
@@ -40,9 +40,8 @@ subdir = testsuite
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(srcdir)/mfconfig.exp.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \
-       $(top_srcdir)/../config/gcc-version.m4 \
-       $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../config/gcc-version.m4 \
+       $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs