diff options
author | 2022-05-03 23:40:57 -0300 | |
---|---|---|
committer | 2022-11-21 16:59:43 -0300 | |
commit | 85e42edc448ea6384de43e4fcf8ac0d949c043d5 (patch) | |
tree | 08e60ac19c1b1e3d8305540baab400b1d5ec30f7 | |
parent | makefiles: include config.mk directly (diff) | |
download | firejail-85e42edc448ea6384de43e4fcf8ac0d949c043d5.tar.gz firejail-85e42edc448ea6384de43e4fcf8ac0d949c043d5.tar.zst firejail-85e42edc448ea6384de43e4fcf8ac0d949c043d5.zip |
makefiles: equalize object dependencies in program targets
Compared to the objects that are actually used in a given recipe, some
program targets are missing object dependencies, while others appear to
have unused object dependencies.
Make each of those targets depend on the objects that are actually used
when linking.
Note: No check was done for extraneous/missing objects when linking;
this commit only makes the object dependencies equal to the objects
that are linked.
-rw-r--r-- | src/firejail/Makefile | 2 | ||||
-rw-r--r-- | src/fsec-optimize/Makefile | 2 | ||||
-rw-r--r-- | src/fsec-print/Makefile | 2 | ||||
-rw-r--r-- | src/jailcheck/Makefile | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/firejail/Makefile b/src/firejail/Makefile index 6473e4aa0..885ab7b10 100644 --- a/src/firejail/Makefile +++ b/src/firejail/Makefile | |||
@@ -9,7 +9,7 @@ include $(ROOT)/src/common.mk | |||
9 | %.o : %.c $(H_FILE_LIST) ../include/rundefs.h ../include/common.h ../include/ldd_utils.h ../include/euid_common.h ../include/pid.h ../include/seccomp.h ../include/syscall_i386.h ../include/syscall_x86_64.h ../include/firejail_user.h $(ROOT)/config.mk | 9 | %.o : %.c $(H_FILE_LIST) ../include/rundefs.h ../include/common.h ../include/ldd_utils.h ../include/euid_common.h ../include/pid.h ../include/seccomp.h ../include/syscall_i386.h ../include/syscall_x86_64.h ../include/firejail_user.h $(ROOT)/config.mk |
10 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 10 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
11 | 11 | ||
12 | firejail: $(OBJS) ../lib/libnetlink.o ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk | 12 | firejail: $(OBJS) ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk |
13 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) | 13 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) |
14 | 14 | ||
15 | .PHONY: clean | 15 | .PHONY: clean |
diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile index 2aae732cb..7cc2441a3 100644 --- a/src/fsec-optimize/Makefile +++ b/src/fsec-optimize/Makefile | |||
@@ -9,7 +9,7 @@ include $(ROOT)/src/common.mk | |||
9 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk | 9 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk |
10 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 10 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
11 | 11 | ||
12 | fsec-optimize: $(OBJS) ../lib/common.o ../lib/libnetlink.o $(ROOT)/config.mk | 12 | fsec-optimize: $(OBJS) ../lib/common.o ../lib/errno.o $(ROOT)/config.mk |
13 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o $(LIBS) $(EXTRA_LDFLAGS) | 13 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o $(LIBS) $(EXTRA_LDFLAGS) |
14 | 14 | ||
15 | .PHONY: clean | 15 | .PHONY: clean |
diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile index 354c72c08..a83dcca3d 100644 --- a/src/fsec-print/Makefile +++ b/src/fsec-print/Makefile | |||
@@ -9,7 +9,7 @@ include $(ROOT)/src/common.mk | |||
9 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk | 9 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk |
10 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 10 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
11 | 11 | ||
12 | fsec-print: $(OBJS) ../lib/common.o ../lib/libnetlink.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk | 12 | fsec-print: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(ROOT)/config.mk |
13 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) | 13 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) |
14 | 14 | ||
15 | .PHONY: clean | 15 | .PHONY: clean |
diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile index f21252a56..f6d5b0f85 100644 --- a/src/jailcheck/Makefile +++ b/src/jailcheck/Makefile | |||
@@ -9,8 +9,8 @@ include $(ROOT)/src/common.mk | |||
9 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h $(ROOT)/config.mk | 9 | %.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h $(ROOT)/config.mk |
10 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 10 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
11 | 11 | ||
12 | jailcheck: $(OBJS) $(ROOT)/config.mk | 12 | jailcheck: $(OBJS) ../lib/common.o ../lib/pid.o $(ROOT)/config.mk |
13 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS) | 13 | $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS) |
14 | 14 | ||
15 | .PHONY: clean | 15 | .PHONY: clean |
16 | clean:; rm -fr *.o jailcheck *.gcov *.gcda *.gcno *.plist | 16 | clean:; rm -fr *.o jailcheck *.gcov *.gcda *.gcno *.plist |