diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-10-31 20:57:52 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-11-21 17:37:17 -0300 |
commit | e425d841239d84e9b35ffe131bbe0255db20e874 (patch) | |
tree | cbcae4db1ac7d6be6123ecbca92da57321c46115 /src | |
parent | makefiles: mention variables intended to be used by includers (diff) | |
download | firejail-e425d841239d84e9b35ffe131bbe0255db20e874.tar.gz firejail-e425d841239d84e9b35ffe131bbe0255db20e874.tar.zst firejail-e425d841239d84e9b35ffe131bbe0255db20e874.zip |
makefiles: organize CFLAGS
Line-wrap them and make the order of the flags more similar across
src/prog.mk and src/so.mk.
This should make it easier to see the differences in CFLAGS between both
files.
Diffstat (limited to 'src')
-rw-r--r-- | src/prog.mk | 13 | ||||
-rw-r--r-- | src/so.mk | 6 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/prog.mk b/src/prog.mk index 82920c240..84f43142d 100644 --- a/src/prog.mk +++ b/src/prog.mk | |||
@@ -9,10 +9,15 @@ HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS) | |||
9 | SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS) | 9 | SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS) |
10 | OBJS := $(SRCS:.c=.o) $(MOD_OBJS) | 10 | OBJS := $(SRCS:.c=.o) $(MOD_OBJS) |
11 | 11 | ||
12 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) | 12 | CFLAGS += \ |
13 | CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' -DVARDIR='"/var/lib/firejail"' | 13 | -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' \ |
14 | CFLAGS += $(MANFLAGS) | 14 | -fstack-protector-all -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security \ |
15 | CFLAGS += -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -Wformat -Wformat-security | 15 | -fPIE \ |
16 | -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \ | ||
17 | -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \ | ||
18 | -DVARDIR='"/var/lib/firejail"' \ | ||
19 | $(HAVE_GCOV) $(MANFLAGS) | ||
20 | |||
16 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now | 21 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now |
17 | 22 | ||
18 | .PHONY: all | 23 | .PHONY: all |
@@ -9,7 +9,11 @@ HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS) | |||
9 | SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS) | 9 | SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS) |
10 | OBJS := $(SRCS:.c=.o) $(MOD_OBJS) | 10 | OBJS := $(SRCS:.c=.o) $(MOD_OBJS) |
11 | 11 | ||
12 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security | 12 | CFLAGS += \ |
13 | -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' \ | ||
14 | -fstack-protector-all -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security \ | ||
15 | -fPIC | ||
16 | |||
13 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now | 17 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now |
14 | 18 | ||
15 | .PHONY: all | 19 | .PHONY: all |