summaryrefslogtreecommitdiff
path: root/libffi/Makefile.am
diff options
context:
space:
mode:
authorbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2004-06-15 14:47:55 +0000
committerbonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4>2004-06-15 14:47:55 +0000
commitd947df3999b4edfca9f6464eeef77c9dcb9ee156 (patch)
tree90a4bda9945bf02622559eb76c352f54cafe8627 /libffi/Makefile.am
parent9fa6c850d65d8d017eea467beaf5b608794cfcb7 (diff)
downloadgcc-d947df3999b4edfca9f6464eeef77c9dcb9ee156.tar.gz
libmudflap/ChangeLog:
2005-06-15 Paolo Bonzini <bonzini@gnu.org> * configure.ac: New name of configure.in. Update AC_INIT, AC_CONFIG_SRCDIR, AC_CONFIG_HEADERS, AC_CONFIG_FILES, AC_OUTPUT, AM_INIT_AUTOMAKE to the preferred style for Autoconf 2.5x and Automake 1.7 or later. * configure.in: Remove. * configure: Regenerate. * Makefile.am: Remove useless multilib rules. * Makefile.in: Regenerate. libstdc++-v3/ChangeLog: 2005-06-15 Paolo Bonzini <bonzini@gnu.org> * acinclude.m4: Remove useless multilib configury. * Makefile.am: Remove useless multilib rules. * aclocal.m4: Regenerate. * Makefile.in: Regenerate. * configure.ac: Use AM_ENABLE_MULTILIB. * configure: Regenerate. zlib/ChangeLog.gcj: 2005-06-15 Paolo Bonzini <bonzini@gnu.org> * Makefile.am: Remove useless multilib rules. * configure.ac: Rewrite multilib support to use features of recent automakes. * aclocal.m4: Regenerate with Automake 1.8.5. * Makefile.in: Regenerate with Automake 1.8.5. * configure: Regenerate. libffi/ChangeLog: 2005-06-15 Paolo Bonzini <bonzini@gnu.org> * Makefile.am: Remove useless multilib rules. * Makefile.in: Regenerate. * aclocal.m4: Regenerate with automake 1.8.5. * configure.ac: Remove useless multilib configury. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83184 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libffi/Makefile.am')
-rw-r--r--libffi/Makefile.am13
1 files changed, 2 insertions, 11 deletions
diff --git a/libffi/Makefile.am b/libffi/Makefile.am
index a59df23e3a8..331b5a7498b 100644
--- a/libffi/Makefile.am
+++ b/libffi/Makefile.am
@@ -72,14 +72,6 @@ AM_MAKEFLAGS = \
MAKEOVERRIDES=
-# Multilib support variables working around Automake bug.
-MULTISRCTOP =
-MULTIBUILDTOP =
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
toolexeclib_LTLIBRARIES = libffi.la
noinst_LTLIBRARIES = libffi_convenience.la
@@ -147,6 +139,5 @@ AM_CFLAGS = -Wall -g -fexceptions
libffi_la_LDFLAGS = -release $(VERSION)
-INCLUDES = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
-
-AM_CCASFLAGS = $(INCLUDES)
+AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
+AM_CCASFLAGS = $(AM_CPPFLAGS)