X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/c6dcb6021d8f593bbb1bc1e82d0f193685e5a4a7..b48ddbe1ee821a75e11675235f83e3e47f2bf923:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 90439ad..4972bd2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,8 @@
 # This is free software: you are free to do what the fuck you want to.
 # There is NO WARRANTY, to the extent permitted by law.
 
+AUTOMAKE_OPTIONS = parallel-tests color-tests
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = nostdinc
 
 # For Gnulib
 MOSTLYCLEANFILES =
@@ -13,7 +13,6 @@ noinst_LTLIBRARIES =
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
 	-I$(top_builddir)/lib -I$(top_srcdir)/lib \
-	-I$(top_builddir) -I$(top_srcdir) \
 	-I$(top_builddir)/test \
 	-DBISON_LOCALEDIR=\"$(BISON_LOCALEDIR)\" \
 	-DLOCALEDIR=\"$(localedir)\"
@@ -35,7 +34,7 @@ EXTRA_DIST = m4/gnulib-cache.m4 src/types.lst src/validtypes.sed \
 dist_man_MANS = doc/man/cdecl99.1 doc/man/libcdecl.3
 
 include_HEADERS = src/cdecl.h
-noinst_HEADERS = conf_post.h src/typemap.h src/output.h src/scan.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
 
@@ -51,24 +50,35 @@ libcdecl_la_LIBADD = libgnu.la $(LTLIBINTL) $(LTLIBTHREAD)
 $(libcdecl_la_OBJECTS): $(gnulib_headers)
 
 bin_PROGRAMS = cdecl99
+cdecl99_SOURCES = src/cdecl99.c
+cdecl99_LDADD = libcdecl.la libgnu.la $(LTLIBINTL) $(LTLIBREADLINE)
+$(cdecl99_OBJECTS): $(gnulib_headers)
 
-check_PROGRAMS =
+check_PROGRAMS = test/crossparse
 check_LTLIBRARIES = libtest.la
 libtest_la_LIBADD = $(GSL_LIBS)
 libtest_la_SOURCES = test/testlib.c
+$(libtest_la_OBJECTS): $(gnulib_headers)
 
 if HAVE_GSL
 libtest_la_SOURCES += test/declgen.c
 check_PROGRAMS += test/randomdecl
 endif
 
-cdecl99_SOURCES = src/cdecl99.c
-cdecl99_LDADD = libcdecl.la libgnu.la $(LTLIBINTL) $(LTLIBREADLINE)
-$(cdecl99_OBJECTS): $(gnulib_headers)
-
+test_crossparse_LDADD = libcdecl.la libtest.la libgnu.la
+$(test_crossparse_OBJECTS): $(gnulib_headers)
 test_randomdecl_LDADD = libcdecl.la libtest.la libgnu.la
 $(test_randomdecl_OBJECTS): $(gnulib_headers)
 
+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
+
+EXTRA_DIST += $(TESTS)
+
 src/parse.lo: src/scan.h
 src/scan.lo: src/parse.h
 src/parse-decl.lo: src/scan.h src/parse.h