Skip to content

Commit

Permalink
makefiles: rename common.mk to prog.mk
Browse files Browse the repository at this point in the history 
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/' '{}')\" >'{}'"
  • Loading branch information
@kmk3
kmk3 committed Nov 21, 2022
1 parent adbd02f commit 3dcc7fa
Show file tree
Hide file tree
Showing 22 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/fbuilder/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ TARGET = $(PROG)

MOD_HDRS = ../include/common.h ../include/syscall.h

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/fcopy/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ TARGET = $(PROG)
MOD_HDRS = ../include/common.h ../include/syscall.h
MOD_OBJS = ../lib/common.o

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/fids/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ TARGET = $(PROG)

MOD_HDRS = ../include/common.h

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/firecfg/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ MOD_HDRS = \

MOD_OBJS = ../lib/common.o ../lib/firejail_user.o

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/firejail/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ MOD_OBJS = \
../lib/errno.o \
../lib/syscall.o

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/firemon/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ TARGET = $(PROG)
MOD_HDRS = ../include/common.h ../include/pid.h
MOD_OBJS = ../lib/common.o ../lib/pid.o

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/fldd/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ TARGET = $(PROG)
MOD_HDRS = ../include/common.h ../include/syscall.h ../include/ldd_utils.h
MOD_OBJS = ../lib/common.o ../lib/ldd_utils.o

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/fnet/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ TARGET = $(PROG)
MOD_HDRS = ../include/common.h ../include/libnetlink.h
MOD_OBJS = ../lib/common.o ../lib/libnetlink.o

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/fnetfilter/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ TARGET = $(PROG)
MOD_HDRS = ../include/common.h ../include/syscall.h
MOD_OBJS = ../lib/common.o

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/fnettrace-dns/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ROOT = ../..
PROG = fnettrace-dns
TARGET = $(PROG)

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/fnettrace-icmp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ROOT = ../..
PROG = fnettrace-icmp
TARGET = $(PROG)

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/fnettrace-sni/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ROOT = ../..
PROG = fnettrace-sni
TARGET = $(PROG)

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/fnettrace/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ROOT = ../..
PROG = fnettrace
TARGET = $(PROG)

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/fsec-optimize/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ TARGET = $(PROG)
MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
MOD_OBJS = ../lib/common.o ../lib/errno.o

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/fsec-print/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ TARGET = $(PROG)
MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/fseccomp/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ TARGET = $(PROG)
MOD_HDRS = ../include/common.h ../include/syscall.h
MOD_OBJS = ../lib/common.o ../lib/errno.o ../lib/syscall.o

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/ftee/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ROOT = ../..
PROG = ftee
TARGET = $(PROG)

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/fzenity/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ TARGET = $(PROG)

MOD_HDRS = ../include/common.h

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/jailcheck/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ TARGET = $(PROG)
MOD_HDRS = ../include/common.h ../include/pid.h
MOD_OBJS = ../lib/common.o ../lib/pid.o

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
2 changes: 1 addition & 1 deletion src/lib/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ROOT = ../..

TARGET = lib

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk

.PHONY: lib
lib: $(OBJS)
2 changes: 1 addition & 1 deletion src/profstats/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ TARGET = $(PROG)

MOD_HDRS = ../include/common.h

include $(ROOT)/src/common.mk
include $(ROOT)/src/prog.mk
0 src/common.mk → src/prog.mk
View file
File renamed without changes.

0 comments on commit 3dcc7fa

Please sign in to comment.