From 44ebe2d0ac7f3a0b7fd6433321b3bfee71eea389 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva <oliva@dcc.unicamp.br> Date: Mon, 19 Jul 1999 19:11:54 +0000 Subject: [PATCH] Makefile.am (*-recursive, [...]): Automake does not generate *-recursive for this Makefile, use *-am instead. 1999-07-19 Alexandre Oliva <oliva@dcc.unicamp.br> * Makefile.am (*-recursive, *-am, *-multi): Automake does not generate *-recursive for this Makefile, use *-am instead. * Makefile.in: Rebuilt. From-SVN: r28173 --- boehm-gc/ChangeLog | 6 ++++ boehm-gc/Makefile.am | 12 ++++---- boehm-gc/Makefile.in | 12 ++++---- zlib/ChangeLog.gcj | 6 ++++ zlib/Makefile.am | 65 +++++++++++++++++++++++++++++++++++++++++++ zlib/Makefile.in | 66 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 155 insertions(+), 12 deletions(-) diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 9a24fb6067fe..c157b9e01d26 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,9 @@ +1999-07-19 Alexandre Oliva <oliva@dcc.unicamp.br> + + * Makefile.am (*-recursive, *-am, *-multi): Automake does not + generate *-recursive for this Makefile, use *-am instead. + * Makefile.in: Rebuilt. + 1999-06-30 Alexandre Oliva <oliva@dcc.unicamp.br> * Makefile.am (.s.lo): Renamed from `.s.o'. diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am index b1d5dc54dcff..4f214f6daf0e 100644 --- a/boehm-gc/Makefile.am +++ b/boehm-gc/Makefile.am @@ -113,12 +113,12 @@ CONFIG_STATUS_DEPENDENCIES = $(boehm_gc_basedir)/configure.host .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ maintainer-clean-multi -all-recursive: all-multi -install-recursive: install-multi -mostlyclean-recursive: mostlyclean-multi -clean-recursive: clean-multi -distclean-recursive: distclean-multi -maintainer-clean-recursive: 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: $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in index 19b706c98648..83ede9c43cd9 100644 --- a/boehm-gc/Makefile.in +++ b/boehm-gc/Makefile.in @@ -493,12 +493,12 @@ $(all_objs) : config.h gc_priv.h gc_hdrs.h gc.h gc_mark.h .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ maintainer-clean-multi -all-recursive: all-multi -install-recursive: install-multi -mostlyclean-recursive: mostlyclean-multi -clean-recursive: clean-multi -distclean-recursive: distclean-multi -maintainer-clean-recursive: 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: $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index 73e527847edc..f34d5c85cb36 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,9 @@ +1999-07-19 Alexandre Oliva <oliva@dcc.unicamp.br> + + * Makefile.am (*-recursive, *-am, *-multi): Automake does not + generate *-recursive for this Makefile, use *-am instead. + * Makefile.in: Rebuilt. + 1999-06-21 Tom Tromey <tromey@cygnus.com> * Makefile.in: Rebuilt. diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 6f1ab4d3dfe8..94852aefef53 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -30,3 +30,68 @@ inffixed.h inflate.c inftrees.c inftrees.h infutil.c infutil.h trees.c \ trees.h uncompr.c zconf.h zlib.h zutil.c zutil.h libzgcj_la_LDFLAGS = -version-info 0:0:0 -rpath $(toolexeclibdir) + +# Work around what appears to be a GNU make bug handling MAKEFLAGS +# values defined in terms of make variables, as is the case for CC and +# friends when we are called from the top level Makefile. +AM_MAKEFLAGS = \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CFLAGS=$(CFLAGS)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ + "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "MAKE=$(MAKE)" \ + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ + "SHELL=$(SHELL)" \ + "EXPECT=$(EXPECT)" \ + "RUNTEST=$(RUNTEST)" \ + "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ + "exec_prefix=$(exec_prefix)" \ + "infodir=$(infodir)" \ + "libdir=$(libdir)" \ + "prefix=$(prefix)" \ + "tooldir=$(tooldir)" \ + "AR=$(AR)" \ + "AS=$(AS)" \ + "CC=$(CC)" \ + "CXX=$(CXX)" \ + "LD=$(LD)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "NM=$(NM)" \ + "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: + $(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 diff --git a/zlib/Makefile.in b/zlib/Makefile.in index 91c6199efb2a..8a397f65f49a 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -108,6 +108,48 @@ trees.h uncompr.c zconf.h zlib.h zutil.c zutil.h libzgcj_la_LDFLAGS = -version-info 0:0:0 -rpath $(toolexeclibdir) + +# Work around what appears to be a GNU make bug handling MAKEFLAGS +# values defined in terms of make variables, as is the case for CC and +# friends when we are called from the top level Makefile. +AM_MAKEFLAGS = \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CFLAGS=$(CFLAGS)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ + "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "MAKE=$(MAKE)" \ + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ + "SHELL=$(SHELL)" \ + "EXPECT=$(EXPECT)" \ + "RUNTEST=$(RUNTEST)" \ + "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ + "exec_prefix=$(exec_prefix)" \ + "infodir=$(infodir)" \ + "libdir=$(libdir)" \ + "prefix=$(prefix)" \ + "tooldir=$(tooldir)" \ + "AR=$(AR)" \ + "AS=$(AS)" \ + "CC=$(CC)" \ + "CXX=$(CXX)" \ + "LD=$(LD)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "NM=$(NM)" \ + "PICFLAG=$(PICFLAG)" \ + "RANLIB=$(RANLIB)" \ + "DESTDIR=$(DESTDIR)" + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_CLEAN_FILES = @@ -381,6 +423,30 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +# 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: + $(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 + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -- GitLab