summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-12 11:14:08 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-12 11:14:08 -0400
commit3a0d2518184ca975d0cc5a01f7abc6eaf17c3c49 (patch)
tree112083fb51418c19e7a63936310ee7a04e23bfed /build-aux
parente6c526b03bfeecdb8af65087e60a658bd36ac80a (diff)
have automake2autothing also add depdirs for libraries
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/Makefile.each.tail/30-automake2autothing.mk12
1 files changed, 8 insertions, 4 deletions
diff --git a/build-aux/Makefile.each.tail/30-automake2autothing.mk b/build-aux/Makefile.each.tail/30-automake2autothing.mk
index 438dd817ef..7091c57d87 100644
--- a/build-aux/Makefile.each.tail/30-automake2autothing.mk
+++ b/build-aux/Makefile.each.tail/30-automake2autothing.mk
@@ -17,12 +17,16 @@ $(foreach n,$(call automake_name,$(std.out_files)),\
$(eval $n_LIBADD ?=)\
$(eval $n_LDADD ?=))
$(foreach t,$(filter %.la,$(std.out_files)), \
- $(eval $(outdir)/$t: $(call at.path,$(call automake_lo,$t) $(call automake_lib,$t,LIBADD)) )\
+ $(eval $t.DEPENDS += $(call at.path,$(call automake_lo,$t) $(call automake_lib,$t,LIBADD)) )\
$(eval am.CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS) $(call automake_cpp,$t,LIBADD) )\
$(eval am.CFLAGS += $($(call automake_name,$t)_CFLAGS) )\
- $(eval am.LDFLAGS += $($(call automake_name,$t)_LDFLAGS) ))
+ $(eval am.LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )\
+ $(eval $(outdir)/$t: $($t.DEPENDS) )\
+ $(eval at.depdirs += $(abspath $(sort $(dir $(filter-out -l% /%,$($t.DEPENDS))))) ))
$(foreach t,$(bin_PROGRAMS) $(libexec_PROGRAMS), \
- $(eval $(outdir)/$t: $(call at.path,$(call automake_o,$t) $(call automake_lib,$t,LDADD)) )\
+ $(eval $t.DEPENDS += $(call at.path,$(call automake_o,$t) $(call automake_lib,$t,LDADD)) )\
$(eval am.CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS) $(call automake_cpp,$t,LDADD) )\
$(eval am.CFLAGS += $($(call automake_name,$t)_CFLAGS) )\
- $(eval am.LDFLAGS += $($(call automake_name,$t)_LDFLAGS) ))
+ $(eval am.LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )\
+ $(eval $(outdir)/$t: $($t.DEPENDS) )\
+ $(eval at.depdirs += $(abspath $(sort $(dir $(filter-out -l% /%,$($t.DEPENDS))))) ))