diff options
Diffstat (limited to 'build-aux/Makefile.each.tail')
-rw-r--r-- | build-aux/Makefile.each.tail/30-automake2autothing.mk | 31 | ||||
-rw-r--r-- | build-aux/Makefile.each.tail/30-directory-info.mk | 2 |
2 files changed, 17 insertions, 16 deletions
diff --git a/build-aux/Makefile.each.tail/30-automake2autothing.mk b/build-aux/Makefile.each.tail/30-automake2autothing.mk index a74e247339..cd5cc4300d 100644 --- a/build-aux/Makefile.each.tail/30-automake2autothing.mk +++ b/build-aux/Makefile.each.tail/30-automake2autothing.mk @@ -5,8 +5,8 @@ _programs = $(foreach d,$(am.bindirs), \ $(eval _programs += $($d_PROGRAMS) )\ $(eval std.sys_files += $(addprefix $($(d)dir)/,$($d_PROGRAMS)) )) +_programs += $(noinst_PROGRAMS) std.out_files += $(_programs) -# TODO: noinst_PROGRAMS (test) std.out_files += $(notdir $(pkgconfiglib_DATA)) std.sys_files += $(addprefix $(pkgconfiglibdir)/,$(notdir $(pkgconfiglib_DATA))) @@ -19,17 +19,18 @@ $(foreach n,$(call automake_name,$(std.out_files)),\ $(eval $n_LDFLAGS ?=)\ $(eval $n_LIBADD ?=)\ $(eval $n_LDADD ?=)) -$(foreach t,$(filter %.la,$(std.out_files)), \ - $(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 $t: private ALL_LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )\ - $(eval $(outdir)/$t: $($t.DEPENDS) )\ - $(eval at.depdirs += $(abspath $(sort $(dir $(filter-out -l% /%,$($t.DEPENDS))))) )) -$(foreach t,$(_programs), \ - $(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 $t: private ALL_LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )\ - $(eval $(outdir)/$t: $($t.DEPENDS) )\ - $(eval at.depdirs += $(abspath $(sort $(dir $(filter-out -l% /%,$($t.DEPENDS))))) )) +$(foreach t,$(filter %.la,$(std.out_files)), \ + $(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 $t: private ALL_LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )\ + $(eval $(outdir)/$t: $($t.DEPENDS) )\ + $(eval at.depdirs += $(abspath $(sort $(dir $(filter-out -l% /%,$($t.DEPENDS))))) )) +$(foreach t,$(_programs), \ + $(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 $t: private ALL_LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )\ + $(eval $(outdir)/$t: $($t.DEPENDS) )\ + $(eval at.depdirs += $(sort $(filter-out $(abspath $(srcdir)), \ + $(abspath $(dir $(filter-out -l% /%,$($t.DEPENDS)))))) )) diff --git a/build-aux/Makefile.each.tail/30-directory-info.mk b/build-aux/Makefile.each.tail/30-directory-info.mk index 10ebc4c1de..80f5e68c29 100644 --- a/build-aux/Makefile.each.tail/30-directory-info.mk +++ b/build-aux/Makefile.each.tail/30-directory-info.mk @@ -1,4 +1,4 @@ dir_variables = $(foreach v,$(filter-out _%,$(patsubst %/$(@D),%,$(filter %/$(@D),$(.VARIABLES)))),$(if $(findstring /,$v),, $v)) $(outdir)/directory-info: - $(AM_V_at)printf '%s = %s\n' $(foreach v,$(dir_variables),'$v' '$($v/$(@D))') | sort | column -s= -o= -t + $(AM_V_at)printf '%s = «%s»\n' $(foreach v,$(dir_variables),$(if $($v/$(@D)),'$v' '$($v/$(@D))')) | sort | column -s= -o= -t .PHONY: $(outdir)/module-info |