diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-02 03:27:43 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-02 03:27:43 -0400 |
| commit | b147631f3da51648e46d40b12fbbd411026e3779 (patch) | |
| tree | 25e0e76939f5b48bd1bbb3e6fe41dedda60fa937 /build-aux | |
| parent | 9d58ee0c730429582fb1065455794cebcf90d8b3 (diff) | |
stuff
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/Makefile.once.head/20-systemd.mk | 11 | ||||
| -rw-r--r-- | build-aux/Makefile.once.tail/20-systemd.mk | 10 |
2 files changed, 18 insertions, 3 deletions
diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk index 6f528c5b2b..e43276d004 100644 --- a/build-aux/Makefile.once.head/20-systemd.mk +++ b/build-aux/Makefile.once.head/20-systemd.mk @@ -191,7 +191,9 @@ define generate-sym-test $(AM_V_at)printf 'return 0; }\n' >> $@ endef -at.dirlocal += noinst_LTLIBRARIES lib_LTLIBRARIES bin_PROGRAMS +at.dirlocal += noinst_LTLIBRARIES lib_LTLIBRARIES +at.dirlocal += bin_PROGRAMS +at.dirlocal += pkgconfiglib_DATA automake_name = $(subst -,_,$(subst .,_,$1)) automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES))) automake_lo = $(patsubst %.c,%.lo,$(filter %.c,$(automake_sources))) @@ -199,10 +201,15 @@ automake_o = $(patsubst %.c,%.o,$(filter %.c,$(automake_sources))) automake_libs = $($(automake_name)_LIBADD) define automake2autothing -std.out_files += $(noinst_LTLIBRARIES) $(lib_LTLIBRARIES) $(notdir $(pkgconfiglib_DATA)) $(bin_PROGRAMS) +std.out_files += $(noinst_LTLIBRARIES) $(lib_LTLIBRARIES) std.sys_files += $(addprefix $(libdir)/,$(lib_LTLIBRARIES)) + +std.out_files += $(bin_PROGRAMS) std.sys_files += $(addprefix $(bindir)/,$(bin_PROGRAMS)) + +std.out_files += $(notdir $(pkgconfiglib_DATA)) std.sys_files += $(addprefix $(pkgconfiglibdir)/,$(notdir $(lib_pkgconfiglib_DATA))) + $(foreach n,$(call automake_name,$(std.out_files)),\ $(eval $n_SOURCES ?=)\ $(eval nodist_$n_SOURCES ?=)\ diff --git a/build-aux/Makefile.once.tail/20-systemd.mk b/build-aux/Makefile.once.tail/20-systemd.mk index 15f791f272..b48af97948 100644 --- a/build-aux/Makefile.once.tail/20-systemd.mk +++ b/build-aux/Makefile.once.tail/20-systemd.mk @@ -23,12 +23,20 @@ $(topsrcdir)/configure: $(topsrcdir)/configure.ac cd $(topsrcdir) && ./autogen.sh + test -f $@ + touch $@ $(topoutdir)/config.status: $(topsrcdir)/configure cd $(topoutdir) && ./config.status --recheck + test -f $@ + touch $@ $(addprefix $(topoutdir)/,config.mk automake.mk autoconf.mk gnustandards.mk po/Makefile.in): $(topoutdir)/%: $(topoutdir)/config.status $(topsrcdir)/%.in cd $(topoutdir) && ./config.status --file=$* + test -f $@ + touch $@ $(addprefix $(topoutdir)/,config.h): $(topoutdir)/%: $(topoutdir)/config.status $(topsrcdir)/%.in - cd $(topoutdir) && ./config.status --header=$* + cd $(topoutdir) && ./config.status --header=$* || touch + test -f $@ + touch $@ # Let's run all tests of the test suite, but under valgrind. Let's # exclude perl/python/shell scripts we have in there |