From f47477332ff63fa6a98a0221a88da20df148a67c Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Fri, 4 Dec 2015 05:48:09 +0000 Subject: build-sys: move "dist" parts out of conditional Fixes: $ ./autogen.sh $ ./configure ... --disable-timesyncd $ make distcheck ... make[1]: *** No rule to make target 'src/timesync/timesyncd-gperf.gperf', needed by 'src/timesync/timesyncd-gperf.c'. Stop. --- Makefile.am | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index edae4a309b..987a6fe465 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4816,9 +4816,6 @@ systemd_timesyncd_SOURCES = \ nodist_systemd_timesyncd_SOURCES = \ src/timesync/timesyncd-gperf.c -gperf_gperf_sources += \ - src/timesync/timesyncd-gperf.gperf - systemd_timesyncd_LDADD = \ libsystemd-network.la \ libshared.la @@ -4832,15 +4829,18 @@ nodist_systemunit_DATA += \ GENERAL_ALIASES += \ $(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/sysinit.target.wants/systemd-timesyncd.service -EXTRA_DIST += \ - units/systemd-timesyncd.service.in nodist_pkgsysconf_DATA += \ src/timesync/timesyncd.conf +endif + +gperf_gperf_sources += \ + src/timesync/timesyncd-gperf.gperf + EXTRA_DIST += \ + units/systemd-timesyncd.service.in \ src/timesync/timesyncd.conf.in -endif # ------------------------------------------------------------------------------ if HAVE_MYHOSTNAME @@ -5467,10 +5467,11 @@ SYSTEM_UNIT_ALIASES += \ BUSNAMES_TARGET_WANTS += \ org.freedesktop.network1.busname +endif + gperf_gperf_sources += \ src/network/networkd-network-gperf.gperf \ src/network/networkd-netdev-gperf.gperf -endif EXTRA_DIST += \ units/systemd-networkd.service.m4.in \ -- cgit v1.2.3-54-g00ecf