From 4e8244fb81e17840cf1e0c2410683992c25867a9 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Wed, 4 May 2022 21:16:14 -0300 Subject: makefiles: deduplicate configure-time vars into new config.mk.in Currently, the configure-time variables (that is, the ones that assign to placeholders, such as "@HAVE_MAN@", which are set/replaced at configure-time) are defined on multiple files (such as on Makefile.in and on common.mk.in). To avoid duplication, centralize these variables on a single file (config.mk.in) and replace all of the other definitions of them with an include of config.mk. --- src/common.mk.in | 43 ++++--------------------------------------- 1 file changed, 4 insertions(+), 39 deletions(-) (limited to 'src/common.mk.in') diff --git a/src/common.mk.in b/src/common.mk.in index 8c83e372b..2b87c33f0 100644 --- a/src/common.mk.in +++ b/src/common.mk.in @@ -1,51 +1,16 @@ -# Common definitions for building C programs and non-shared objects +# Common definitions for building C programs and non-shared objects. +# +# Note: "ROOT" must be defined before including this file. -CC=@CC@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@ -libdir=@libdir@ -sysconfdir=@sysconfdir@ - -VERSION=@PACKAGE_VERSION@ -NAME=@PACKAGE_NAME@ -HAVE_CHROOT=@HAVE_CHROOT@ -HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ -HAVE_NETWORK=@HAVE_NETWORK@ -HAVE_USERNS=@HAVE_USERNS@ -HAVE_X11=@HAVE_X11@ -HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@ -HAVE_GLOBALCFG=@HAVE_GLOBALCFG@ -HAVE_APPARMOR=@HAVE_APPARMOR@ -HAVE_OVERLAYFS=@HAVE_OVERLAYFS@ -HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@ -HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ -HAVE_IDS=@HAVE_IDS@ -HAVE_GCOV=@HAVE_GCOV@ -HAVE_SELINUX=@HAVE_SELINUX@ -HAVE_SUID=@HAVE_SUID@ -HAVE_DBUSPROXY=@HAVE_DBUSPROXY@ -HAVE_USERTMPFS=@HAVE_USERTMPFS@ -HAVE_OUTPUT=@HAVE_OUTPUT@ -HAVE_LTS=@HAVE_LTS@ -HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@ -HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@ +include $(ROOT)/config.mk H_FILE_LIST = $(sort $(wildcard *.h)) C_FILE_LIST = $(sort $(wildcard *.c)) OBJS = $(C_FILE_LIST:.c=.o) BINOBJS = $(foreach file, $(OBJS), $file) -CFLAGS = @CFLAGS@ CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' -DVARDIR='"/var/lib/firejail"' -MANFLAGS = $(HAVE_LTS) $(HAVE_OUTPUT) $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_IDS) $(HAVE_OVERLAYFS) $(HAVE_USERTMPFS) $(HAVE_DBUSPROXY) $(HAVE_FIRETUNNEL) $(HAVE_GLOBALCFG) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_SELINUX) $(HAVE_SUID) $(HAVE_FORCE_NONEWPRIVS) $(HAVE_ONLY_SYSCFG_PROFILES) CFLAGS += $(MANFLAGS) CFLAGS += -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -Wformat -Wformat-security LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now -EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ - -ifdef NO_EXTRA_CFLAGS -else -EXTRA_CFLAGS +=@EXTRA_CFLAGS@ -endif -- cgit v1.2.3-70-g09d2