about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-02-28T11·01+0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-02-28T11·01+0100
commit4e7e498ff95b553227a26fc20549bd69995a0b08 (patch)
tree3f42ff0b13437b191963408c462b28ddb169747f
parent7bef965d6f191efb9c671f49fd187f4214db6120 (diff)
Add variable GLOBAL_COMMON_DEPS
This is a list of dependencies on which all C/C++ object files depend.
Primarily useful for global precompiled headers.
-rw-r--r--libraries.mk2
-rw-r--r--programs.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/libraries.mk b/libraries.mk
index 21718c496a25..547f393e3a8e 100644
--- a/libraries.mk
+++ b/libraries.mk
@@ -109,7 +109,7 @@ define build-library
   $$(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)))
+  $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS) $$(GLOBAL_COMMON_DEPS)))
 
   # Include .dep files, if they exist.
   $(1)_DEPS := $$(foreach fn, $$($(1)_OBJS), $$(call filename-to-dep, $$(fn)))
diff --git a/programs.mk b/programs.mk
index 04ba282b2c75..d07c91448f74 100644
--- a/programs.mk
+++ b/programs.mk
@@ -57,7 +57,7 @@ define build-program
   $$(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)))
+  $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS) $$(GLOBAL_COMMON_DEPS)))
 
   # Include .dep files, if they exist.
   $(1)_DEPS := $$(foreach fn, $$($(1)_OBJS), $$(call filename-to-dep, $$(fn)))