diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-05-03 05:47:23 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-11-21 17:36:47 -0300 |
commit | adbd02f4213666cf68a455599dc366a840b3ad25 (patch) | |
tree | 309bc6cb59c25b64d45ac32d0a23ac199b784782 | |
parent | makefiles: deduplicate main target name into new SO var (diff) | |
download | firejail-adbd02f4213666cf68a455599dc366a840b3ad25.tar.gz firejail-adbd02f4213666cf68a455599dc366a840b3ad25.tar.zst firejail-adbd02f4213666cf68a455599dc366a840b3ad25.zip |
makefiles: deduplicate lib makefiles into so.mk
The following makefiles are nearly identical, except for the main target
name and for any extra headers that they might use:
* src/libpostexecseccomp/Makefile
* src/libtrace/Makefile
* src/libtracelog/Makefile
So move all of their (duplicated) code into a new src/so.mk file, and
add an include of src/so.mk, which leaves only variables, and the
includes of config.mk and src/so.mk in place.
With this commit, CFLAGS and LDFLAGS are only defined/changed in the
following files:
* config.mk.in
* src/common.mk
* src/so.mk
-rw-r--r-- | src/libpostexecseccomp/Makefile | 21 | ||||
-rw-r--r-- | src/libtrace/Makefile | 21 | ||||
-rw-r--r-- | src/libtracelog/Makefile | 21 | ||||
-rw-r--r-- | src/so.mk | 25 |
4 files changed, 28 insertions, 60 deletions
diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile index 304138f52..62e167b73 100644 --- a/src/libpostexecseccomp/Makefile +++ b/src/libpostexecseccomp/Makefile | |||
@@ -6,23 +6,4 @@ TARGET = $(SO) | |||
6 | 6 | ||
7 | MOD_HDRS = ../include/seccomp.h ../include/rundefs.h | 7 | MOD_HDRS = ../include/seccomp.h ../include/rundefs.h |
8 | 8 | ||
9 | HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS) | 9 | include $(ROOT)/src/so.mk |
10 | SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS) | ||
11 | OBJS := $(SRCS:.c=.o) $(MOD_OBJS) | ||
12 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security | ||
13 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now | ||
14 | |||
15 | .PHONY: all | ||
16 | all: $(TARGET) | ||
17 | |||
18 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
19 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ | ||
20 | |||
21 | $(SO): $(OBJS) $(ROOT)/config.mk | ||
22 | $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl | ||
23 | |||
24 | .PHONY: clean | ||
25 | clean:; rm -fr $(OBJS) $(SO) *.plist | ||
26 | |||
27 | .PHONY: distclean | ||
28 | distclean: clean | ||
diff --git a/src/libtrace/Makefile b/src/libtrace/Makefile index cb2d66667..d45b3e2f6 100644 --- a/src/libtrace/Makefile +++ b/src/libtrace/Makefile | |||
@@ -4,23 +4,4 @@ ROOT = ../.. | |||
4 | SO = libtrace.so | 4 | SO = libtrace.so |
5 | TARGET = $(SO) | 5 | TARGET = $(SO) |
6 | 6 | ||
7 | HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS) | 7 | include $(ROOT)/src/so.mk |
8 | SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS) | ||
9 | OBJS := $(SRCS:.c=.o) $(MOD_OBJS) | ||
10 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security | ||
11 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now | ||
12 | |||
13 | .PHONY: all | ||
14 | all: $(TARGET) | ||
15 | |||
16 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
17 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ | ||
18 | |||
19 | $(SO): $(OBJS) $(ROOT)/config.mk | ||
20 | $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl | ||
21 | |||
22 | .PHONY: clean | ||
23 | clean:; rm -fr $(OBJS) $(SO) *.plist | ||
24 | |||
25 | .PHONY: distclean | ||
26 | distclean: clean | ||
diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile index e272fd77e..bfc5adddc 100644 --- a/src/libtracelog/Makefile +++ b/src/libtracelog/Makefile | |||
@@ -6,23 +6,4 @@ TARGET = $(SO) | |||
6 | 6 | ||
7 | MOD_HDRS = ../include/rundefs.h | 7 | MOD_HDRS = ../include/rundefs.h |
8 | 8 | ||
9 | HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS) | 9 | include $(ROOT)/src/so.mk |
10 | SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS) | ||
11 | OBJS := $(SRCS:.c=.o) $(MOD_OBJS) | ||
12 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security | ||
13 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now | ||
14 | |||
15 | .PHONY: all | ||
16 | all: $(TARGET) | ||
17 | |||
18 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
19 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ | ||
20 | |||
21 | $(SO): $(OBJS) $(ROOT)/config.mk | ||
22 | $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl | ||
23 | |||
24 | .PHONY: clean | ||
25 | clean:; rm -fr $(OBJS) $(SO) *.plist | ||
26 | |||
27 | .PHONY: distclean | ||
28 | distclean: clean | ||
diff --git a/src/so.mk b/src/so.mk new file mode 100644 index 000000000..bca127f93 --- /dev/null +++ b/src/so.mk | |||
@@ -0,0 +1,25 @@ | |||
1 | # Common definitions for making shared objects. | ||
2 | # | ||
3 | # Note: $(ROOT)/config.mk must be included before this file. | ||
4 | |||
5 | HDRS := $(sort $(wildcard *.h)) $(MOD_HDRS) | ||
6 | SRCS := $(sort $(wildcard *.c)) $(MOD_SRCS) | ||
7 | OBJS := $(SRCS:.c=.o) $(MOD_OBJS) | ||
8 | |||
9 | CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security | ||
10 | LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now | ||
11 | |||
12 | .PHONY: all | ||
13 | all: $(TARGET) | ||
14 | |||
15 | %.o : %.c $(HDRS) $(ROOT)/config.mk | ||
16 | $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ | ||
17 | |||
18 | $(SO): $(OBJS) $(ROOT)/config.mk | ||
19 | $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl | ||
20 | |||
21 | .PHONY: clean | ||
22 | clean:; rm -fr $(OBJS) $(SO) *.plist | ||
23 | |||
24 | .PHONY: distclean | ||
25 | distclean: clean | ||