From a630635d7f0e63a865ddd3b0a3cf2d44c603c0e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 16 Dec 2013 16:49:41 +0100
Subject: [PATCH] No longer interpret $(..._SOURCES) relative to $(..._DIR)

---
 mk/libraries.mk | 11 ++++++++---
 mk/programs.mk  | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/mk/libraries.mk b/mk/libraries.mk
index bea68449..bc258b79 100644
--- a/mk/libraries.mk
+++ b/mk/libraries.mk
@@ -6,11 +6,13 @@ libs_list :=
 # - $(1)_NAME: the name of the library (e.g. ‘libfoo’); defaults to
 #   $(1).
 #
-# - $(1)_DIR: the directory containing the sources of the library, and
-#   where the (non-installed) library will be placed.
+# - $(1)_DIR: the directory where the (non-installed) library will be
+#   placed.
 #
 # - $(1)_SOURCES: the source files of the library.
 #
+# - $(1)_CXXFLAGS: additional C++ compiler flags.
+#
 # - $(1)_LIBS: the symbolic names of other libraries on which this
 #   library depends.
 #
@@ -33,7 +35,7 @@ libs_list :=
 define build-library =
   $(1)_NAME ?= $(1)
   _d := $$(strip $$($(1)_DIR))
-  _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src))
+  _srcs := $$(foreach src, $$($(1)_SOURCES), $$(src))
   $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs)))
   _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH))
 
@@ -89,6 +91,9 @@ define build-library =
   # Propagate CXXFLAGS to the individual object files.
   $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS)))
 
+  # Make each object file depend on the common dependencies.
+  $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS)))
+
   # Include .dep files, if they exist.
   $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs)))
   -include $$($(1)_DEPS)
diff --git a/mk/programs.mk b/mk/programs.mk
index 648a6053..52e55598 100644
--- a/mk/programs.mk
+++ b/mk/programs.mk
@@ -3,8 +3,8 @@ programs_list :=
 # Build a program with symbolic name $(1).  The program is defined by
 # various variables prefixed by ‘$(1)_’:
 #
-# - $(1)_DIR: the directory containing the sources of the program, and
-#   where the (non-installed) program will be placed.
+# - $(1)_DIR: the directory where the (non-installed) program will be
+#   placed.
 #
 # - $(1)_SOURCES: the source files of the program.
 #
@@ -17,7 +17,7 @@ programs_list :=
 #   installed; defaults to $(bindir).
 define build-program =
   _d := $$($(1)_DIR)
-  _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src))
+  _srcs := $$(foreach src, $$($(1)_SOURCES), $$(src))
   $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs)))
   _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH))
   $(1)_PATH := $$(_d)/$(1)
@@ -49,9 +49,14 @@ define build-program =
   # Propagate CXXFLAGS to the individual object files.
   $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS)))
 
-  include $$(wildcard $$(_d)/*.dep)
+  # Make each object file depend on the common dependencies.
+  $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS)))
+
+  # Include .dep files, if they exist.
+  $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs)))
+  -include $$($(1)_DEPS)
 
   programs_list += $$($(1)_PATH)
-  clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep
+  clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep $$($(1)_DEPS) $$($(1)_OBJS)
   dist_files += $$(_srcs)
 endef