From cc84f5a03d271ea8a3d14f20aa0f26cfedce6929 Mon Sep 17 00:00:00 2001 From: Keith Marshall Date: Mon, 4 Jul 2016 12:00:52 +0100 Subject: [PATCH] Do not pass MAKEFLAGS explicitly, when invoking recursive make. --- mingwrt/ChangeLog | 7 +++++++ mingwrt/Makefile.in | 4 ++-- w32api/ChangeLog | 7 +++++++ w32api/Makefile.in | 4 ++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog index da12f15..375577e 100644 --- a/mingwrt/ChangeLog +++ b/mingwrt/ChangeLog @@ -1,3 +1,10 @@ +2016-07-04 Keith Marshall + + Do not pass MAKEFLAGS explicitly, when invoking recursive make. + + * Makefile.in (install-strip, uninstall): Delete explicit $(MAKEFLAGS) + references from $(MAKE) command lines; make passes them implicitly. + 2016-07-03 Keith Marshall Rework tsearch and friends; resolve issues [#1512] and [#1576]. diff --git a/mingwrt/Makefile.in b/mingwrt/Makefile.in index d5017f7..a6ad2b2 100644 --- a/mingwrt/Makefile.in +++ b/mingwrt/Makefile.in @@ -695,7 +695,7 @@ install-gcc: install-stage-1-only install-strip: install-strip-mingwrt install-strip-%: - $(MAKE) --no-print-directory $(MAKEFLAGS) \ + $(MAKE) --no-print-directory \ STRIP_DATA='cd ${libdir}; $(STRIP) --strip-unneeded $$1' \ STRIP_DLL='cd ${bindir}; $(STRIP) $$1' install-$* @@ -812,7 +812,7 @@ uninstall-mingwrt-headers: uninstall-mingwrt-dll \ uninstall-mingwrt-libdir-objects uninstall-mingwrt-libdir-libs: un%: - $(MAKE) --no-print-directory $(MAKEFLAGS) mkinstalldirs= \ + $(MAKE) --no-print-directory mkinstalldirs= \ INSTALL_DATA='cd $$2 && $(RM) $$1' $* diff --git a/w32api/ChangeLog b/w32api/ChangeLog index 3be6ffe..a88eb4c 100644 --- a/w32api/ChangeLog +++ b/w32api/ChangeLog @@ -1,3 +1,10 @@ +2016-07-04 Keith Marshall + + Do not pass MAKEFLAGS explicitly, when invoking recursive make. + + * Makefile.in (install-strip, uninstall): Delete explicit $(MAKEFLAGS) + references from $(MAKE) command lines; make passes them implicitly. + 2016-06-04 Keith Marshall Backport MemoryBarrier() implementation from 4.0-dev branch. diff --git a/w32api/Makefile.in b/w32api/Makefile.in index 56c4c73..5fc9e3a 100644 --- a/w32api/Makefile.in +++ b/w32api/Makefile.in @@ -276,7 +276,7 @@ install-w32api-libs: w32api-lib-reqs $(if $(STRIP_LIBS),$(call STRIP_LIBS,$(filter-out w32api-lib-reqs,$^))) install-strip-w32api-libs: - $(MAKE) --no-print-directory $(MAKEFLAGS) \ + $(MAKE) --no-print-directory \ STRIP_LIBS='cd ${libdir}; $(STRIP) --strip-unneeded $$1' \ install-w32api-libs @@ -294,7 +294,7 @@ uninstall-w32api-headers: done uninstall-w32api-libs: un%: - $(MAKE) --no-print-directory $(MAKEFLAGS) mkinstalldirs= \ + $(MAKE) --no-print-directory mkinstalldirs= \ INSTALL_DATA='cd $$2 && rm -f $$1' $* # Distribution -- 2.11.0