Fix radius/diameter confusion in overlap search.

[slotifier.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 35666c6ecf5473beb5dda7e031235f03547c7236..3d9b9384013cd5150b572fa5b8c6f32aa6e44ab6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,12 +6,13 @@
 
 ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
-CLEANFILES =
+CLEANFILES = $(EXTRA_LIBRARIES)
 DISTCLEANFILES =
 MOSTLYCLEANFILES =
 MAINTAINERCLEANFILES =
-noinst_LTLIBRARIES =
-EXTRA_DIST =
+EXTRA_LIBRARIES =
+EXTRA_DIST = bootstrap common/scripts/fix-gnulib.pl m4/gnulib-cache.m4 \
+             INSTALL README.md
 
 AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \
               -DLOCALEDIR=\"$(localedir)\"
@@ -20,7 +21,7 @@ AM_CFLAGS = $(LIBGERBV_CFLAGS) $(CNEARTREE_CFLAGS)
 bin_PROGRAMS = slotifier
 
 slotifier_SOURCES = src/slotifier.c
-slotifier_LDADD = $(LIBGERBV_LIBS) $(CNEARTREE_LIBS) libgnu.la \
+slotifier_LDADD = $(LIBGERBV_LIBS) $(CNEARTREE_LIBS) libgnu.a \
                   $(LTLIBICONV) $(LTLIBINTL) $(HYPOT_LIBM)
 $(slotifier_OBJECTS): $(gnulib_headers)
 
@@ -68,6 +69,14 @@ distcheck-hook:
              echo '       *** be the stub from a git checkout.  The "git" and "perl"'; \
              echo '       *** programs are required for ChangeLog generation to work.'; \
              $(TEST_DISTRIBUTION_OR_ERROR); } >&2
+       $(GENERIC_V) : 'CHECK   ' NEWS; \
+         $(AWK) 'NR == 1 && $$NF != "$(PACKAGE_VERSION):" \
+           { print FILENAME ":" NR ":", $$0; exit 1}' \
+           $(distdir)/NEWS || { \
+             echo 'ERROR: *** First line of NEWS should match the package version'; \
+             echo '       *** $(PACKAGE_VERSION), but that does not appear to be the case.'; \
+             echo '       *** Remember to update NEWS before preparing a release.'; \
+             $(TEST_DISTRIBUTION_OR_ERROR); } >&2
 
 # Supporting rules for gettext.
 include $(top_srcdir)/common/snippet/gettext.mk