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).

1 files changed, 6 insertions, 3 deletions

diff --git a/src/fsec-optimize/Makefile b/src/fsec-optimize/Makefile
index 21097c371..1bbea61d5 100644
--- a/src/fsec-optimize/Makefile
+++ b/src/fsec-optimize/Makefile
@@ -1,16 +1,19 @@
 ROOT = ../..
 -include $(ROOT)/config.mk
 
+MOD_HDRS = ../include/common.h ../include/seccomp.h ../include/syscall.h
+MOD_OBJS = ../lib/common.o ../lib/errno.o
+
 .PHONY: all
 all: fsec-optimize
 
 include $(ROOT)/src/common.mk
 
-%.o : %.c $(HDRS) ../include/common.h ../include/seccomp.h ../include/syscall.h $(ROOT)/config.mk
+%.o : %.c $(HDRS) $(ROOT)/config.mk
         $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDE) -c $< -o $@
 
-fsec-optimize: $(OBJS) ../lib/common.o ../lib/errno.o $(ROOT)/config.mk
-        $(CC)  $(LDFLAGS) -o $@ $(OBJS) ../lib/common.o ../lib/errno.o $(LIBS) $(EXTRA_LDFLAGS)
+fsec-optimize: $(OBJS) $(ROOT)/config.mk
+        $(CC)  $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(EXTRA_LDFLAGS)
 
 .PHONY: clean
 clean:; rm -fr *.o fsec-optimize *.gcov *.gcda *.gcno *.plist