05/64: Add variable GLOBAL_COMMON_DEPS

[Ludovic Courtès]

civodul pushed a commit to branch nix
in repository guix.

commit 4e7e498ff95b553227a26fc20549bd69995a0b08
Author: Eelco Dolstra <address@hidden>
Date:   Fri Feb 28 12:01:42 2014 +0100

    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.
---
 libraries.mk |    2 +-
 programs.mk  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries.mk b/libraries.mk
index 21718c4..547f393 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 04ba282..d07c914 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)))