X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/e287361d35cef81ceee2b6cf538455d93e8e3beb..0be9665d13739d12085ef2f5c2d4a47215d7612d:/Makefile.am?ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index 1371614..8ccdc95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2011-2012 Nick Bowler
+# Copyright © 2011-2013,2019-2020 Nick Bowler
 #
 # License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 # This is free software: you are free to do what the fuck you want to.
@@ -22,6 +22,8 @@ AM_CFLAGS = $(GSL_CFLAGS)
 MAINTAINERCLEANFILES = src/scan.c src/scan.h src/scan.stamp \
 	src/parse.c src/parse.h src/parse.stamp
 
+DISTCLEANFILES =
+
 CLEANFILES = src/validtypes.h src/errtab.h src/namespecs.h src/ordspecs.h \
 	test/typegen.h
 
@@ -35,8 +37,8 @@ dist_man_MANS = doc/man/cdecl99.1 doc/man/libcdecl.3
 
 include_HEADERS = src/cdecl.h
 noinst_HEADERS = conf_pre.h conf_post.h src/typemap.h src/output.h src/scan.h \
-	src/parse.h src/i18n.h src/normalize.h src/error.h test/declgen.h \
-	test/test.h
+	src/parse.h src/i18n.h src/normalize.h src/error.h src/history.h \
+	test/declgen.h test/test.h
 
 noinst_DATA = $(MOFILES)
 
@@ -74,10 +76,9 @@ TESTS_ENVIRONMENT = SHELL='$(SHELL)' LIBTOOL='$(LIBTOOL)' EXEEXT='$(EXEEXT)'
 TEST_EXTENSIONS = .sh
 SH_LOG_COMPILER = $(SHELL)
 
-TESTS = tests/libcdecl-static-symbols.sh tests/randomdecl-sanity.sh \
-	tests/crossparse-c-random.sh tests/cdecl99-c-invalid.sh
+TESTS = tests/crossparse-c-random.sh
 
-EXTRA_DIST += $(TESTS)
+dist_check_SCRIPTS = $(TESTS)
 
 src/parse.lo: src/scan.h
 src/scan.lo: src/parse.h
@@ -159,13 +160,13 @@ unfuck-distdir:
 
 # Supporting rules for bison/flex.
 
-BISON_V   = $(BISON_V_$(V))
-BISON_V_  = $(BISON_V_$(AM_DEFAULT_VERBOSITY))
-BISON_V_0 = @echo "  BISON " $<;
+BISON_V   = $(BISON_V_@AM_V@)
+BISON_V_  = $(BISON_V_@AM_DEFAULT_V@)
+BISON_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'BISON   ' $<;
 
-FLEX_V   = $(FLEX_V_$(V))
-FLEX_V_  = $(FLEX_V_$(AM_DEFAULT_VERBOSITY))
-FLEX_V_0 = @echo "  FLEX  " $<;
+FLEX_V   = $(FLEX_V_@AM_V@)
+FLEX_V_  = $(FLEX_V_@AM_DEFAULT_V@)
+FLEX_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'FLEX    ' $<;
 
 .y.c: ;
 .l.c: ;
@@ -202,5 +203,16 @@ FLEX_V_0 = @echo "  FLEX  " $<;
 		$(MAKE) $(AM_MAKEFLAGS) $<; \
 	fi
 
+atlocal: config.status
+	$(AM_V_GEN) :; { \
+	  printf ': "$${%s=%s}"\n' \
+	    EXEEXT '$(EXEEXT)' \
+	    check_PROGRAMS '$(check_PROGRAMS)' \
+	    ; } >$@.tmp
+	$(AM_V_at) mv -f $@.tmp $@
+check_DATA = atlocal
+CLEANFILES += atlocal
+
 include $(top_srcdir)/lib/gnulib.mk
 include $(top_srcdir)/common/snippet/glconfig.mk
+include $(top_srcdir)/common/snippet/autotest.mk