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. --- config.mk.in | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 config.mk.in (limited to 'config.mk.in') diff --git a/config.mk.in b/config.mk.in new file mode 100644 index 000000000..e76b7ac34 --- /dev/null +++ b/config.mk.in @@ -0,0 +1,58 @@ +# Configure-time variable definitions and any other common definition that can +# be safely included by all makefiles. +# +# 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). + +CC=@CC@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +bindir=@bindir@ +libdir=@libdir@ +datarootdir=@datarootdir@ +mandir=@mandir@ +sysconfdir=@sysconfdir@ + +VERSION=@PACKAGE_VERSION@ +NAME=@PACKAGE_NAME@ +PACKAGE_TARNAME=@PACKAGE_TARNAME@ +DOCDIR=@docdir@ +HAVE_APPARMOR=@HAVE_APPARMOR@ +HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@ +BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@ +HAVE_SUID=@HAVE_SUID@ +HAVE_MAN=@HAVE_MAN@ + +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@ + +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=@CFLAGS@ + +ifdef NO_EXTRA_CFLAGS +else +EXTRA_CFLAGS +=@EXTRA_CFLAGS@ +endif + +EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ -- cgit v1.2.3-70-g09d2