diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-05-04 21:16:14 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-06-12 16:08:47 -0300 |
commit | 4e8244fb81e17840cf1e0c2410683992c25867a9 (patch) | |
tree | 4ac5c0a92292e607bb3b12afa06e6f9bf9da8e69 /src/common.mk.in | |
parent | makefiles: define root dir and include relative to it (diff) | |
download | firejail-4e8244fb81e17840cf1e0c2410683992c25867a9.tar.gz firejail-4e8244fb81e17840cf1e0c2410683992c25867a9.tar.zst firejail-4e8244fb81e17840cf1e0c2410683992c25867a9.zip |
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.
Diffstat (limited to 'src/common.mk.in')
-rw-r--r-- | src/common.mk.in | 43 |
1 files changed, 4 insertions, 39 deletions
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 @@ | |||
1 | # Common definitions for building C programs and non-shared objects | 1 | # Common definitions for building C programs and non-shared objects. |
2 | # | ||
3 | # Note: "ROOT" must be defined before including this file. | ||
2 | 4 | ||
3 | CC=@CC@ | 5 | include $(ROOT)/config.mk |
4 | prefix=@prefix@ | ||
5 | exec_prefix=@exec_prefix@ | ||
6 | bindir=@bindir@ | ||
7 | libdir=@libdir@ | ||
8 | sysconfdir=@sysconfdir@ | ||
9 | |||
10 | VERSION=@PACKAGE_VERSION@ | ||
11 | NAME=@PACKAGE_NAME@ | ||
12 | HAVE_CHROOT=@HAVE_CHROOT@ | ||
13 | HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@ | ||
14 | HAVE_NETWORK=@HAVE_NETWORK@ | ||
15 | HAVE_USERNS=@HAVE_USERNS@ | ||
16 | HAVE_X11=@HAVE_X11@ | ||
17 | HAVE_FILE_TRANSFER=@HAVE_FILE_TRANSFER@ | ||
18 | HAVE_GLOBALCFG=@HAVE_GLOBALCFG@ | ||
19 | HAVE_APPARMOR=@HAVE_APPARMOR@ | ||
20 | HAVE_OVERLAYFS=@HAVE_OVERLAYFS@ | ||
21 | HAVE_FIRETUNNEL=@HAVE_FIRETUNNEL@ | ||
22 | HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@ | ||
23 | HAVE_IDS=@HAVE_IDS@ | ||
24 | HAVE_GCOV=@HAVE_GCOV@ | ||
25 | HAVE_SELINUX=@HAVE_SELINUX@ | ||
26 | HAVE_SUID=@HAVE_SUID@ | ||
27 | HAVE_DBUSPROXY=@HAVE_DBUSPROXY@ | ||
28 | HAVE_USERTMPFS=@HAVE_USERTMPFS@ | ||
29 | HAVE_OUTPUT=@HAVE_OUTPUT@ | ||
30 | HAVE_LTS=@HAVE_LTS@ | ||
31 | HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@ | ||
32 | HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@ | ||
33 | 6 | ||
34 | H_FILE_LIST = $(sort $(wildcard *.h)) | 7 | H_FILE_LIST = $(sort $(wildcard *.h)) |
35 | C_FILE_LIST = $(sort $(wildcard *.c)) | 8 | C_FILE_LIST = $(sort $(wildcard *.c)) |
36 | OBJS = $(C_FILE_LIST:.c=.o) | 9 | OBJS = $(C_FILE_LIST:.c=.o) |
37 | BINOBJS = $(foreach file, $(OBJS), $file) | 10 | BINOBJS = $(foreach file, $(OBJS), $file) |
38 | 11 | ||
39 | CFLAGS = @CFLAGS@ | ||
40 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) | 12 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) |
41 | CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' -DVARDIR='"/var/lib/firejail"' | 13 | CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' -DVARDIR='"/var/lib/firejail"' |
42 | 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) | ||
43 | CFLAGS += $(MANFLAGS) | 14 | CFLAGS += $(MANFLAGS) |
44 | CFLAGS += -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -Wformat -Wformat-security | 15 | CFLAGS += -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -Wformat -Wformat-security |
45 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now | 16 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now |
46 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | ||
47 | |||
48 | ifdef NO_EXTRA_CFLAGS | ||
49 | else | ||
50 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ | ||
51 | endif | ||