mirror of
https://github.com/netblue30/firejail.git
synced 2026-05-22 14:15:46 -06:00
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.
This commit is contained in:
Kelvin M. Klann
parent
da6d855dc2
commit
4e8244fb81
9 changed files with 75 additions and 73 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -13,6 +13,7 @@
|
|||
Makefile
|
||||
autom4te.cache/
|
||||
config.log
|
||||
config.mk
|
||||
config.status
|
||||
firejail-*.tar.xz
|
||||
firejail-login.5
|
||||
|
|
|
|||
21
Makefile.in
21
Makefile.in
|
|
@ -1,20 +1,4 @@
|
|||
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@
|
||||
include config.mk
|
||||
|
||||
ifneq ($(HAVE_MAN),no)
|
||||
MAN_TARGET = man
|
||||
|
|
@ -101,7 +85,7 @@ distclean: clean
|
|||
$(MAKE) -C $$dir distclean; \
|
||||
done
|
||||
$(MAKE) -C test distclean
|
||||
rm -fr Makefile autom4te.cache config.log config.status src/common.mk mkdeb.sh
|
||||
rm -fr Makefile autom4te.cache config.log config.mk config.status src/common.mk mkdeb.sh
|
||||
|
||||
realinstall:
|
||||
# firejail executable
|
||||
|
|
@ -208,6 +192,7 @@ COPYING \
|
|||
Makefile.in \
|
||||
README \
|
||||
RELNOTES \
|
||||
config.mk.in \
|
||||
configure \
|
||||
configure.ac \
|
||||
contrib \
|
||||
|
|
|
|||
58
config.mk.in
Normal file
58
config.mk.in
Normal file
|
|
@ -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@
|
||||
3
configure
vendored
3
configure
vendored
|
|
@ -4087,7 +4087,7 @@ fi
|
|||
|
||||
ac_config_files="$ac_config_files mkdeb.sh"
|
||||
|
||||
ac_config_files="$ac_config_files Makefile src/bash_completion/Makefile src/common.mk src/fbuilder/Makefile src/fcopy/Makefile src/fids/Makefile src/firecfg/Makefile src/firejail/Makefile src/firemon/Makefile src/fldd/Makefile src/fnet/Makefile src/fnetfilter/Makefile src/fnettrace-dns/Makefile src/fnettrace-sni/Makefile src/fnettrace/Makefile src/fsec-optimize/Makefile src/fsec-print/Makefile src/fseccomp/Makefile src/ftee/Makefile src/fzenity/Makefile src/jailcheck/Makefile src/lib/Makefile src/libpostexecseccomp/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/man/Makefile src/profstats/Makefile src/zsh_completion/Makefile test/Makefile"
|
||||
ac_config_files="$ac_config_files Makefile config.mk src/bash_completion/Makefile src/common.mk src/fbuilder/Makefile src/fcopy/Makefile src/fids/Makefile src/firecfg/Makefile src/firejail/Makefile src/firemon/Makefile src/fldd/Makefile src/fnet/Makefile src/fnetfilter/Makefile src/fnettrace-dns/Makefile src/fnettrace-sni/Makefile src/fnettrace/Makefile src/fsec-optimize/Makefile src/fsec-print/Makefile src/fseccomp/Makefile src/ftee/Makefile src/fzenity/Makefile src/jailcheck/Makefile src/lib/Makefile src/libpostexecseccomp/Makefile src/libtrace/Makefile src/libtracelog/Makefile src/man/Makefile src/profstats/Makefile src/zsh_completion/Makefile test/Makefile"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
|
|
@ -4797,6 +4797,7 @@ do
|
|||
case $ac_config_target in
|
||||
"mkdeb.sh") CONFIG_FILES="$CONFIG_FILES mkdeb.sh" ;;
|
||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||
"config.mk") CONFIG_FILES="$CONFIG_FILES config.mk" ;;
|
||||
"src/bash_completion/Makefile") CONFIG_FILES="$CONFIG_FILES src/bash_completion/Makefile" ;;
|
||||
"src/common.mk") CONFIG_FILES="$CONFIG_FILES src/common.mk" ;;
|
||||
"src/fbuilder/Makefile") CONFIG_FILES="$CONFIG_FILES src/fbuilder/Makefile" ;;
|
||||
|
|
|
|||
|
|
@ -285,6 +285,7 @@ fi
|
|||
AC_CONFIG_FILES([mkdeb.sh], [chmod +x mkdeb.sh])
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
config.mk
|
||||
src/bash_completion/Makefile
|
||||
src/common.mk
|
||||
src/fbuilder/Makefile
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
CC=@CC@
|
||||
PREFIX=@prefix@
|
||||
VERSION=@PACKAGE_VERSION@
|
||||
NAME=@PACKAGE_NAME@
|
||||
HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
|
||||
ROOT = ../..
|
||||
include $(ROOT)/config.mk
|
||||
|
||||
H_FILE_LIST = $(sort $(wildcard *.h))
|
||||
C_FILE_LIST = $(sort $(wildcard *.c))
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
CC=@CC@
|
||||
PREFIX=@prefix@
|
||||
VERSION=@PACKAGE_VERSION@
|
||||
NAME=@PACKAGE_NAME@
|
||||
HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
|
||||
ROOT = ../..
|
||||
include $(ROOT)/config.mk
|
||||
|
||||
H_FILE_LIST = $(sort $(wildcard *.h))
|
||||
C_FILE_LIST = $(sort $(wildcard *.c))
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
CC=@CC@
|
||||
PREFIX=@prefix@
|
||||
VERSION=@PACKAGE_VERSION@
|
||||
NAME=@PACKAGE_NAME@
|
||||
HAVE_FATAL_WARNINGS=@HAVE_FATAL_WARNINGS@
|
||||
ROOT = ../..
|
||||
include $(ROOT)/config.mk
|
||||
|
||||
H_FILE_LIST = $(sort $(wildcard *.h))
|
||||
C_FILE_LIST = $(sort $(wildcard *.c))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue