diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-05-07 02:46:17 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2022-11-21 17:18:53 -0300 |
commit | f5b1ccaad25b26a8bb383a268532f269411e512c (patch) | |
tree | 1dcf23a0dddf90a5e6f6d5f9216a110a3aa7495a /src/fzenity | |
parent | makefiles: expand HDRS, SRCS and OBJS immediately (diff) | |
download | firejail-f5b1ccaad25b26a8bb383a268532f269411e512c.tar.gz firejail-f5b1ccaad25b26a8bb383a268532f269411e512c.tar.zst firejail-f5b1ccaad25b26a8bb383a268532f269411e512c.zip |
makefiles: move extra deps into new MOD vars
To make the makefiles more similar.
That is, add the following new variables:
* MOD_HDRS
* MOD_SRCS
* MOD_OBJS
And move existing module-specific header and object dependencies into
`MOD_HDRS` and `MOD_OBJS`, respectively. `MOD_SRCS` is added mostly for
symmetry/consistency.
Note: Use `MOD_` as a prefix instead of `EXTRA_` to avoid confusion, as
the latter is currently used for global variables (such as
`EXTRA_CFLAGS`), as opposed to module-specific variables.
Note2: Add them directly into the HDRS/SRCS/OBJS variables to avoid
cluttering the existing recipes with an extra variables unnecessarily.
This also allows, for example, referencing all of the object
dependencies with `$<` if `$(OBJS)` is the first dependency (at least in
GNU make).
Note3: Since HDRS/SRCS/OBJS use simple assignment (through `:=`), the
MOD variables should appear before including src/common.mk (or
src/so.mk).
Diffstat (limited to 'src/fzenity')
-rw-r--r-- | src/fzenity/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/fzenity/Makefile b/src/fzenity/Makefile index 169706ff2..63a117337 100644 --- a/src/fzenity/Makefile +++ b/src/fzenity/Makefile | |||
@@ -1,12 +1,14 @@ | |||
1 | ROOT = ../.. | 1 | ROOT = ../.. |
2 | -include $(ROOT)/config.mk | 2 | -include $(ROOT)/config.mk |
3 | 3 | ||
4 | MOD_HDRS = ../include/common.h | ||
5 | |||
4 | .PHONY: all | 6 | .PHONY: all |
5 | all: fzenity | 7 | all: fzenity |
6 | 8 | ||
7 | include $(ROOT)/src/common.mk | 9 | include $(ROOT)/src/common.mk |
8 | 10 | ||
9 | %.o : %.c $(HDRS) ../include/common.h $(ROOT)/config.mk | 11 | %.o : %.c $(HDRS) $(ROOT)/config.mk |
10 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ | 12 | $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@ |
11 | 13 | ||
12 | fzenity: $(OBJS) $(ROOT)/config.mk | 14 | fzenity: $(OBJS) $(ROOT)/config.mk |