summaryrefslogtreecommitdiff
path: root/libmudflap
diff options
context:
space:
mode:
authorkcook <kcook@138bc75d-0d04-0410-961f-82ee72b054a4>2004-12-09 01:27:29 +0000
committerkcook <kcook@138bc75d-0d04-0410-961f-82ee72b054a4>2004-12-09 01:27:29 +0000
commit8cafc63f2530a682d477a462eb329a2315c8a321 (patch)
treeebbd39e2d9333026b52a752ae1469540f904d2ab /libmudflap
parent1e055db06033a57a68e80b4a000918f189c17550 (diff)
downloadgcc-8cafc63f2530a682d477a462eb329a2315c8a321.tar.gz
2004-12-08 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.am: Add ../config to ACLOCAL_AMFLAGS. * aclocal.m4, Makefile.in, testsuite/Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91926 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libmudflap')
-rw-r--r--libmudflap/ChangeLog5
-rw-r--r--libmudflap/Makefile.am2
-rw-r--r--libmudflap/Makefile.in7
-rw-r--r--libmudflap/aclocal.m42
-rw-r--r--libmudflap/testsuite/Makefile.in5
5 files changed, 12 insertions, 9 deletions
diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index d3639a081ef..d2fc9ee45aa 100644
--- 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 6342e39b15c..e55738c72a0 100644
--- 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 f961db328dd..84506f83f8b 100644
--- 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 dc5fcd60234..5c41d5d4c04 100644
--- 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 8e7a8e65f98..1b60def8f15 100644
--- 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