diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-06-18 04:27:22 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-06-25 10:03:44 -0300 |
commit | 75587a4de41dbf0bdc8fabdd7b2c39e3a46613a8 (patch) | |
tree | 8d62254cbc33124fb0c9478e79738aa04acd1bc1 | |
parent | build: rename TOCLEAN and TODISTCLEAN variables (diff) | |
download | firejail-75587a4de41dbf0bdc8fabdd7b2c39e3a46613a8.tar.gz firejail-75587a4de41dbf0bdc8fabdd7b2c39e3a46613a8.tar.zst firejail-75587a4de41dbf0bdc8fabdd7b2c39e3a46613a8.zip |
build: standardize clean/distclean targets in src
Changes:
* clean: remove the same types of files in src/prog.mk and src/so.mk
* distclean: remove unused recipes and DISTCLEANFILES variable
-rw-r--r-- | config.mk.in | 2 | ||||
-rw-r--r-- | src/prog.mk | 6 | ||||
-rw-r--r-- | src/so.mk | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/config.mk.in b/config.mk.in index 6ee541507..8c9d61a2d 100644 --- a/config.mk.in +++ b/config.mk.in | |||
@@ -64,3 +64,5 @@ LIBS=@LIBS@ | |||
64 | 64 | ||
65 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ | 65 | EXTRA_CFLAGS +=@EXTRA_CFLAGS@ |
66 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ | 66 | EXTRA_LDFLAGS +=@EXTRA_LDFLAGS@ |
67 | |||
68 | CLEANFILES = *.o *.gcov *.gcda *.gcno *.plist | ||
diff --git a/src/prog.mk b/src/prog.mk index d138fc7ee..5ed706da9 100644 --- a/src/prog.mk +++ b/src/prog.mk | |||
@@ -3,7 +3,7 @@ | |||
3 | # Note: $(ROOT)/config.mk must be included before this file. | 3 | # Note: $(ROOT)/config.mk must be included before this file. |
4 | # | 4 | # |
5 | # The includer should probably define PROG and TARGET and may also want to | 5 | # The includer should probably define PROG and TARGET and may also want to |
6 | # define EXTRA_HDRS, EXTRA_OBJS, CLEANFILES and DISTCLEANFILES. | 6 | # define EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES. |
7 | 7 | ||
8 | HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) | 8 | HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) |
9 | SRCS := $(sort $(wildcard *.c)) | 9 | SRCS := $(sort $(wildcard *.c)) |
@@ -33,7 +33,7 @@ $(PROG): $(OBJS) $(ROOT)/config.mk | |||
33 | $(CC) $(PROG_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) | 33 | $(CC) $(PROG_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) |
34 | 34 | ||
35 | .PHONY: clean | 35 | .PHONY: clean |
36 | clean:; rm -fr *.o $(PROG) *.gcov *.gcda *.gcno *.plist $(CLEANFILES) | 36 | clean:; rm -fr $(PROG) $(CLEANFILES) |
37 | 37 | ||
38 | .PHONY: distclean | 38 | .PHONY: distclean |
39 | distclean: clean; rm -fr $(DISTCLEANFILES) | 39 | distclean: clean |
@@ -3,7 +3,7 @@ | |||
3 | # Note: $(ROOT)/config.mk must be included before this file. | 3 | # Note: $(ROOT)/config.mk must be included before this file. |
4 | # | 4 | # |
5 | # The includer should probably define SO and TARGET and may also want to define | 5 | # The includer should probably define SO and TARGET and may also want to define |
6 | # EXTRA_HDRS, EXTRA_OBJS, CLEANFILES and DISTCLEANFILES. | 6 | # EXTRA_HDRS and EXTRA_OBJS and extend CLEANFILES. |
7 | 7 | ||
8 | HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) | 8 | HDRS := $(sort $(wildcard *.h)) $(EXTRA_HDRS) |
9 | SRCS := $(sort $(wildcard *.c)) | 9 | SRCS := $(sort $(wildcard *.c)) |
@@ -28,7 +28,7 @@ $(SO): $(OBJS) $(ROOT)/config.mk | |||
28 | $(CC) $(SO_LDFLAGS) -shared -fPIC -z relro $(LDFLAGS) -o $@ $(OBJS) -ldl | 28 | $(CC) $(SO_LDFLAGS) -shared -fPIC -z relro $(LDFLAGS) -o $@ $(OBJS) -ldl |
29 | 29 | ||
30 | .PHONY: clean | 30 | .PHONY: clean |
31 | clean:; rm -fr $(OBJS) $(SO) *.plist $(CLEANFILES) | 31 | clean:; rm -fr $(SO) $(CLEANFILES) |
32 | 32 | ||
33 | .PHONY: distclean | 33 | .PHONY: distclean |
34 | distclean: clean; rm -fr $(DISTCLEANFILES) | 34 | distclean: clean |