From 6ece8cec3d1327872bd655899ccb34f92f911608 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Wed, 21 Jun 2023 12:14:44 -0300 Subject: build: standardize commands on top of makefiles To make the makefiles look more similar. --- src/bash_completion/Makefile | 6 +++--- src/man/Makefile | 6 +++--- src/zsh_completion/Makefile | 6 +++--- test/Makefile | 3 +++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/bash_completion/Makefile b/src/bash_completion/Makefile index e787a7b92..bd447857e 100644 --- a/src/bash_completion/Makefile +++ b/src/bash_completion/Makefile @@ -1,9 +1,9 @@ -.PHONY: all -all: firejail.bash_completion - ROOT = ../.. -include $(ROOT)/config.mk +.PHONY: all +all: firejail.bash_completion + firejail.bash_completion: firejail.bash_completion.in $(ROOT)/config.mk gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ diff --git a/src/man/Makefile b/src/man/Makefile index 283822d1f..bff4c30d0 100644 --- a/src/man/Makefile +++ b/src/man/Makefile @@ -1,9 +1,9 @@ -.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 +.PHONY: all +all: firecfg.man firejail.man firejail-login.man firejail-users.man firejail-profile.man firemon.man jailcheck.man + %.man: %.txt $(ROOT)/config.mk gawk -f ./preproc.awk -- $(MANFLAGS) < $< > $@ diff --git a/src/zsh_completion/Makefile b/src/zsh_completion/Makefile index d7bc1038a..c68ed2d72 100644 --- a/src/zsh_completion/Makefile +++ b/src/zsh_completion/Makefile @@ -1,9 +1,9 @@ -.PHONY: all -all: _firejail - ROOT = ../.. -include $(ROOT)/config.mk +.PHONY: all +all: _firejail + _firejail: _firejail.in $(ROOT)/config.mk gawk -f ../man/preproc.awk -- $(MANFLAGS) < $< > $@.tmp sed "s|_SYSCONFDIR_|$(sysconfdir)|" < $@.tmp > $@ diff --git a/test/Makefile b/test/Makefile index 2c376da58..2f023b8b1 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,3 +1,6 @@ +ROOT = .. +-include $(ROOT)/config.mk + TESTS=$(patsubst %/,%,$(wildcard */)) .PHONY: $(TESTS) -- cgit v1.2.3-54-g00ecf