diff options
| author | Paolo Bonzini <bonzini@gcc.gnu.org> | 2004-06-15 14:47:55 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gcc.gnu.org> | 2004-06-15 14:47:55 +0000 |
| commit | 076e544330cef5b05f16bc351b9d87ea6a931b95 (patch) | |
| tree | 90a4bda9945bf02622559eb76c352f54cafe8627 /zlib/Makefile.am | |
| parent | 659e82ad0fff564050e3363172ef52a9a948a27f (diff) | |
| download | gcc-076e544330cef5b05f16bc351b9d87ea6a931b95.tar.gz | |
configure.ac: New name of configure.in.
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.
From-SVN: r83184
Diffstat (limited to 'zlib/Makefile.am')
| -rw-r--r-- | zlib/Makefile.am | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 48e5385f181..8551d874c02 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -1,14 +1,6 @@ ## Process this file with automake to create Makefile.in. -AUTOMAKE_OPTIONS = cygnus - -# Multilib support variables. -MULTISRCTOP = -MULTIBUILDTOP = -MULTIDIRS = -MULTISUBDIR = -MULTIDO = true -MULTICLEAN = true +AUTOMAKE_OPTIONS = 1.8 cygnus ZLIB_SOURCES = adler32.c compress.c crc32.c deflate.c deflate.h \ gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c inffast.h \ @@ -64,27 +56,3 @@ AM_MAKEFLAGS = \ "PICFLAG=$(PICFLAG)" \ "RANLIB=$(RANLIB)" \ "DESTDIR=$(DESTDIR)" - -# Multilib support. -.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ - maintainer-clean-multi - -all-am: all-multi -install-am: install-multi -mostlyclean-am: mostlyclean-multi -clean-am: clean-multi -distclean-am: distclean-multi -maintainer-clean-am: maintainer-clean-multi - -all-multi: - : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do -install-multi: - $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do -mostlyclean-multi: - $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean -clean-multi: - $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean -distclean-multi: - $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean -maintainer-clean-multi: - $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean |