-
Notifications
You must be signed in to change notification settings - Fork 558
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5140 from kmk3/build-dedup-config-vars
build: deduplicate configure-time vars into new config files
- Loading branch information
Showing
34 changed files
with
205 additions
and
129 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| NAME=@PACKAGE_NAME@ | ||
| VERSION=@PACKAGE_VERSION@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1,16 @@ | ||
| # common definitions for all makefiles | ||
| # 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.