From: Harlan Stenn Date: Mon, 14 Sep 2015 05:50:02 +0000 (+0000) Subject: [Bug 2907] dist* build targets require our libevent/ to be enabled. HStenn. X-Git-Tag: NTP_4_3_71~2^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=534450e41f1b7b3f228e3836f330286f28efb58d;p=thirdparty%2Fntp.git [Bug 2907] dist* build targets require our libevent/ to be enabled. HStenn. bk: 55f6600agWEoCjnG9Ja4H5CHKxjkxg --- diff --git a/ChangeLog b/ChangeLog index e066f19a9..f3d38732e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * [Bug 2886] Mis-spelling: "outlyer" should be "outlier". dave@horsfall.org * [Bug 2889] ntp-dev-4.3.67 does not build on Windows. perlinger@ntp.org * [Bug 2890] Ignore ENOBUFS on routing netlink socket. Konstantin Khlebnikov. +* [Bug 2907] dist* build targets require our libevent/ to be enabled. HStenn. * libntp/emalloc.c: Remove explicit include of stdint.h. Harlan Stenn. * Put Unity CPPFLAGS items in unity_config.h. Harlan Stenn. * tests/ntpd/g_leapsec.cpp typo fix. Harlan Stenn. diff --git a/sntp/Makefile.am b/sntp/Makefile.am index 61c58803c..1fa1b31ff 100644 --- a/sntp/Makefile.am +++ b/sntp/Makefile.am @@ -269,14 +269,17 @@ $(srcdir)/sntp.html: $(srcdir)/invoke-sntp.menu $(srcdir)/invoke-sntp.texi $(src libtool: $(LIBTOOL_DEPS) ./config.status --recheck -# HMS: replaces the stock distdir target, which is a lose. -#distdir: distdir-pre-check +# HMS: libevent/ is a target if it's in EXTRA_DIST via NTP_FORCE_LIBEVENT_DIST. +# Note that libevent/ is already in DIST_SUBDIRS (implicit in Makefile.am +# but explicit in Makefile.in). This check doesn't help with distclean. +libevent: distdir-pre-check -# HMS: not great - doesn't stop the build. +# HMS: Stops the build for gmake or pmake distdir-pre-check: case "$(DIST_FAIL)" in \ '') ;; \ - *) echo "re-run configure adding $(DIST_FAIL) if you want to make a distribution."; \ + *) $(error re-run configure adding $(DIST_FAIL) if you want to make a distribution.); \ + echo "re-run configure adding $(DIST_FAIL) if you want to make a distribution."; \ exit 1 ;; \ esac