diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-20T16·44+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-20T16·44+0200 |
| commit | c93690a68abdc6e39f2790d7960420bba46da555 (patch) | |
| tree | 7b6456adc44fbaa05e5be8817b751c144cd2a19e /mk | |
| parent | f0610e28e8d4da86b90d10bfb85bbfc72219cf28 (diff) | |
| parent | 2aa93858afee22e0c32d8f4366970976374091ac (diff) | |
Merge commit '2aa93858afee22e0c32d8f4366970976374091ac'
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/libraries.mk | 12 | ||||
| -rw-r--r-- | mk/programs.mk | 10 | ||||
| -rw-r--r-- | mk/templates.mk | 5 |
3 files changed, 26 insertions, 1 deletions
diff --git a/mk/libraries.mk b/mk/libraries.mk index 4b8292cc20..3b91c699e6 100644 --- a/mk/libraries.mk +++ b/mk/libraries.mk @@ -21,6 +21,9 @@ endif # # - $(1)_CXXFLAGS: additional C++ compiler flags. # +# - $(1)_ORDER_AFTER: a set of targets on which the object files of +# this libraries will have an order-only dependency. +# # - $(1)_LIBS: the symbolic names of other libraries on which this # library depends. # @@ -89,6 +92,8 @@ define build-library $(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) ifeq ($(SET_RPATH_TO_LIBS), 1) $(1)_LDFLAGS_USE_INSTALLED += -Wl,-rpath,$$($(1)_INSTALL_DIR) + else + $(1)_LDFLAGS_USE_INSTALLED += -Wl,-rpath-link,$$($(1)_INSTALL_DIR) endif ifdef $(1)_FORCE_INSTALL @@ -118,6 +123,13 @@ define build-library # Make each object file depend on the common dependencies. $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS) $$(GLOBAL_COMMON_DEPS))) + # Make each object file have order-only dependencies on the common + # order-only dependencies. This includes the order-only dependencies + # of libraries we're depending on. + $(1)_ORDER_AFTER_CLOSED = $$($(1)_ORDER_AFTER) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_ORDER_AFTER_CLOSED)) + + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): | $$($(1)_ORDER_AFTER_CLOSED) $$(GLOBAL_ORDER_AFTER))) + # Include .dep files, if they exist. $(1)_DEPS := $$(foreach fn, $$($(1)_OBJS), $$(call filename-to-dep, $$(fn))) -include $$($(1)_DEPS) diff --git a/mk/programs.mk b/mk/programs.mk index b6de068940..72afdf9525 100644 --- a/mk/programs.mk +++ b/mk/programs.mk @@ -12,6 +12,9 @@ programs-list := # # - $(1)_CXXFLAGS: additional C++ compiler flags. # +# - $(1)_ORDER_AFTER: a set of targets on which the object files of +# this program will have an order-only dependency. +# # - $(1)_LIBS: the symbolic names of libraries on which this program # depends. # @@ -59,6 +62,13 @@ define build-program # Make each object file depend on the common dependencies. $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS) $$(GLOBAL_COMMON_DEPS))) + # Make each object file have order-only dependencies on the common + # order-only dependencies. This includes the order-only dependencies + # of libraries we're depending on. + $(1)_ORDER_AFTER_CLOSED = $$($(1)_ORDER_AFTER) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_ORDER_AFTER_CLOSED)) + + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): | $$($(1)_ORDER_AFTER_CLOSED) $$(GLOBAL_ORDER_AFTER))) + # Include .dep files, if they exist. $(1)_DEPS := $$(foreach fn, $$($(1)_OBJS), $$(call filename-to-dep, $$(fn))) -include $$($(1)_DEPS) diff --git a/mk/templates.mk b/mk/templates.mk index 8e8b28643f..ab99168bb7 100644 --- a/mk/templates.mk +++ b/mk/templates.mk @@ -8,5 +8,8 @@ define instantiate-template endef +%.h: %.h.in + $(trace-gen) rm -f $@ && ./config.status --quiet --header=$@ + %: %.in - $(trace-gen) ./config.status --quiet --file $@ + $(trace-gen) rm -f $@ && ./config.status --quiet --file=$@ |