diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 01:26:40 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-07 01:26:40 -0400 |
| commit | c5e060cbb2a01baa40f395fd543351ffeb12eac3 (patch) | |
| tree | f1f49c912eb2ffea26927fa43fdc20df3c1b78ee /build-aux | |
| parent | 8334fafb8974f0ea19ed72efcd8d235069eaea32 (diff) | |
stuff
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/Makefile.each.tail/20-systemd.mk | 2 | ||||
| -rw-r--r-- | build-aux/Makefile.once.head/20-systemd.mk | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk index 9d08fd5c23..0d05832fc3 100644 --- a/build-aux/Makefile.each.tail/20-systemd.mk +++ b/build-aux/Makefile.each.tail/20-systemd.mk @@ -44,7 +44,7 @@ _systemd.link_files = $(filter %.o %.lo %.la,$^) $(call _systemd.patsubst-all,$( $(outdir)/%.la: @if test $(words $^) = 0; then echo 'Cannot link library with no dependencies: $@' >&2; exit 1; fi $(AM_V_CCLD)$(LINK) $(if $(_systemd.rpath),-rpath $(_systemd.rpath)) $(_systemd.link_files) -$(addprefix $(outdir)/,$(bin_PROGRAMS)): $(outdir)/%: +$(addprefix $(outdir)/,$(bin_PROGRAMS) $(libexec_PROGRAMS)): $(outdir)/%: @if test $(words $^) = 0; then echo 'Cannot link executable with no dependencies: $@' >&2; exit 1; fi $(AM_V_CCLD)$(LINK) $(_systemd.link_files) diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk index 63d54ba07e..61484c2954 100644 --- a/build-aux/Makefile.once.head/20-systemd.mk +++ b/build-aux/Makefile.once.head/20-systemd.mk @@ -194,7 +194,7 @@ endef at.dirlocal += systemd.sed_files at.dirlocal += noinst_LTLIBRARIES lib_LTLIBRARIES -at.dirlocal += bin_PROGRAMS +at.dirlocal += bin_PROGRAMS libexec_PROGRAMS at.dirlocal += pkgconfiglib_DATA automake_name = $(subst -,_,$(subst .,_,$1)) automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES))) @@ -206,8 +206,9 @@ define automake2autothing std.out_files += $(noinst_LTLIBRARIES) $(lib_LTLIBRARIES) std.sys_files += $(addprefix $(libdir)/,$(lib_LTLIBRARIES)) -std.out_files += $(bin_PROGRAMS) +std.out_files += $(bin_PROGRAMS) $(libexec_PROGRAMS) std.sys_files += $(addprefix $(bindir)/,$(bin_PROGRAMS)) +std.sys_files += $(addprefix $(libexecdir)/,$(libexec_PROGRAMS)) std.out_files += $(notdir $(pkgconfiglib_DATA)) std.sys_files += $(addprefix $(pkgconfiglibdir)/,$(notdir $(lib_pkgconfiglib_DATA))) @@ -224,7 +225,7 @@ $(foreach t,$(filter %.la,$(std.out_files)),\ $(eval AM_CFLAGS += $($(call automake_name,$t)_CFLAGS) )\ $(eval AM_CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS) )\ $(eval AM_LDFLAGS += $($(call automake_name,$t)_LDFLAGS) )) -$(foreach t,$(bin_PROGRAMS),\ +$(foreach t,$(bin_PROGRAMS) $(libexec_PROGRAMS),\ $(eval $(outdir)/$t: $(call at.path,$(call automake_o,$t) $(call automake_libs,$t)) )\ $(eval AM_CFLAGS += $($(call automake_name,$t)_CFLAGS) )\ $(eval AM_CPPFLAGS += $($(call automake_name,$t)_CPPFLAGS) )\ |