From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 24 Feb 2021 01:46:55 +0000 (-0500)
Subject: Bundle scripts to help re-bootstrap the package.
X-Git-Tag: v1~8
X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/commitdiff_plain/1b9e87d8cac4e24034cb4d8f5c42824bac507772

Bundle scripts to help re-bootstrap the package.

We can include the main bootstrapping scripts easily enough in the
package.  If the user has a (possibly updated) Gnulib available, it
is now possible to regenerate the build system just by running the
included bootstrap script.
---

diff --git a/Makefile.am b/Makefile.am
index 3a6e300..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 README.md INSTALL
+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