X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/122745b9f9cd351b859fd2969ad219b7e375c754..1b9e87d8cac4e24034cb4d8f5c42824bac507772:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 01ff0a6..6a8f1ef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,11 +26,11 @@ DISTCLEANFILES =
 CLEANFILES = src/validtypes.h src/errtab.h src/namespecs.h src/ordspecs.h \
              test/typegen.h $(EXTRA_LTLIBRARIES)
 
-EXTRA_DIST = m4/gnulib-cache.m4 src/types.lst src/validtypes.sed \
-	src/specs.lst src/namespecs.sed src/ordspecs.sed \
-	src/errors.lst src/strtab.sed test/typegen.sh \
-	src/parse.y src/parse.stamp src/scan.l src/scan.stamp \
-	COPYING.WTFPL2
+EXTRA_DIST = bootstrap common/scripts/fix-gnulib.pl m4/gnulib-cache.m4 \
+             src/types.lst src/validtypes.sed src/specs.lst src/namespecs.sed \
+             src/ordspecs.sed src/errors.lst src/strtab.sed test/typegen.sh \
+             src/parse.y src/parse.stamp src/scan.l src/scan.stamp \
+             COPYING.WTFPL2 README.md INSTALL
 
 dist_man_MANS = doc/man/cdecl99.1 doc/man/libcdecl.3
 
@@ -52,7 +52,8 @@ $(libcdecl_la_OBJECTS): $(gnulib_headers)
 
 bin_PROGRAMS = cdecl99
 cdecl99_SOURCES = src/cdecl99.c
-cdecl99_LDADD = libcdecl.la libgnu.la $(LTLIBINTL) $(LTLIBREADLINE)
+cdecl99_LDADD = libcdecl.la libgnu.la \
+                $(LTLIBICONV) $(LTLIBINTL) $(LTLIBREADLINE)
 $(cdecl99_OBJECTS): $(gnulib_headers)
 
 check_PROGRAMS = test/crossparse
@@ -149,6 +150,39 @@ unfuck-distdir:
 	find '$(distdir)' -type f -exec chmod u+w {} +
 .PHONY: unfuck-distdir
 
+GITLOG_FLAGS = --format='%s%n%n%b%n'
+
+dist-hook: generate-changelog
+generate-changelog: unfuck-distdir
+	-: "$${GIT_DIR=$(top_srcdir)/.git}"; \
+	  export GIT_DIR; test -d "$$GIT_DIR" || exit 0; \
+	  $(top_srcdir)/gitlog-to-changelog $(GITLOG_FLAGS) \
+	    >'$(distdir)/ChangeLog.gen' && \
+	  mv -f '$(distdir)/ChangeLog.gen' '$(distdir)/ChangeLog'
+	rm -f '$(distdir)/ChangeLog.gen'
+.PHONY: generate-changelog
+
+GENERIC_V   = $(GENERIC_V_@AM_V@)
+GENERIC_V_  = $(GENERIC_V_@AM_DEFAULT_V@)
+GENERIC_V_0 = @printf '%2.0s%$(DX_ALIGN_V)s %s\n'
+
+TEST_DISTRIBUTION = false
+TEST_DISTRIBUTION_OR_ERROR = if $(TEST_DISTRIBUTION); \
+  then echo 'Proceeding anyway...'; \
+  else echo 'Run $(MAKE) TEST_DISTRIBUTION=true to ignore this failure.'; \
+       false; \
+  fi
+
+distcheck-hook:
+	$(GENERIC_V) : 'CHECK   ' ChangeLog; \
+	  $(AWK) '/^Stub/ { print FILENAME ":" NR ":", $$0; exit 1 }' \
+	    $(distdir)/ChangeLog || { \
+	      echo 'ERROR: *** Packaged ChangeLog was not properly generated from git log.'; \
+	      echo '       *** The source version was used instead, but this appears to'; \
+	      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
+
 # Supporting rules for bison/flex.
 
 BISON_V   = $(BISON_V_@AM_V@)