diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-12-06 20:58:11 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-12-06 20:58:11 +0100 |
| commit | 1fbcad80f0760976193303fcb5c88c8201c4f27e (patch) | |
| tree | e42ecfbbe0226306cfccd86744eb503cf3f72872 | |
| parent | Merge pull request #2100 from msekletar/nologin-label (diff) | |
| parent | build-sys: move "dist" parts out of conditional (diff) | |
| download | systemd-1fbcad80f0760976193303fcb5c88c8201c4f27e.tar.xz systemd-1fbcad80f0760976193303fcb5c88c8201c4f27e.zip | |
Merge pull request #2095 from evverx/fix-distcheck-for-disable-timesync
build-sys: move "dist" parts out of conditional
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index db916f72c5..48fb8208a4 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 @@ -5469,10 +5469,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 \ |