From c0c284e33c9f3cc103be19fe1b35fd642ffef3f2 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sat, 24 Jun 2023 11:48:09 -0300 Subject: build: move MAKEFLAGS to config.mk.in To reduce the amount of boilerplate in the makefiles. This amends commit 9789c263a ("build: disable all built-in implicit make rules", 2023-06-21) / PR #5864. --- Makefile | 2 -- config.mk.in | 1 + src/bash_completion/Makefile | 2 -- src/etc-cleanup/Makefile | 2 -- src/fbuilder/Makefile | 2 -- src/fcopy/Makefile | 2 -- src/fids/Makefile | 2 -- src/firecfg/Makefile | 2 -- src/firejail/Makefile | 2 -- src/firemon/Makefile | 2 -- src/fldd/Makefile | 2 -- src/fnet/Makefile | 2 -- src/fnetfilter/Makefile | 2 -- src/fnettrace-dns/Makefile | 2 -- src/fnettrace-icmp/Makefile | 2 -- src/fnettrace-sni/Makefile | 2 -- src/fnettrace/Makefile | 2 -- src/fsec-optimize/Makefile | 2 -- src/fsec-print/Makefile | 2 -- src/fseccomp/Makefile | 2 -- src/ftee/Makefile | 2 -- src/fzenity/Makefile | 2 -- src/jailcheck/Makefile | 2 -- src/lib/Makefile | 2 -- src/libpostexecseccomp/Makefile | 2 -- src/libtrace/Makefile | 2 -- src/libtracelog/Makefile | 2 -- src/man/Makefile | 2 -- src/profstats/Makefile | 2 -- src/zsh_completion/Makefile | 2 -- test/Makefile | 2 -- 31 files changed, 1 insertion(+), 60 deletions(-) diff --git a/Makefile b/Makefile index 4607926b4..1d1d81566 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = . -include config.mk diff --git a/config.mk.in b/config.mk.in index dea3d8a52..6ee541507 100644 --- a/config.mk.in +++ b/config.mk.in @@ -6,6 +6,7 @@ # Note: Do not define any targets on this file, as that could potentially end # up overriding the includer's intended default target (which by default is the # first target encountered). +MAKEFLAGS += -r NAME=@PACKAGE_NAME@ TARNAME=@PACKAGE_TARNAME@ diff --git a/src/bash_completion/Makefile b/src/bash_completion/Makefile index 6d5c45532..516805886 100644 --- a/src/bash_completion/Makefile +++ b/src/bash_completion/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/etc-cleanup/Makefile b/src/etc-cleanup/Makefile index 7c542c4a9..c8a12476e 100644 --- a/src/etc-cleanup/Makefile +++ b/src/etc-cleanup/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile index 803ea18a3..7595f0775 100644 --- a/src/fbuilder/Makefile +++ b/src/fbuilder/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile index 29ea719a3..e2956fdd1 100644 --- a/src/fcopy/Makefile +++ b/src/fcopy/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fids/Makefile b/src/fids/Makefile index 1aaac5c75..901cbb470 100644 --- a/src/fids/Makefile +++ b/src/fids/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile index c9489e3a4..59b713f1b 100644 --- a/src/firecfg/Makefile +++ b/src/firecfg/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/firejail/Makefile b/src/firejail/Makefile index 064373588..53bccf843 100644 --- a/src/firejail/Makefile +++ b/src/firejail/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/firemon/Makefile b/src/firemon/Makefile index 514eb98eb..e0059aee5 100644 --- a/src/firemon/Makefile +++ b/src/firemon/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fldd/Makefile b/src/fldd/Makefile index 35ce019a7..86693a76c 100644 --- a/src/fldd/Makefile +++ b/src/fldd/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fnet/Makefile b/src/fnet/Makefile index a40d69b11..8efc6d26b 100644 --- a/src/fnet/Makefile +++ b/src/fnet/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile index fbae2e027..2be8311ae 100644 --- a/src/fnetfilter/Makefile +++ b/src/fnetfilter/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fnettrace-dns/Makefile b/src/fnettrace-dns/Makefile index 3c825467c..bbd4772e2 100644 --- a/src/fnettrace-dns/Makefile +++ b/src/fnettrace-dns/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fnettrace-icmp/Makefile b/src/fnettrace-icmp/Makefile index 9e94fa144..0d26dc2fc 100644 --- a/src/fnettrace-icmp/Makefile +++ b/src/fnettrace-icmp/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fnettrace-sni/Makefile b/src/fnettrace-sni/Makefile index 21dfde3d3..554741fc8 100644 --- a/src/fnettrace-sni/Makefile +++ b/src/fnettrace-sni/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile index a952a84a4..94381d299 100644 --- a/src/fnettrace/Makefile +++ b/src/fnettrace/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile index 40511bdaa..4941f13b1 100644 --- a/src/fsec-optimize/Makefile +++ b/src/fsec-optimize/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile index 6f09e9161..78e87a93f 100644 --- a/src/fsec-print/Makefile +++ b/src/fsec-print/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile index bd5c92113..461179f4d 100644 --- a/src/fseccomp/Makefile +++ b/src/fseccomp/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/ftee/Makefile b/src/ftee/Makefile index 8b4e7fdf4..0c27b4cbc 100644 --- a/src/ftee/Makefile +++ b/src/ftee/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile index 6b93886f5..a17a9252f 100644 --- a/src/fzenity/Makefile +++ b/src/fzenity/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile index 029fd422b..23cd9c1a9 100644 --- a/src/jailcheck/Makefile +++ b/src/jailcheck/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/lib/Makefile b/src/lib/Makefile index e359bba08..a7b093048 100644 --- a/src/lib/Makefile +++ b/src/lib/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile index 874de098e..dfd8eb318 100644 --- a/src/libpostexecseccomp/Makefile +++ b/src/libpostexecseccomp/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/libtrace/Makefile b/src/libtrace/Makefile index d261828ea..8b14a4335 100644 --- a/src/libtrace/Makefile +++ b/src/libtrace/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile index 5e14a5dbe..ac48264df 100644 --- a/src/libtracelog/Makefile +++ b/src/libtracelog/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/man/Makefile b/src/man/Makefile index ce55ffd34..197f76192 100644 --- a/src/man/Makefile +++ b/src/man/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/profstats/Makefile b/src/profstats/Makefile index 936b575e1..b4cb1a6f7 100644 --- a/src/profstats/Makefile +++ b/src/profstats/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/src/zsh_completion/Makefile b/src/zsh_completion/Makefile index fab53ca0a..cc811ae99 100644 --- a/src/zsh_completion/Makefile +++ b/src/zsh_completion/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = ../.. -include $(ROOT)/config.mk diff --git a/test/Makefile b/test/Makefile index 02a628928..08462c09b 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,6 +1,4 @@ .SUFFIXES: -MAKEFLAGS += -r - ROOT = .. -include $(ROOT)/config.mk -- cgit v1.2.3-54-g00ecf