From dcc2c39757b707dbf9978f13a0b17dcb32be4ce9 Mon Sep 17 00:00:00 2001
From: Daniel Carl <danielcarl@gmx.de>
Date: Tue, 9 May 2017 20:59:52 +0200
Subject: [PATCH] Don't give MFLAGS to make explicitly.
The option given to the upper most make call are already given as
MAKEFLAGS on recursive calls to make. So there is no need to give them
explicitly.
---
Makefile | 6 +++---
config.mk | 1 -
src/Makefile | 4 ++--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 74bc6b8..e56e528 100644
--- a/Makefile
+++ b/Makefile
@@ -32,15 +32,15 @@ uninstall:
clean: $(SRCDIR).subdir-clean
sandbox:
- $(Q)$(MAKE) $(MFLAGS) RUNPREFIX=$(CURDIR)/sandbox/usr PREFIX=/usr DESTDIR=./sandbox install
+ $(Q)$(MAKE) RUNPREFIX=$(CURDIR)/sandbox/usr PREFIX=/usr DESTDIR=./sandbox install
runsandbox: sandbox
sandbox/usr/bin/vimb
%.subdir-all:
- $(Q)$(MAKE) $(MFLAGS) -C $*
+ $(Q)$(MAKE) -C $*
%.subdir-clean:
- $(Q)$(MAKE) $(MFLAGS) -C $* clean
+ $(Q)$(MAKE) -C $* clean
.PHONY: all options install uninstall clean sandbox runsandbox
diff --git a/config.mk b/config.mk
index d09d8e6..3a4964e 100644
--- a/config.mk
+++ b/config.mk
@@ -40,4 +40,3 @@ EXTLDFLAGS = $(shell pkg-config --libs webkit2gtk-4.0) -shared
CFLAGS += $(shell pkg-config --cflags $(LIBS))
CFLAGS += ${CPPFLAGS}
LDFLAGS += $(shell pkg-config --libs $(LIBS))
-MFLAGS = --no-print-directory
diff --git a/src/Makefile b/src/Makefile
index f60d2ce..7f037c6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -35,9 +35,9 @@ scripts/scripts.h: $(JSFILES) $(CSSFILES)
$(Q)$(CC) $(CFLAGS) -c -o $@ $<
%.subdir-all: config.h
- $(Q)$(MAKE) $(MFLAGS) -C $*
+ $(Q)$(MAKE) -C $*
%.subdir-clean:
- $(Q)$(MAKE) $(MFLAGS) -C $* clean
+ $(Q)$(MAKE) -C $* clean
.PHONY: all clean
--
2.20.1