aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-01-25 01:45:55 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-01-28 00:05:54 -0300
commit757e5f4b258aad12bdc6a0ec9c0903297db030e2 (patch)
treef97731d2b5f885ac7db3de570b45256547016502
parentbuild: auto-generate syntax files (diff)
downloadfirejail-757e5f4b258aad12bdc6a0ec9c0903297db030e2.tar.gz
firejail-757e5f4b258aad12bdc6a0ec9c0903297db030e2.tar.zst
firejail-757e5f4b258aad12bdc6a0ec9c0903297db030e2.zip
build: make contrib target by default
Make the syntax target by default to make it harder to forget to update the syntax files. Note that the syntax files are built mostly silently and that they are generated relatively fast (they only take 40~70ms to build on a not exactly recent machine with `make clean; time make -j 4 syntax`), so they should not add much noise nor time noise when just trying to build firejail, for example.
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--Makefile6
2 files changed, 6 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9463ba465..97730e533 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -38,7 +38,7 @@ If you add a new command, here's the checklist:
38 38
39 - [ ] Update manpages: firejail(1) and firejail-profile(5) 39 - [ ] Update manpages: firejail(1) and firejail-profile(5)
40 - [ ] Update shell completions 40 - [ ] Update shell completions
41 - [ ] Update syntax files (run `make syntax`) 41 - [ ] Update syntax files (run `make syntax` or just `make`)
42 - [ ] Update --help 42 - [ ] Update --help
43 43
44# Editing the wiki 44# Editing the wiki
diff --git a/Makefile b/Makefile
index aa55c376e..cbe59349c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,10 @@ MAN_TARGET = man
6MAN_SRC = src/man 6MAN_SRC = src/man
7endif 7endif
8 8
9ifneq ($(HAVE_CONTRIB_INSTALL),no)
10CONTRIB_TARGET = contrib
11endif
12
9COMPLETIONDIRS = src/zsh_completion src/bash_completion 13COMPLETIONDIRS = src/zsh_completion src/bash_completion
10 14
11APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon src/profstats/profstats src/jailcheck/jailcheck 15APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon src/profstats/profstats src/jailcheck/jailcheck
@@ -38,7 +42,7 @@ SYNTAX_FILES := $(SYNTAX_FILES_IN:.in=)
38ALL_ITEMS = $(APPS) $(SBOX_APPS) $(SBOX_APPS_NON_DUMPABLE) $(MYLIBS) 42ALL_ITEMS = $(APPS) $(SBOX_APPS) $(SBOX_APPS_NON_DUMPABLE) $(MYLIBS)
39 43
40.PHONY: all 44.PHONY: all
41all: all_items mydirs filters $(MAN_TARGET) 45all: all_items mydirs filters $(MAN_TARGET) $(CONTRIB_TARGET)
42 46
43config.mk config.sh: 47config.mk config.sh:
44 @printf 'error: run ./configure to generate %s\n' "$@" >&2 48 @printf 'error: run ./configure to generate %s\n' "$@" >&2