buildsys: compute DEPDIRS dynamically

... instead of hardcoding it
dimpase · Feb 17, 2018 · b6d4e8e · b6d4e8e
1 parent 0be7c3d
commit b6d4e8e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Makefile.rules b/Makefile.rules
@@ -322,10 +322,10 @@ endif
 # Name of subdirectories in which the generated dependencies are stored.
 DEPDIRNAME := .deps
 
-# List of all dependency directories. For now, we hardcode this list.
-# TODO: derive this from the value of the SOURCES variable, so that
-#       adding new src/ subdirectories works
-DEPDIRS = $(addsuffix /$(DEPDIRNAME),obj obj/hpc gen gen/hpc)
+# List of all (potential) dependency directories, derived from OBJS
+# and SOURCES (the latter for generated sources, which may also involve
+# dependency tracking)
+DEPDIRS = $(addsuffix $(DEPDIRNAME),$(sort $(dir $(SOURCES) $(OBJS))))
 
 # Include the dependency tracking files.
 -include $(wildcard $(addsuffix /*.d,$(DEPDIRS)))