From 862dff04436649b533deaf489f5715e273a5bef7 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sun, 18 Jun 2023 04:11:46 -0300 Subject: build: remove MOD_SRCS variable It is unused and is unlikely to be used. Added on commit f5b1ccaad ("makefiles: move extra deps into new MOD vars", 2022-05-07) / PR #5478. --- src/prog.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/prog.mk') diff --git a/src/prog.mk b/src/prog.mk index e4473184f..ba089d39d 100644 --- a/src/prog.mk +++ b/src/prog.mk @@ -3,10 +3,10 @@ # Note: $(ROOT)/config.mk must be included before this file. # # The includer should probably define PROG and TARGET and may also want to -# define MOD_HDRS, MOD_SRCS, MOD_OBJS, TOCLEAN and TODISTCLEAN. +# define MOD_HDRS, MOD_OBJS, TOCLEAN and TODISTCLEAN. HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS) -SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS) +SRCS := $(sort $(wildcard *.c)) OBJS := $(SRCS:.c=.o) $(MOD_OBJS) PROG_CFLAGS = \ -- cgit v1.2.3-54-g00ecf From 5cba21bad5383a4d2c4f7da5df7395e0c3b9eba3 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Fri, 16 Jun 2023 23:55:50 -0300 Subject: build: rename MOD vars to EXTRA vars To make them less confusing, as they are extra dependencies, not files that are specific to the module. Commands used to search and replace: $ git grep -IFlz -e 'MOD_HDRS' -e 'MOD_OBJS' -- src | xargs -0 -I '{}' sh -c "printf '%s\n' \"\$(sed \ -e 's/MOD_HDRS/EXTRA_HDRS/g' \ -e 's/MOD_OBJS/EXTRA_OBJS/g' '{}')\" >'{}'" Added on commit f5b1ccaad ("makefiles: move extra deps into new MOD vars", 2022-05-07) / PR #5478. --- src/etc-cleanup/Makefile | 2 +- src/fbuilder/Makefile | 2 +- src/fcopy/Makefile | 4 ++-- src/fids/Makefile | 2 +- src/firecfg/Makefile | 4 ++-- src/firejail/Makefile | 4 ++-- src/firemon/Makefile | 4 ++-- src/fldd/Makefile | 4 ++-- src/fnet/Makefile | 4 ++-- src/fnetfilter/Makefile | 4 ++-- src/fsec-optimize/Makefile | 4 ++-- src/fsec-print/Makefile | 4 ++-- src/fseccomp/Makefile | 4 ++-- src/fzenity/Makefile | 2 +- src/jailcheck/Makefile | 4 ++-- src/libpostexecseccomp/Makefile | 2 +- src/libtracelog/Makefile | 2 +- src/profstats/Makefile | 2 +- src/prog.mk | 6 +++--- src/so.mk | 6 +++--- 20 files changed, 35 insertions(+), 35 deletions(-) (limited to 'src/prog.mk') diff --git a/src/etc-cleanup/Makefile b/src/etc-cleanup/Makefile index c8a12476e..c3c482bdb 100644 --- a/src/etc-cleanup/Makefile +++ b/src/etc-cleanup/Makefile @@ -5,6 +5,6 @@ ROOT = ../.. PROG = etc-cleanup TARGET = $(PROG) -MOD_HDRS = ../include/etc_groups.h +EXTRA_HDRS = ../include/etc_groups.h include $(ROOT)/src/prog.mk diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile index 7595f0775..634bf725f 100644 --- a/src/fbuilder/Makefile +++ b/src/fbuilder/Makefile @@ -5,6 +5,6 @@ ROOT = ../.. PROG = fbuilder TARGET = $(PROG) -MOD_HDRS = ../include/common.h ../include/syscall.h +EXTRA_HDRS = ../include/common.h ../include/syscall.h include $(ROOT)/src/prog.mk diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile index e2956fdd1..a3c4abe9d 100644 --- a/src/fcopy/Makefile +++ b/src/fcopy/Makefile @@ -5,7 +5,7 @@ ROOT = ../.. PROG = fcopy TARGET = $(PROG) -MOD_HDRS = ../include/common.h ../include/syscall.h -MOD_OBJS = ../lib/common.o +EXTRA_HDRS = ../include/common.h ../include/syscall.h +EXTRA_OBJS = ../lib/common.o include $(ROOT)/src/prog.mk diff --git a/src/fids/Makefile b/src/fids/Makefile index 901cbb470..76388a03d 100644 --- a/src/fids/Makefile +++ b/src/fids/Makefile @@ -5,6 +5,6 @@ ROOT = ../.. PROG = fids TARGET = $(PROG) -MOD_HDRS = ../include/common.h +EXTRA_HDRS = ../include/common.h include $(ROOT)/src/prog.mk diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile index 59b713f1b..de4639ab6 100644 --- a/src/firecfg/Makefile +++ b/src/firecfg/Makefile @@ -5,13 +5,13 @@ ROOT = ../.. PROG = firecfg TARGET = $(PROG) -MOD_HDRS = \ +EXTRA_HDRS = \ ../include/common.h \ ../include/euid_common.h \ ../include/libnetlink.h \ ../include/firejail_user.h \ ../include/pid.h -MOD_OBJS = ../lib/common.o ../lib/firejail_user.o +EXTRA_OBJS = ../lib/common.o ../lib/firejail_user.o include $(ROOT)/src/prog.mk diff --git a/src/firejail/Makefile b/src/firejail/Makefile index 53bccf843..d3a4b4f81 100644 --- a/src/firejail/Makefile +++ b/src/firejail/Makefile @@ -5,7 +5,7 @@ ROOT = ../.. PROG = firejail TARGET = $(PROG) -MOD_HDRS = \ +EXTRA_HDRS = \ ../include/rundefs.h \ ../include/common.h \ ../include/ldd_utils.h \ @@ -18,7 +18,7 @@ MOD_HDRS = \ ../include/etc_groups.h -MOD_OBJS = \ +EXTRA_OBJS = \ ../lib/common.o \ ../lib/ldd_utils.o \ ../lib/firejail_user.o \ diff --git a/src/firemon/Makefile b/src/firemon/Makefile index e0059aee5..09387f3eb 100644 --- a/src/firemon/Makefile +++ b/src/firemon/Makefile @@ -5,7 +5,7 @@ ROOT = ../.. PROG = firemon TARGET = $(PROG) -MOD_HDRS = ../include/common.h ../include/pid.h -MOD_OBJS = ../lib/common.o ../lib/pid.o +EXTRA_HDRS = ../include/common.h ../include/pid.h +EXTRA_OBJS = ../lib/common.o ../lib/pid.o include $(ROOT)/src/prog.mk diff --git a/src/fldd/Makefile b/src/fldd/Makefile index 86693a76c..7fec70a33 100644 --- a/src/fldd/Makefile +++ b/src/fldd/Makefile @@ -5,7 +5,7 @@ ROOT = ../.. PROG = fldd TARGET = $(PROG) -MOD_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h -MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o +EXTRA_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h +EXTRA_OBJS = ../lib/common.o ../lib/ldd_utils.o include $(ROOT)/src/prog.mk diff --git a/src/fnet/Makefile b/src/fnet/Makefile index 8efc6d26b..50bfdfffd 100644 --- a/src/fnet/Makefile +++ b/src/fnet/Makefile @@ -5,7 +5,7 @@ ROOT = ../.. PROG = fnet TARGET = $(PROG) -MOD_HDRS = ../include/common.h ../include/libnetlink.h -MOD_OBJS = ../lib/common.o ../lib/libnetlink.o +EXTRA_HDRS = ../include/common.h ../include/libnetlink.h +EXTRA_OBJS = ../lib/common.o ../lib/libnetlink.o include $(ROOT)/src/prog.mk diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile index 2be8311ae..156af3ed0 100644 --- a/src/fnetfilter/Makefile +++ b/src/fnetfilter/Makefile @@ -5,7 +5,7 @@ ROOT = ../.. PROG = fnetfilter TARGET = $(PROG) -MOD_HDRS = ../include/common.h ../include/syscall.h -MOD_OBJS = ../lib/common.o +EXTRA_HDRS = ../include/common.h ../include/syscall.h +EXTRA_OBJS = ../lib/common.o include $(ROOT)/src/prog.mk diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile index 4941f13b1..5a14726a0 100644 --- a/src/fsec-optimize/Makefile +++ b/src/fsec-optimize/Makefile @@ -5,7 +5,7 @@ ROOT = ../.. PROG = fsec-optimize TARGET = $(PROG) -MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h -MOD_OBJS = ../lib/common.o ../lib/errno.o +EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h +EXTRA_OBJS = ../lib/common.o ../lib/errno.o include $(ROOT)/src/prog.mk diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile index 78e87a93f..d55167796 100644 --- a/src/fsec-print/Makefile +++ b/src/fsec-print/Makefile @@ -5,7 +5,7 @@ ROOT = ../.. PROG = fsec-print TARGET = $(PROG) -MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h -MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o +EXTRA_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h +EXTRA_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o include $(ROOT)/src/prog.mk diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile index 461179f4d..f8c35d41f 100644 --- a/src/fseccomp/Makefile +++ b/src/fseccomp/Makefile @@ -5,7 +5,7 @@ ROOT = ../.. PROG = fseccomp TARGET = $(PROG) -MOD_HDRS = ../include/common.h ../include/syscall.h -MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o +EXTRA_HDRS = ../include/common.h ../include/syscall.h +EXTRA_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o include $(ROOT)/src/prog.mk diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile index a17a9252f..148babbe8 100644 --- a/src/fzenity/Makefile +++ b/src/fzenity/Makefile @@ -5,6 +5,6 @@ ROOT = ../.. PROG = fzenity TARGET = $(PROG) -MOD_HDRS = ../include/common.h +EXTRA_HDRS = ../include/common.h include $(ROOT)/src/prog.mk diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile index 23cd9c1a9..3b0b83412 100644 --- a/src/jailcheck/Makefile +++ b/src/jailcheck/Makefile @@ -5,7 +5,7 @@ ROOT = ../.. PROG = jailcheck TARGET = $(PROG) -MOD_HDRS = ../include/common.h ../include/pid.h -MOD_OBJS = ../lib/common.o ../lib/pid.o +EXTRA_HDRS = ../include/common.h ../include/pid.h +EXTRA_OBJS = ../lib/common.o ../lib/pid.o include $(ROOT)/src/prog.mk diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile index dfd8eb318..c5ec14672 100644 --- a/src/libpostexecseccomp/Makefile +++ b/src/libpostexecseccomp/Makefile @@ -5,6 +5,6 @@ ROOT = ../.. SO = libpostexecseccomp.so TARGET = $(SO) -MOD_HDRS = ../include/seccomp.h ../include/rundefs.h +EXTRA_HDRS = ../include/seccomp.h ../include/rundefs.h include $(ROOT)/src/so.mk diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile index ac48264df..2b43ce131 100644 --- a/src/libtracelog/Makefile +++ b/src/libtracelog/Makefile @@ -5,6 +5,6 @@ ROOT = ../.. SO = libtracelog.so TARGET = $(SO) -MOD_HDRS = ../include/rundefs.h +EXTRA_HDRS = ../include/rundefs.h include $(ROOT)/src/so.mk diff --git a/src/profstats/Makefile b/src/profstats/Makefile index b4cb1a6f7..ae88bf2fd 100644 --- a/src/profstats/Makefile +++ b/src/profstats/Makefile @@ -5,6 +5,6 @@ ROOT = ../.. PROG = profstats TARGET = $(PROG) -MOD_HDRS = ../include/common.h +EXTRA_HDRS = ../include/common.h include $(ROOT)/src/prog.mk diff --git a/src/prog.mk b/src/prog.mk index ba089d39d..77ad0f65b 100644 --- a/src/prog.mk +++ b/src/prog.mk @@ -3,11 +3,11 @@ # Note: $(ROOT)/config.mk must be included before this file. # # The includer should probably define PROG and TARGET and may also want to -# define MOD_HDRS, MOD_OBJS, TOCLEAN and TODISTCLEAN. +# define EXTRA_HDRS, EXTRA_OBJS, TOCLEAN and TODISTCLEAN. -HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS) +HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) SRCS := $(sort $(wildcard *.c)) -OBJS := $(SRCS:.c=.o) $(MOD_OBJS) +OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS) PROG_CFLAGS = \ -ggdb -O2 -DVERSION='"$(VERSION)"' \ diff --git a/src/so.mk b/src/so.mk index 0ba406c85..446bf1100 100644 --- a/src/so.mk +++ b/src/so.mk @@ -3,11 +3,11 @@ # Note: $(ROOT)/config.mk must be included before this file. # # The includer should probably define SO and TARGET and may also want to define -# MOD_HDRS, MOD_OBJS, TOCLEAN and TODISTCLEAN. +# EXTRA_HDRS, EXTRA_OBJS, TOCLEAN and TODISTCLEAN. -HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS) +HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) SRCS := $(sort $(wildcard *.c)) -OBJS := $(SRCS:.c=.o) $(MOD_OBJS) +OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS) SO_CFLAGS = \ -ggdb -O2 -DVERSION='"$(VERSION)"' \ -- cgit v1.2.3-54-g00ecf From b9864fd46ff583e019314855b7194df11c8a1050 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sun, 18 Jun 2023 04:24:28 -0300 Subject: build: rename TOCLEAN and TODISTCLEAN variables To CLEANFILES and DISTCLEANFILES, respectively. This matches what GNU automake uses. Commands used to search and replace: $ git grep -IFlz -e TOCLEAN -e TODISTCLEAN | xargs -0 -I '{}' sh -c "printf '%s\n' \"\$(sed \ -e 's/TOCLEAN/CLEANFILES/g' \ -e 's/TODISTCLEAN/DISTCLEANFILES/g' '{}')\" >'{}'" Added on commit cbdee6555 ("makefiles: add TOCLEAN and TODISTCLEAN variables", 2022-07-15) / PR #5478. --- src/prog.mk | 6 +++--- src/so.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/prog.mk') diff --git a/src/prog.mk b/src/prog.mk index 77ad0f65b..d138fc7ee 100644 --- a/src/prog.mk +++ b/src/prog.mk @@ -3,7 +3,7 @@ # Note: $(ROOT)/config.mk must be included before this file. # # The includer should probably define PROG and TARGET and may also want to -# define EXTRA_HDRS, EXTRA_OBJS, TOCLEAN and TODISTCLEAN. +# define EXTRA_HDRS, EXTRA_OBJS, CLEANFILES and DISTCLEANFILES. HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) SRCS := $(sort $(wildcard *.c)) @@ -33,7 +33,7 @@ $(PROG): $(OBJS) $(ROOT)/config.mk $(CC) $(PROG_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) .PHONY: clean -clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist $(TOCLEAN) +clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist $(CLEANFILES) .PHONY: distclean -distclean: clean; rm -fr $(TODISTCLEAN) +distclean: clean; rm -fr $(DISTCLEANFILES) diff --git a/src/so.mk b/src/so.mk index 446bf1100..f78f2aea6 100644 --- a/src/so.mk +++ b/src/so.mk @@ -3,7 +3,7 @@ # Note: $(ROOT)/config.mk must be included before this file. # # The includer should probably define SO and TARGET and may also want to define -# EXTRA_HDRS, EXTRA_OBJS, TOCLEAN and TODISTCLEAN. +# EXTRA_HDRS, EXTRA_OBJS, CLEANFILES and DISTCLEANFILES. HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) SRCS := $(sort $(wildcard *.c)) @@ -28,7 +28,7 @@ $(SO): $(OBJS) $(ROOT)/config.mk $(CC) $(SO_LDFLAGS) -shared -fPIC -z relro $(LDFLAGS) -o $@ $(OBJS) -ldl .PHONY: clean -clean:; rm -fr $(OBJS) $(SO) *.plist $(TOCLEAN) +clean:; rm -fr $(OBJS) $(SO) *.plist $(CLEANFILES) .PHONY: distclean -distclean: clean; rm -fr $(TODISTCLEAN) +distclean: clean; rm -fr $(DISTCLEANFILES) -- cgit v1.2.3-54-g00ecf From 75587a4de41dbf0bdc8fabdd7b2c39e3a46613a8 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sun, 18 Jun 2023 04:27:22 -0300 Subject: build: standardize clean/distclean targets in src Changes: * clean: remove the same types of files in src/prog.mk and src/so.mk * distclean: remove unused recipes and DISTCLEANFILES variable --- config.mk.in | 2 ++ src/prog.mk | 6 +++--- src/so.mk | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/prog.mk') diff --git a/config.mk.in b/config.mk.in index 6ee541507..8c9d61a2d 100644 --- a/config.mk.in +++ b/config.mk.in @@ -64,3 +64,5 @@ LIBS=@LIBS@ EXTRA_CFLAGS +=@EXTRA_CFLAGS@ EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ + +CLEANFILES = *.o *.gcov *.gcda *.gcno *.plist diff --git a/src/prog.mk b/src/prog.mk index d138fc7ee..5ed706da9 100644 --- a/src/prog.mk +++ b/src/prog.mk @@ -3,7 +3,7 @@ # Note: $(ROOT)/config.mk must be included before this file. # # The includer should probably define PROG and TARGET and may also want to -# define EXTRA_HDRS, EXTRA_OBJS, CLEANFILES and DISTCLEANFILES. +# define EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES. HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) SRCS := $(sort $(wildcard *.c)) @@ -33,7 +33,7 @@ $(PROG): $(OBJS) $(ROOT)/config.mk $(CC) $(PROG_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) .PHONY: clean -clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist $(CLEANFILES) +clean:; rm -fr $(PROG) $(CLEANFILES) .PHONY: distclean -distclean: clean; rm -fr $(DISTCLEANFILES) +distclean: clean diff --git a/src/so.mk b/src/so.mk index f78f2aea6..ee5d94a0f 100644 --- a/src/so.mk +++ b/src/so.mk @@ -3,7 +3,7 @@ # Note: $(ROOT)/config.mk must be included before this file. # # The includer should probably define SO and TARGET and may also want to define -# EXTRA_HDRS, EXTRA_OBJS, CLEANFILES and DISTCLEANFILES. +# EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES. HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) SRCS := $(sort $(wildcard *.c)) @@ -28,7 +28,7 @@ $(SO): $(OBJS) $(ROOT)/config.mk $(CC) $(SO_LDFLAGS) -shared -fPIC -z relro $(LDFLAGS) -o $@ $(OBJS) -ldl .PHONY: clean -clean:; rm -fr $(OBJS) $(SO) *.plist $(CLEANFILES) +clean:; rm -fr $(SO) $(CLEANFILES) .PHONY: distclean -distclean: clean; rm -fr $(DISTCLEANFILES) +distclean: clean -- cgit v1.2.3-54-g00ecf From 9c08da15bd18d5a131fef5d6937ad9103f20340d Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Fri, 23 Jun 2023 08:59:43 -0300 Subject: build: move common CFLAGS/LDFLAGS first --- src/prog.mk | 6 +++--- src/so.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/prog.mk') diff --git a/src/prog.mk b/src/prog.mk index 5ed706da9..38cf714db 100644 --- a/src/prog.mk +++ b/src/prog.mk @@ -14,14 +14,14 @@ PROG_CFLAGS = \ -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ -Wformat -Wformat-security \ -fstack-protector-all -D_FORTIFY_SOURCE=2 \ - -fPIE \ -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \ -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \ -DVARDIR='"/var/lib/firejail"' \ $(HAVE_GCOV) $(MANFLAGS) \ - $(EXTRA_CFLAGS) + $(EXTRA_CFLAGS) \ + -fPIE -PROG_LDFLAGS = -pie -fPIE -Wl,-z,relro -Wl,-z,now $(EXTRA_LDFLAGS) +PROG_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIE -pie $(EXTRA_LDFLAGS) .PHONY: all all: $(TARGET) diff --git a/src/so.mk b/src/so.mk index 7a8d09e89..ec0947933 100644 --- a/src/so.mk +++ b/src/so.mk @@ -16,7 +16,7 @@ SO_CFLAGS = \ -fstack-protector-all -D_FORTIFY_SOURCE=2 \ -fPIC -SO_LDFLAGS = -fPIC -Wl,-z,relro -Wl,-z,now +SO_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIC .PHONY: all all: $(TARGET) -- cgit v1.2.3-54-g00ecf From 07716128b12346e60146404cbd5d3ec799708d1d Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Sun, 18 Jun 2023 09:48:45 -0300 Subject: build: move remaining build flags into config.mk.in Put all definitions in the same file. --- config.mk.in | 24 ++++++++++++++++++++++-- src/prog.mk | 14 -------------- src/so.mk | 9 --------- 3 files changed, 22 insertions(+), 25 deletions(-) (limited to 'src/prog.mk') diff --git a/config.mk.in b/config.mk.in index 5cf83d9a5..b32431ad7 100644 --- a/config.mk.in +++ b/config.mk.in @@ -81,9 +81,29 @@ CFLAGS=@CFLAGS@ LDFLAGS=@LDFLAGS@ # Project variables -LIBS=@LIBS@ - EXTRA_CFLAGS +=@EXTRA_CFLAGS@ +PROG_CFLAGS = \ + -ggdb -O2 -DVERSION='"$(VERSION)"' \ + -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ + -Wformat -Wformat-security \ + -fstack-protector-all -D_FORTIFY_SOURCE=2 \ + -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \ + -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \ + -DVARDIR='"/var/lib/firejail"' \ + $(HAVE_GCOV) $(MANFLAGS) \ + $(EXTRA_CFLAGS) \ + -fPIE + +SO_CFLAGS = \ + -ggdb -O2 -DVERSION='"$(VERSION)"' \ + -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ + -Wformat -Wformat-security \ + -fstack-protector-all -D_FORTIFY_SOURCE=2 \ + -fPIC + EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ +PROG_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIE -pie $(EXTRA_LDFLAGS) +SO_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIC +LIBS =@LIBS@ CLEANFILES = *.o *.gcov *.gcda *.gcno *.plist diff --git a/src/prog.mk b/src/prog.mk index 38cf714db..70b3629b2 100644 --- a/src/prog.mk +++ b/src/prog.mk @@ -9,20 +9,6 @@ HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) SRCS := $(sort $(wildcard *.c)) OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS) -PROG_CFLAGS = \ - -ggdb -O2 -DVERSION='"$(VERSION)"' \ - -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ - -Wformat -Wformat-security \ - -fstack-protector-all -D_FORTIFY_SOURCE=2 \ - -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' \ - -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' \ - -DVARDIR='"/var/lib/firejail"' \ - $(HAVE_GCOV) $(MANFLAGS) \ - $(EXTRA_CFLAGS) \ - -fPIE - -PROG_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIE -pie $(EXTRA_LDFLAGS) - .PHONY: all all: $(TARGET) diff --git a/src/so.mk b/src/so.mk index ec0947933..dadffc52f 100644 --- a/src/so.mk +++ b/src/so.mk @@ -9,15 +9,6 @@ HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) SRCS := $(sort $(wildcard *.c)) OBJS := $(SRCS:.c=.o) $(EXTRA_OBJS) -SO_CFLAGS = \ - -ggdb -O2 -DVERSION='"$(VERSION)"' \ - -Wall -Wextra $(HAVE_FATAL_WARNINGS) \ - -Wformat -Wformat-security \ - -fstack-protector-all -D_FORTIFY_SOURCE=2 \ - -fPIC - -SO_LDFLAGS = -Wl,-z,relro -Wl,-z,now -fPIC - .PHONY: all all: $(TARGET) -- cgit v1.2.3-54-g00ecf