Don't set AM_MAKEFLAGS
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
diff --git a/Makefile.am b/Makefile.am
index e98cb34..27a11b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,50 +27,6 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj \
# local.exp is generated by configure
DISTCLEANFILES = local.exp
-## ################################################################
-
-##
-## This section is for make and multilib madness.
-##
-
-# 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)' \
- 'JC1FLAGS=$(JC1FLAGS)' \
- 'LDFLAGS=$(LDFLAGS)' \
- 'LIBCFLAGS=$(LIBCFLAGS)' \
- 'LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)' \
- 'MAKE=$(MAKE)' \
- 'MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)' \
- 'PICFLAG=$(PICFLAG)' \
- 'PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)' \
- 'RUNTESTFLAGS=$(RUNTESTFLAGS)' \
- 'SHELL=$(SHELL)' \
- 'exec_prefix=$(exec_prefix)' \
- 'infodir=$(infodir)' \
- 'libdir=$(libdir)' \
- 'mandir=$(mandir)' \
- 'prefix=$(prefix)' \
- 'AR=$(AR)' \
- 'AS=$(AS)' \
- 'CC=$(CC)' \
- 'CXX=$(CXX)' \
- 'LD=$(LD)' \
- 'NM=$(NM)' \
- 'RANLIB=$(RANLIB)' \
- 'DESTDIR=$(DESTDIR)'
-
# Subdir rules rely on $(FLAGS_TO_PASS)
FLAGS_TO_PASS = $(AM_MAKEFLAGS)