aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-10-25 15:08:02 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-11-21 17:37:17 -0300
commit3dcc7fa38f065fc1d15d07ed047ec37111379928 (patch)
treeea2354a46bdb661158c4a7f3e2fb001ad042748b /src
parentmakefiles: deduplicate lib makefiles into so.mk (diff)
downloadfirejail-3dcc7fa38f065fc1d15d07ed047ec37111379928.tar.gz
firejail-3dcc7fa38f065fc1d15d07ed047ec37111379928.tar.zst
firejail-3dcc7fa38f065fc1d15d07ed047ec37111379928.zip
makefiles: rename common.mk to prog.mk
For clarity, as it is included by the Makefiles that create programs and non-shared-objects, but not by the ones that create shared objects (see src/so.mk). Commands used to move and search and replace: $ git mv src/common.mk src/prog.mk $ git grep -IFlz 'common.mk' -- src | xargs -0 -I '{}' sh -c \ "printf '%s\n' \"\$(sed 's/common.mk/prog.mk/' '{}')\" >'{}'"
Diffstat (limited to 'src')
-rw-r--r--src/fbuilder/Makefile2
-rw-r--r--src/fcopy/Makefile2
-rw-r--r--src/fids/Makefile2
-rw-r--r--src/firecfg/Makefile2
-rw-r--r--src/firejail/Makefile2
-rw-r--r--src/firemon/Makefile2
-rw-r--r--src/fldd/Makefile2
-rw-r--r--src/fnet/Makefile2
-rw-r--r--src/fnetfilter/Makefile2
-rw-r--r--src/fnettrace-dns/Makefile2
-rw-r--r--src/fnettrace-icmp/Makefile2
-rw-r--r--src/fnettrace-sni/Makefile2
-rw-r--r--src/fnettrace/Makefile2
-rw-r--r--src/fsec-optimize/Makefile2
-rw-r--r--src/fsec-print/Makefile2
-rw-r--r--src/fseccomp/Makefile2
-rw-r--r--src/ftee/Makefile2
-rw-r--r--src/fzenity/Makefile2
-rw-r--r--src/jailcheck/Makefile2
-rw-r--r--src/lib/Makefile2
-rw-r--r--src/profstats/Makefile2
-rw-r--r--src/prog.mk (renamed from src/common.mk)0
22 files changed, 21 insertions, 21 deletions
diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile
index 4a7f97a69..ad73e8960 100644
--- a/src/fbuilder/Makefile
+++ b/src/fbuilder/Makefile
@@ -6,4 +6,4 @@ TARGET = $(PROG)
6 6
7MOD_HDRS = ../include/common.h ../include/syscall.h 7MOD_HDRS = ../include/common.h ../include/syscall.h
8 8
9include $(ROOT)/src/common.mk 9include $(ROOT)/src/prog.mk
diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile
index f7d063a1e..27054627c 100644
--- a/src/fcopy/Makefile
+++ b/src/fcopy/Makefile
@@ -7,4 +7,4 @@ TARGET = $(PROG)
7MOD_HDRS = ../include/common.h ../include/syscall.h 7MOD_HDRS = ../include/common.h ../include/syscall.h
8MOD_OBJS = ../lib/common.o 8MOD_OBJS = ../lib/common.o
9 9
10include $(ROOT)/src/common.mk 10include $(ROOT)/src/prog.mk
diff --git a/src/fids/Makefile b/src/fids/Makefile
index ffc2a6c2b..44ea396d7 100644
--- a/src/fids/Makefile
+++ b/src/fids/Makefile
@@ -6,4 +6,4 @@ TARGET = $(PROG)
6 6
7MOD_HDRS = ../include/common.h 7MOD_HDRS = ../include/common.h
8 8
9include $(ROOT)/src/common.mk 9include $(ROOT)/src/prog.mk
diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile
index 3d271d875..05cc088f4 100644
--- a/src/firecfg/Makefile
+++ b/src/firecfg/Makefile
@@ -13,4 +13,4 @@ MOD_HDRS = \
13 13
14MOD_OBJS = ../lib/common.o ../lib/firejail_user.o 14MOD_OBJS = ../lib/common.o ../lib/firejail_user.o
15 15
16include $(ROOT)/src/common.mk 16include $(ROOT)/src/prog.mk
diff --git a/src/firejail/Makefile b/src/firejail/Makefile
index 1a8b82f89..4e241af7e 100644
--- a/src/firejail/Makefile
+++ b/src/firejail/Makefile
@@ -22,4 +22,4 @@ MOD_OBJS = \
22../lib/errno.o \ 22../lib/errno.o \
23../lib/syscall.o 23../lib/syscall.o
24 24
25include $(ROOT)/src/common.mk 25include $(ROOT)/src/prog.mk
diff --git a/src/firemon/Makefile b/src/firemon/Makefile
index 6887f4a39..433e4267d 100644
--- a/src/firemon/Makefile
+++ b/src/firemon/Makefile
@@ -7,4 +7,4 @@ TARGET = $(PROG)
7MOD_HDRS = ../include/common.h ../include/pid.h 7MOD_HDRS = ../include/common.h ../include/pid.h
8MOD_OBJS = ../lib/common.o ../lib/pid.o 8MOD_OBJS = ../lib/common.o ../lib/pid.o
9 9
10include $(ROOT)/src/common.mk 10include $(ROOT)/src/prog.mk
diff --git a/src/fldd/Makefile b/src/fldd/Makefile
index 18e215be6..0c127af55 100644
--- a/src/fldd/Makefile
+++ b/src/fldd/Makefile
@@ -7,4 +7,4 @@ TARGET = $(PROG)
7MOD_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h 7MOD_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h
8MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o 8MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o
9 9
10include $(ROOT)/src/common.mk 10include $(ROOT)/src/prog.mk
diff --git a/src/fnet/Makefile b/src/fnet/Makefile
index 2c655cbc9..91de109fa 100644
--- a/src/fnet/Makefile
+++ b/src/fnet/Makefile
@@ -7,4 +7,4 @@ TARGET = $(PROG)
7MOD_HDRS = ../include/common.h ../include/libnetlink.h 7MOD_HDRS = ../include/common.h ../include/libnetlink.h
8MOD_OBJS = ../lib/common.o ../lib/libnetlink.o 8MOD_OBJS = ../lib/common.o ../lib/libnetlink.o
9 9
10include $(ROOT)/src/common.mk 10include $(ROOT)/src/prog.mk
diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile
index 37363f1fb..506d287ab 100644
--- a/src/fnetfilter/Makefile
+++ b/src/fnetfilter/Makefile
@@ -7,4 +7,4 @@ TARGET = $(PROG)
7MOD_HDRS = ../include/common.h ../include/syscall.h 7MOD_HDRS = ../include/common.h ../include/syscall.h
8MOD_OBJS = ../lib/common.o 8MOD_OBJS = ../lib/common.o
9 9
10include $(ROOT)/src/common.mk 10include $(ROOT)/src/prog.mk
diff --git a/src/fnettrace-dns/Makefile b/src/fnettrace-dns/Makefile
index 404951cf9..36542f567 100644
--- a/src/fnettrace-dns/Makefile
+++ b/src/fnettrace-dns/Makefile
@@ -4,4 +4,4 @@ ROOT = ../..
4PROG = fnettrace-dns 4PROG = fnettrace-dns
5TARGET = $(PROG) 5TARGET = $(PROG)
6 6
7include $(ROOT)/src/common.mk 7include $(ROOT)/src/prog.mk
diff --git a/src/fnettrace-icmp/Makefile b/src/fnettrace-icmp/Makefile
index 2b8e7b078..12ae42e9a 100644
--- a/src/fnettrace-icmp/Makefile
+++ b/src/fnettrace-icmp/Makefile
@@ -4,4 +4,4 @@ ROOT = ../..
4PROG = fnettrace-icmp 4PROG = fnettrace-icmp
5TARGET = $(PROG) 5TARGET = $(PROG)
6 6
7include $(ROOT)/src/common.mk 7include $(ROOT)/src/prog.mk
diff --git a/src/fnettrace-sni/Makefile b/src/fnettrace-sni/Makefile
index ea849c01b..8d9a437d5 100644
--- a/src/fnettrace-sni/Makefile
+++ b/src/fnettrace-sni/Makefile
@@ -4,4 +4,4 @@ ROOT = ../..
4PROG = fnettrace-sni 4PROG = fnettrace-sni
5TARGET = $(PROG) 5TARGET = $(PROG)
6 6
7include $(ROOT)/src/common.mk 7include $(ROOT)/src/prog.mk
diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile
index 51e4a9c91..952036ad3 100644
--- a/src/fnettrace/Makefile
+++ b/src/fnettrace/Makefile
@@ -4,4 +4,4 @@ ROOT = ../..
4PROG = fnettrace 4PROG = fnettrace
5TARGET = $(PROG) 5TARGET = $(PROG)
6 6
7include $(ROOT)/src/common.mk 7include $(ROOT)/src/prog.mk
diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile
index 95dd8dc94..ce65f4719 100644
--- a/src/fsec-optimize/Makefile
+++ b/src/fsec-optimize/Makefile
@@ -7,4 +7,4 @@ TARGET = $(PROG)
7MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h 7MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
8MOD_OBJS = ../lib/common.o ../lib/errno.o 8MOD_OBJS = ../lib/common.o ../lib/errno.o
9 9
10include $(ROOT)/src/common.mk 10include $(ROOT)/src/prog.mk
diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile
index b7849391d..cbe061d45 100644
--- a/src/fsec-print/Makefile
+++ b/src/fsec-print/Makefile
@@ -7,4 +7,4 @@ TARGET = $(PROG)
7MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h 7MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
8MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o 8MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
9 9
10include $(ROOT)/src/common.mk 10include $(ROOT)/src/prog.mk
diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile
index 048097621..1b8d0bb48 100644
--- a/src/fseccomp/Makefile
+++ b/src/fseccomp/Makefile
@@ -7,4 +7,4 @@ TARGET = $(PROG)
7MOD_HDRS = ../include/common.h ../include/syscall.h 7MOD_HDRS = ../include/common.h ../include/syscall.h
8MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o 8MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o
9 9
10include $(ROOT)/src/common.mk 10include $(ROOT)/src/prog.mk
diff --git a/src/ftee/Makefile b/src/ftee/Makefile
index 91df30d76..2f26ab900 100644
--- a/src/ftee/Makefile
+++ b/src/ftee/Makefile
@@ -4,4 +4,4 @@ ROOT = ../..
4PROG = ftee 4PROG = ftee
5TARGET = $(PROG) 5TARGET = $(PROG)
6 6
7include $(ROOT)/src/common.mk 7include $(ROOT)/src/prog.mk
diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile
index d3364fa13..aeb862d9b 100644
--- a/src/fzenity/Makefile
+++ b/src/fzenity/Makefile
@@ -6,4 +6,4 @@ TARGET = $(PROG)
6 6
7MOD_HDRS = ../include/common.h 7MOD_HDRS = ../include/common.h
8 8
9include $(ROOT)/src/common.mk 9include $(ROOT)/src/prog.mk
diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile
index 2c2f1b548..e3b84fbf3 100644
--- a/src/jailcheck/Makefile
+++ b/src/jailcheck/Makefile
@@ -7,4 +7,4 @@ TARGET = $(PROG)
7MOD_HDRS = ../include/common.h ../include/pid.h 7MOD_HDRS = ../include/common.h ../include/pid.h
8MOD_OBJS = ../lib/common.o ../lib/pid.o 8MOD_OBJS = ../lib/common.o ../lib/pid.o
9 9
10include $(ROOT)/src/common.mk 10include $(ROOT)/src/prog.mk
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 4e44eae62..f5b92e389 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -3,7 +3,7 @@ ROOT = ../..
3 3
4TARGET = lib 4TARGET = lib
5 5
6include $(ROOT)/src/common.mk 6include $(ROOT)/src/prog.mk
7 7
8.PHONY: lib 8.PHONY: lib
9lib: $(OBJS) 9lib: $(OBJS)
diff --git a/src/profstats/Makefile b/src/profstats/Makefile
index 314b7554d..47b39e76c 100644
--- a/src/profstats/Makefile
+++ b/src/profstats/Makefile
@@ -6,4 +6,4 @@ TARGET = $(PROG)
6 6
7MOD_HDRS = ../include/common.h 7MOD_HDRS = ../include/common.h
8 8
9include $(ROOT)/src/common.mk 9include $(ROOT)/src/prog.mk
diff --git a/src/common.mk b/src/prog.mk
index 6ec216b46..6ec216b46 100644
--- a/src/common.mk
+++ b/src/prog.mk
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-06-26 08:51:52 +0000