From 011d84b462a78703b9b939cb5e48b4cc75ebe015 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Tue, 10 May 2022 15:47:44 -0300 Subject: build: reduce autoconf input files from 32 to 2 Configure summary: autoconf essentially only parses configure.ac and generates the configure script (that is, the "./configure" shell script). The latter is what actually checks what is available on the system and internally sets the value of the output variables. It then, for every filename foo in AC_CONFIG_FILES (and for every output variable name BAR in AC_SUBST), reads foo.in, replaces every occurrence of `@BAR@` with the value of the shell variable `$BAR` and generates the file foo from the result. After this, configure is finished and `make` could be executed to start the build. Now that (as of #5140) all output variables are only defined on config.mk.in and on config.sh.in, there is no need to generate any makefile nor any other mkfile or shell script at configure time. So rename every "Makefile.in" to "Makefile", mkdeb.sh.in to mkdeb.sh, src/common.mk.in to src/common.mk and leave just config.mk and config.sh as the files to be generated at configure time. This allows editing and committing all makefiles directly, without potentially having to run ./configure in between. Commands used to rename the makefiles: $ git ls-files -z -- '*Makefile.in' | xargs -0 -I '{}' sh -c \ "git mv '{}' \"\$(dirname '{}')/Makefile\"" Additionally, from my (rudimentary) testing, this commit reduces the time it takes to run ./configure by about 20~25% compared to commit 72ece92ea ("Transmission fixes: drop private-lib (#5213)", 2022-06-22). Environment: dash 0.5.11.5-1, gcc 12.1.0-2, Artix Linux, ext4 on an HDD. Commands used for benchmarking each commit: $ : >time_configure && ./configure && make distclean && for i in $(seq 1 10); do { time -p ./configure; } 2>>time_configure; done $ grep real time_configure | awk '{ total += $2 } END { print total/NR }' --- src/bash_completion/Makefile | 17 +++++++++++++++++ src/bash_completion/Makefile.in | 18 ------------------ src/common.mk | 16 ++++++++++++++++ src/common.mk.in | 16 ---------------- src/fbuilder/Makefile | 17 +++++++++++++++++ src/fbuilder/Makefile.in | 18 ------------------ src/fcopy/Makefile | 17 +++++++++++++++++ src/fcopy/Makefile.in | 18 ------------------ src/fids/Makefile | 18 ++++++++++++++++++ src/fids/Makefile.in | 19 ------------------- src/firecfg/Makefile | 17 +++++++++++++++++ src/firecfg/Makefile.in | 18 ------------------ src/firejail/Makefile | 17 +++++++++++++++++ src/firejail/Makefile.in | 18 ------------------ src/firemon/Makefile | 17 +++++++++++++++++ src/firemon/Makefile.in | 18 ------------------ src/fldd/Makefile | 17 +++++++++++++++++ src/fldd/Makefile.in | 18 ------------------ src/fnet/Makefile | 17 +++++++++++++++++ src/fnet/Makefile.in | 18 ------------------ src/fnetfilter/Makefile | 17 +++++++++++++++++ src/fnetfilter/Makefile.in | 18 ------------------ src/fnettrace-dns/Makefile | 17 +++++++++++++++++ src/fnettrace-dns/Makefile.in | 18 ------------------ src/fnettrace-sni/Makefile | 17 +++++++++++++++++ src/fnettrace-sni/Makefile.in | 18 ------------------ src/fnettrace/Makefile | 17 +++++++++++++++++ src/fnettrace/Makefile.in | 18 ------------------ src/fsec-optimize/Makefile | 17 +++++++++++++++++ src/fsec-optimize/Makefile.in | 18 ------------------ src/fsec-print/Makefile | 17 +++++++++++++++++ src/fsec-print/Makefile.in | 18 ------------------ src/fseccomp/Makefile | 17 +++++++++++++++++ src/fseccomp/Makefile.in | 18 ------------------ src/ftee/Makefile | 17 +++++++++++++++++ src/ftee/Makefile.in | 18 ------------------ src/fzenity/Makefile | 17 +++++++++++++++++ src/fzenity/Makefile.in | 18 ------------------ src/jailcheck/Makefile | 17 +++++++++++++++++ src/jailcheck/Makefile.in | 18 ------------------ src/lib/Makefile | 14 ++++++++++++++ src/lib/Makefile.in | 15 --------------- src/libpostexecseccomp/Makefile | 24 ++++++++++++++++++++++++ src/libpostexecseccomp/Makefile.in | 25 ------------------------- src/libtrace/Makefile | 24 ++++++++++++++++++++++++ src/libtrace/Makefile.in | 25 ------------------------- src/libtracelog/Makefile | 24 ++++++++++++++++++++++++ src/libtracelog/Makefile.in | 25 ------------------------- src/man/Makefile | 14 ++++++++++++++ src/man/Makefile.in | 15 --------------- src/profstats/Makefile | 17 +++++++++++++++++ src/profstats/Makefile.in | 18 ------------------ src/zsh_completion/Makefile | 17 +++++++++++++++++ src/zsh_completion/Makefile.in | 18 ------------------ 54 files changed, 474 insertions(+), 500 deletions(-) create mode 100644 src/bash_completion/Makefile delete mode 100644 src/bash_completion/Makefile.in create mode 100644 src/common.mk delete mode 100644 src/common.mk.in create mode 100644 src/fbuilder/Makefile delete mode 100644 src/fbuilder/Makefile.in create mode 100644 src/fcopy/Makefile delete mode 100644 src/fcopy/Makefile.in create mode 100644 src/fids/Makefile delete mode 100644 src/fids/Makefile.in create mode 100644 src/firecfg/Makefile delete mode 100644 src/firecfg/Makefile.in create mode 100644 src/firejail/Makefile delete mode 100644 src/firejail/Makefile.in create mode 100644 src/firemon/Makefile delete mode 100644 src/firemon/Makefile.in create mode 100644 src/fldd/Makefile delete mode 100644 src/fldd/Makefile.in create mode 100644 src/fnet/Makefile delete mode 100644 src/fnet/Makefile.in create mode 100644 src/fnetfilter/Makefile delete mode 100644 src/fnetfilter/Makefile.in create mode 100644 src/fnettrace-dns/Makefile delete mode 100644 src/fnettrace-dns/Makefile.in create mode 100644 src/fnettrace-sni/Makefile delete mode 100644 src/fnettrace-sni/Makefile.in create mode 100644 src/fnettrace/Makefile delete mode 100644 src/fnettrace/Makefile.in create mode 100644 src/fsec-optimize/Makefile delete mode 100644 src/fsec-optimize/Makefile.in create mode 100644 src/fsec-print/Makefile delete mode 100644 src/fsec-print/Makefile.in create mode 100644 src/fseccomp/Makefile delete mode 100644 src/fseccomp/Makefile.in create mode 100644 src/ftee/Makefile delete mode 100644 src/ftee/Makefile.in create mode 100644 src/fzenity/Makefile delete mode 100644 src/fzenity/Makefile.in create mode 100644 src/jailcheck/Makefile delete mode 100644 src/jailcheck/Makefile.in create mode 100644 src/lib/Makefile delete mode 100644 src/lib/Makefile.in create mode 100644 src/libpostexecseccomp/Makefile delete mode 100644 src/libpostexecseccomp/Makefile.in create mode 100644 src/libtrace/Makefile delete mode 100644 src/libtrace/Makefile.in create mode 100644 src/libtracelog/Makefile delete mode 100644 src/libtracelog/Makefile.in create mode 100644 src/man/Makefile delete mode 100644 src/man/Makefile.in create mode 100644 src/profstats/Makefile delete mode 100644 src/profstats/Makefile.in create mode 100644 src/zsh_completion/Makefile delete mode 100644 src/zsh_completion/Makefile.in (limited to 'src') diff --git a/src/bash_completion/Makefile b/src/bash_completion/Makefile new file mode 100644 index 000000000..9157c9225 --- /dev/null +++ b/src/bash_completion/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: firejail.bash_completion + +ROOT = ../.. +include $(ROOT)/config.mk + +firejail.bash_completion: firejail.bash_completion.in + gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp + sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ + rm $@.tmp + +.PHONY: clean +clean: + rm -fr firejail.bash_completion + +.PHONY: distclean +distclean: clean diff --git a/src/bash_completion/Makefile.in b/src/bash_completion/Makefile.in deleted file mode 100644 index 69f35e7ae..000000000 --- a/src/bash_completion/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: firejail.bash_completion - -ROOT = ../.. -include $(ROOT)/config.mk - -firejail.bash_completion: firejail.bash_completion.in - gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp - sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ - rm $@.tmp - -.PHONY: clean -clean: - rm -fr firejail.bash_completion - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/common.mk b/src/common.mk new file mode 100644 index 000000000..2b87c33f0 --- /dev/null +++ b/src/common.mk @@ -0,0 +1,16 @@ +# Common definitions for building C programs and non-shared objects. +# +# Note: "ROOT" must be defined before including this file. + +include $(ROOT)/config.mk + +H_FILE_LIST = $(sort $(wildcard *.h)) +C_FILE_LIST = $(sort $(wildcard *.c)) +OBJS = $(C_FILE_LIST:.c=.o) +BINOBJS = $(foreach file, $(OBJS), $file) + +CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) +CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' -DVARDIR='"/var/lib/firejail"' +CFLAGS += $(MANFLAGS) +CFLAGS += -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -Wformat -Wformat-security +LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now diff --git a/src/common.mk.in b/src/common.mk.in deleted file mode 100644 index 2b87c33f0..000000000 --- a/src/common.mk.in +++ /dev/null @@ -1,16 +0,0 @@ -# Common definitions for building C programs and non-shared objects. -# -# Note: "ROOT" must be defined before including this file. - -include $(ROOT)/config.mk - -H_FILE_LIST = $(sort $(wildcard *.h)) -C_FILE_LIST = $(sort $(wildcard *.c)) -OBJS = $(C_FILE_LIST:.c=.o) -BINOBJS = $(foreach file, $(OBJS), $file) - -CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' $(HAVE_GCOV) -CFLAGS += -DPREFIX='"$(prefix)"' -DSYSCONFDIR='"$(sysconfdir)/firejail"' -DLIBDIR='"$(libdir)"' -DBINDIR='"$(bindir)"' -DVARDIR='"/var/lib/firejail"' -CFLAGS += $(MANFLAGS) -CFLAGS += -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIE -Wformat -Wformat-security -LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now diff --git a/src/fbuilder/Makefile b/src/fbuilder/Makefile new file mode 100644 index 000000000..b769deac9 --- /dev/null +++ b/src/fbuilder/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: fbuilder + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +fbuilder: $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o fbuilder *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/fbuilder/Makefile.in b/src/fbuilder/Makefile.in deleted file mode 100644 index 060f97493..000000000 --- a/src/fbuilder/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: fbuilder - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -fbuilder: $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o fbuilder *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/fcopy/Makefile b/src/fcopy/Makefile new file mode 100644 index 000000000..801615878 --- /dev/null +++ b/src/fcopy/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: fcopy + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +fcopy: $(OBJS) ../lib/common.o + $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o fcopy *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/fcopy/Makefile.in b/src/fcopy/Makefile.in deleted file mode 100644 index a2a4172a9..000000000 --- a/src/fcopy/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: fcopy - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -fcopy: $(OBJS) ../lib/common.o - $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o fcopy *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/fids/Makefile b/src/fids/Makefile new file mode 100644 index 000000000..eed6e44ea --- /dev/null +++ b/src/fids/Makefile @@ -0,0 +1,18 @@ +.PHONY: all +all: fids + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +#fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o +fids: $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o fids *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/fids/Makefile.in b/src/fids/Makefile.in deleted file mode 100644 index 8aac55419..000000000 --- a/src/fids/Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ -.PHONY: all -all: fids - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -#fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o -fids: $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o fids *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/firecfg/Makefile b/src/firecfg/Makefile new file mode 100644 index 000000000..c06bb5338 --- /dev/null +++ b/src/firecfg/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: firecfg + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/firejail_user.h ../include/pid.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +firecfg: $(OBJS) ../lib/common.o ../lib/firejail_user.o + $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/firejail_user.o $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o firecfg *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/firecfg/Makefile.in b/src/firecfg/Makefile.in deleted file mode 100644 index d112cc40a..000000000 --- a/src/firecfg/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: firecfg - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/euid_common.h ../include/libnetlink.h ../include/firejail_user.h ../include/pid.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -firecfg: $(OBJS) ../lib/common.o ../lib/firejail_user.o - $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/firejail_user.o $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o firecfg *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/firejail/Makefile b/src/firejail/Makefile new file mode 100644 index 000000000..ffe978957 --- /dev/null +++ b/src/firejail/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: firejail + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.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 + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +firejail: $(OBJS) ../lib/libnetlink.o ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o + $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o firejail *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/firejail/Makefile.in b/src/firejail/Makefile.in deleted file mode 100644 index 0dec3da98..000000000 --- a/src/firejail/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: firejail - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.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 - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -firejail: $(OBJS) ../lib/libnetlink.o ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o - $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o ../lib/firejail_user.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o firejail *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/firemon/Makefile b/src/firemon/Makefile new file mode 100644 index 000000000..45203673b --- /dev/null +++ b/src/firemon/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: firemon + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +firemon: $(OBJS) ../lib/common.o ../lib/pid.o + $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o firemon *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/firemon/Makefile.in b/src/firemon/Makefile.in deleted file mode 100644 index 6ac0cfff1..000000000 --- a/src/firemon/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: firemon - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -firemon: $(OBJS) ../lib/common.o ../lib/pid.o - $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o firemon *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/fldd/Makefile b/src/fldd/Makefile new file mode 100644 index 000000000..fdaa202fd --- /dev/null +++ b/src/fldd/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: fldd + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h ../include/ldd_utils.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +fldd: $(OBJS) ../lib/common.o ../lib/ldd_utils.o + $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o fldd *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/fldd/Makefile.in b/src/fldd/Makefile.in deleted file mode 100644 index f3842cbee..000000000 --- a/src/fldd/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: fldd - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h ../include/ldd_utils.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -fldd: $(OBJS) ../lib/common.o ../lib/ldd_utils.o - $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/ldd_utils.o $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o fldd *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/fnet/Makefile b/src/fnet/Makefile new file mode 100644 index 000000000..2642fea38 --- /dev/null +++ b/src/fnet/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: fnet + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +fnet: $(OBJS) ../lib/common.o ../lib/libnetlink.o + $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/libnetlink.o $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o fnet *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/fnet/Makefile.in b/src/fnet/Makefile.in deleted file mode 100644 index 3d70e50bf..000000000 --- a/src/fnet/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: fnet - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/libnetlink.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -fnet: $(OBJS) ../lib/common.o ../lib/libnetlink.o - $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/libnetlink.o $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o fnet *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/fnetfilter/Makefile b/src/fnetfilter/Makefile new file mode 100644 index 000000000..e0738281a --- /dev/null +++ b/src/fnetfilter/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: fnetfilter + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +fnetfilter: $(OBJS) ../lib/common.o + $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o fnetfilter *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/fnetfilter/Makefile.in b/src/fnetfilter/Makefile.in deleted file mode 100644 index 32b4bbada..000000000 --- a/src/fnetfilter/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: fnetfilter - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -fnetfilter: $(OBJS) ../lib/common.o - $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o fnetfilter *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/fnettrace-dns/Makefile b/src/fnettrace-dns/Makefile new file mode 100644 index 000000000..9946f545d --- /dev/null +++ b/src/fnettrace-dns/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: fnettrace-dns + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +fnettrace-dns: $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o fnettrace-dns *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/fnettrace-dns/Makefile.in b/src/fnettrace-dns/Makefile.in deleted file mode 100644 index 7cafe6907..000000000 --- a/src/fnettrace-dns/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: fnettrace-dns - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -fnettrace-dns: $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o fnettrace-dns *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/fnettrace-sni/Makefile b/src/fnettrace-sni/Makefile new file mode 100644 index 000000000..556727831 --- /dev/null +++ b/src/fnettrace-sni/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: fnettrace-sni + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +fnettrace-sni: $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o fnettrace-sni *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/fnettrace-sni/Makefile.in b/src/fnettrace-sni/Makefile.in deleted file mode 100644 index 9349d06f8..000000000 --- a/src/fnettrace-sni/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: fnettrace-sni - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -fnettrace-sni: $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o fnettrace-sni *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile new file mode 100644 index 000000000..406d095ff --- /dev/null +++ b/src/fnettrace/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: fnettrace + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +fnettrace: $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o fnettrace *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/fnettrace/Makefile.in b/src/fnettrace/Makefile.in deleted file mode 100644 index a7b93194a..000000000 --- a/src/fnettrace/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: fnettrace - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -fnettrace: $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o fnettrace *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile new file mode 100644 index 000000000..1ccc2fa8f --- /dev/null +++ b/src/fsec-optimize/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: fsec-optimize + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +fsec-optimize: $(OBJS) ../lib/common.o ../lib/libnetlink.o + $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o fsec-optimize *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/fsec-optimize/Makefile.in b/src/fsec-optimize/Makefile.in deleted file mode 100644 index cfd876953..000000000 --- a/src/fsec-optimize/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: fsec-optimize - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -fsec-optimize: $(OBJS) ../lib/common.o ../lib/libnetlink.o - $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o fsec-optimize *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/fsec-print/Makefile b/src/fsec-print/Makefile new file mode 100644 index 000000000..b5ba6f160 --- /dev/null +++ b/src/fsec-print/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: fsec-print + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +fsec-print: $(OBJS) ../lib/common.o ../lib/libnetlink.o ../lib/errno.o ../lib/syscall.o + $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o fsec-print *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/fsec-print/Makefile.in b/src/fsec-print/Makefile.in deleted file mode 100644 index d07c42405..000000000 --- a/src/fsec-print/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: fsec-print - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/seccomp.h ../include/syscall.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -fsec-print: $(OBJS) ../lib/common.o ../lib/libnetlink.o ../lib/errno.o ../lib/syscall.o - $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o fsec-print *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/fseccomp/Makefile b/src/fseccomp/Makefile new file mode 100644 index 000000000..527ec0a68 --- /dev/null +++ b/src/fseccomp/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: fseccomp + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o + $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o fseccomp *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/fseccomp/Makefile.in b/src/fseccomp/Makefile.in deleted file mode 100644 index 140a56ab0..000000000 --- a/src/fseccomp/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: fseccomp - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/syscall.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -fseccomp: $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o - $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o ../lib/syscall.o $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o fseccomp *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/ftee/Makefile b/src/ftee/Makefile new file mode 100644 index 000000000..00c1a2662 --- /dev/null +++ b/src/ftee/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: ftee + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +ftee: $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o ftee *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/ftee/Makefile.in b/src/ftee/Makefile.in deleted file mode 100644 index f9ad78de2..000000000 --- a/src/ftee/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: ftee - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -ftee: $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o ftee *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile new file mode 100644 index 000000000..169b78f09 --- /dev/null +++ b/src/fzenity/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: fzenity + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +fzenity: $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o fzenity *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/fzenity/Makefile.in b/src/fzenity/Makefile.in deleted file mode 100644 index 6b7ce0874..000000000 --- a/src/fzenity/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: fzenity - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -fzenity: $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o fzenity *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/jailcheck/Makefile b/src/jailcheck/Makefile new file mode 100644 index 000000000..62e82c9b3 --- /dev/null +++ b/src/jailcheck/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: jailcheck + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +jailcheck: $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o jailcheck *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/jailcheck/Makefile.in b/src/jailcheck/Makefile.in deleted file mode 100644 index cf619ad1e..000000000 --- a/src/jailcheck/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: jailcheck - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h ../include/pid.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -jailcheck: $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/pid.o $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o jailcheck *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/lib/Makefile b/src/lib/Makefile new file mode 100644 index 000000000..bac2d4e93 --- /dev/null +++ b/src/lib/Makefile @@ -0,0 +1,14 @@ +ROOT = ../.. +include $(ROOT)/src/common.mk + +.PHONY: all +all: $(OBJS) + +%.o : %.c $(H_FILE_LIST) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +.PHONY: clean +clean:; rm -fr $(OBJS) *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in deleted file mode 100644 index 330a47892..000000000 --- a/src/lib/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -ROOT = ../.. -include $(ROOT)/src/common.mk - -.PHONY: all -all: $(OBJS) - -%.o : %.c $(H_FILE_LIST) - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -.PHONY: clean -clean:; rm -fr $(OBJS) *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/libpostexecseccomp/Makefile b/src/libpostexecseccomp/Makefile new file mode 100644 index 000000000..2f108d8b9 --- /dev/null +++ b/src/libpostexecseccomp/Makefile @@ -0,0 +1,24 @@ +ROOT = ../.. +include $(ROOT)/config.mk + +H_FILE_LIST = $(sort $(wildcard *.h)) +C_FILE_LIST = $(sort $(wildcard *.c)) +OBJS = $(C_FILE_LIST:.c=.o) +BINOBJS = $(foreach file, $(OBJS), $file) +CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security +LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now + +.PHONY: all +all: libpostexecseccomp.so + +%.o : %.c $(H_FILE_LIST) ../include/seccomp.h ../include/rundefs.h + $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ + +libpostexecseccomp.so: $(OBJS) + $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl + +.PHONY: clean +clean:; rm -fr $(OBJS) libpostexecseccomp.so *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/libpostexecseccomp/Makefile.in b/src/libpostexecseccomp/Makefile.in deleted file mode 100644 index 6f354757c..000000000 --- a/src/libpostexecseccomp/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -ROOT = ../.. -include $(ROOT)/config.mk - -H_FILE_LIST = $(sort $(wildcard *.h)) -C_FILE_LIST = $(sort $(wildcard *.c)) -OBJS = $(C_FILE_LIST:.c=.o) -BINOBJS = $(foreach file, $(OBJS), $file) -CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security -LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now - -.PHONY: all -all: libpostexecseccomp.so - -%.o : %.c $(H_FILE_LIST) ../include/seccomp.h ../include/rundefs.h - $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ - -libpostexecseccomp.so: $(OBJS) - $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl - -.PHONY: clean -clean:; rm -fr $(OBJS) libpostexecseccomp.so *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/libtrace/Makefile b/src/libtrace/Makefile new file mode 100644 index 000000000..11c75136d --- /dev/null +++ b/src/libtrace/Makefile @@ -0,0 +1,24 @@ +ROOT = ../.. +include $(ROOT)/config.mk + +H_FILE_LIST = $(sort $(wildcard *.h)) +C_FILE_LIST = $(sort $(wildcard *.c)) +OBJS = $(C_FILE_LIST:.c=.o) +BINOBJS = $(foreach file, $(OBJS), $file) +CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security +LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now + +.PHONY: all +all: libtrace.so + +%.o : %.c $(H_FILE_LIST) + $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ + +libtrace.so: $(OBJS) + $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl + +.PHONY: clean +clean:; rm -fr $(OBJS) libtrace.so *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/libtrace/Makefile.in b/src/libtrace/Makefile.in deleted file mode 100644 index ced036865..000000000 --- a/src/libtrace/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -ROOT = ../.. -include $(ROOT)/config.mk - -H_FILE_LIST = $(sort $(wildcard *.h)) -C_FILE_LIST = $(sort $(wildcard *.c)) -OBJS = $(C_FILE_LIST:.c=.o) -BINOBJS = $(foreach file, $(OBJS), $file) -CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security -LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now - -.PHONY: all -all: libtrace.so - -%.o : %.c $(H_FILE_LIST) - $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ - -libtrace.so: $(OBJS) - $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl - -.PHONY: clean -clean:; rm -fr $(OBJS) libtrace.so *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/libtracelog/Makefile b/src/libtracelog/Makefile new file mode 100644 index 000000000..d09a8aa1c --- /dev/null +++ b/src/libtracelog/Makefile @@ -0,0 +1,24 @@ +ROOT = ../.. +include $(ROOT)/config.mk + +H_FILE_LIST = $(sort $(wildcard *.h)) +C_FILE_LIST = $(sort $(wildcard *.c)) +OBJS = $(C_FILE_LIST:.c=.o) +BINOBJS = $(foreach file, $(OBJS), $file) +CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security +LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now + +.PHONY: all +all: libtracelog.so + +%.o : %.c $(H_FILE_LIST) ../include/rundefs.h + $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ + +libtracelog.so: $(OBJS) + $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl + +.PHONY: clean +clean:; rm -fr $(OBJS) libtracelog.so *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/libtracelog/Makefile.in b/src/libtracelog/Makefile.in deleted file mode 100644 index 52d4bcb08..000000000 --- a/src/libtracelog/Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -ROOT = ../.. -include $(ROOT)/config.mk - -H_FILE_LIST = $(sort $(wildcard *.h)) -C_FILE_LIST = $(sort $(wildcard *.c)) -OBJS = $(C_FILE_LIST:.c=.o) -BINOBJS = $(foreach file, $(OBJS), $file) -CFLAGS += -ggdb $(HAVE_FATAL_WARNINGS) -O2 -DVERSION='"$(VERSION)"' -fstack-protector-all -D_FORTIFY_SOURCE=2 -fPIC -Wformat -Wformat-security -LDFLAGS += -pie -fPIE -Wl,-z,relro -Wl,-z,now - -.PHONY: all -all: libtracelog.so - -%.o : %.c $(H_FILE_LIST) ../include/rundefs.h - $(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ - -libtracelog.so: $(OBJS) - $(CC) $(LDFLAGS) -shared -fPIC -z relro -o $@ $(OBJS) -ldl - -.PHONY: clean -clean:; rm -fr $(OBJS) libtracelog.so *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/man/Makefile b/src/man/Makefile new file mode 100644 index 000000000..c83a4b7eb --- /dev/null +++ b/src/man/Makefile @@ -0,0 +1,14 @@ +.PHONY: all +all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man + +ROOT = ../.. +include $(ROOT)/config.mk + +%.man: %.txt + gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@ + +.PHONY: clean +clean:; rm -fr *.man + +.PHONY: distclean +distclean: clean diff --git a/src/man/Makefile.in b/src/man/Makefile.in deleted file mode 100644 index a63f9d28e..000000000 --- a/src/man/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -.PHONY: all -all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man - -ROOT = ../.. -include $(ROOT)/config.mk - -%.man: %.txt - gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@ - -.PHONY: clean -clean:; rm -fr *.man - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/profstats/Makefile b/src/profstats/Makefile new file mode 100644 index 000000000..0e3b101ef --- /dev/null +++ b/src/profstats/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: profstats + +ROOT = ../.. +include $(ROOT)/src/common.mk + +%.o : %.c $(H_FILE_LIST) ../include/common.h + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ + +profstats: $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) + +.PHONY: clean +clean:; rm -fr *.o profstats *.gcov *.gcda *.gcno *.plist + +.PHONY: distclean +distclean: clean diff --git a/src/profstats/Makefile.in b/src/profstats/Makefile.in deleted file mode 100644 index 394f30fda..000000000 --- a/src/profstats/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: profstats - -ROOT = ../.. -include $(ROOT)/src/common.mk - -%.o : %.c $(H_FILE_LIST) ../include/common.h - $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ - -profstats: $(OBJS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS) - -.PHONY: clean -clean:; rm -fr *.o profstats *.gcov *.gcda *.gcno *.plist - -.PHONY: distclean -distclean: clean - rm -fr Makefile diff --git a/src/zsh_completion/Makefile b/src/zsh_completion/Makefile new file mode 100644 index 000000000..303057b0b --- /dev/null +++ b/src/zsh_completion/Makefile @@ -0,0 +1,17 @@ +.PHONY: all +all: _firejail + +ROOT = ../.. +include $(ROOT)/config.mk + +_firejail: _firejail.in + gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp + sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ + rm $@.tmp + +.PHONY: clean +clean: + rm -fr _firejail + +.PHONY: distclean +distclean: clean diff --git a/src/zsh_completion/Makefile.in b/src/zsh_completion/Makefile.in deleted file mode 100644 index fceab1d00..000000000 --- a/src/zsh_completion/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -.PHONY: all -all: _firejail - -ROOT = ../.. -include $(ROOT)/config.mk - -_firejail: _firejail.in - gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp - sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ - rm $@.tmp - -.PHONY: clean -clean: - rm -fr _firejail - -.PHONY: distclean -distclean: clean - rm -fr Makefile -- cgit v1.2.3-54-g00ecf