diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-08-02 12:17:53 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-08-02 12:17:53 -0400 |
| commit | e907d750b8e99c9a4dad6bc291f04ff9abaf1d0f (patch) | |
| tree | e83aa9cebde4e35a7ee61d0f3e7e0608bc54d812 /build-aux/Makefile.each.tail/30-automake2autothing.mk | |
| parent | 272b48187cee0b42b6e936ad2c045f13b391f3ad (diff) | |
fix
Diffstat (limited to 'build-aux/Makefile.each.tail/30-automake2autothing.mk')
| -rw-r--r-- | build-aux/Makefile.each.tail/30-automake2autothing.mk | 31 |
1 files changed, 16 insertions, 15 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)))))) )) |