Portability improvements for new random number generator.

[cdecl99.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2597f8a2480dc7ad5371b0baa4afcfb2e3d9f6b9..bef5f018d19fea158c46f6dff23ee11aac1654d5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2011-2013, 2019-2021 Nick Bowler
+# Copyright © 2011-2013, 2019-2022 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.
@@ -12,12 +12,10 @@ EXTRA_LTLIBRARIES =
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
        -I$(top_builddir)/lib -I$(top_srcdir)/lib \
-       -I$(top_builddir)/test \
+       -I$(DX_BASEDIR)/src -I$(top_builddir)/test \
        -DBISON_LOCALEDIR=\"$(BISON_LOCALEDIR)\" \
        -DLOCALEDIR=\"$(localedir)\"
 
-AM_CFLAGS = $(GSL_CFLAGS)
-
 MAINTAINERCLEANFILES = src/scan.c src/scan.h src/scan.stamp \
                        src/parse.c src/parse.h src/parse.stamp
 
@@ -32,8 +30,8 @@ EXTRA_DIST = bootstrap $(DX_BASEDIR)/scripts/fix-gnulib.pl m4/gnulib-cache.m4 \
 dist_man_MANS = doc/cdecl99.1 doc/libcdecl.3
 
 include_HEADERS = src/cdecl.h
-noinst_HEADERS = conf_pre.h conf_post.h src/scan.h src/parse.h \
-                 test/declgen.h test/test.h
+noinst_HEADERS = conf_pre.h conf_post.h common/src/help.h \
+                 src/scan.h src/parse.h test/declgen.h test/test.h
 
 noinst_DATA = $(MOFILES)
 
@@ -51,11 +49,10 @@ libcdecl_la_SOURCES += src/i18n.c
 endif
 
 bin_PROGRAMS = cdecl99
-cdecl99_SOURCES = src/commands.c src/cdecl99.h
+cdecl99_SOURCES = common/src/help.c src/commands.c src/cdecl99.h
 cdecl99_LDADD = $(libmain_a_OBJECTS) $(libexec_a_OBJECTS) libcdecl.la \
                 libgnu.la $(LTLIBICONV) $(LTLIBINTL) $(LTLIBREADLINE)
 $(cdecl99_OBJECTS): $(gnulib_headers)
-$(cdecl99_OBJECTS): src/options.h
 
 EXTRA_LIBRARIES = libexec.a
 libexec_a_SOURCES = src/execute.c src/commands.h
@@ -67,22 +64,18 @@ libmain_a_SOURCES = src/cdecl99.c src/options.h
 $(libmain_a_OBJECTS): $(gnulib_headers)
 $(libmain_a_OBJECTS): src/options.h
 
-check_PROGRAMS = test/crossparse test/normalize
-check_LTLIBRARIES = libtest.la
-libtest_la_LIBADD = $(GSL_LIBS)
-libtest_la_SOURCES = test/testlib.c
-$(libtest_la_OBJECTS): $(gnulib_headers)
+check_PROGRAMS = test/crossparse test/normalize test/randomdecl
+check_LIBRARIES = libtest.a
+libtest_a_SOURCES = test/testlib.c common/src/help.c
+$(libtest_a_OBJECTS): $(gnulib_headers)
 
-if HAVE_GSL
-libtest_la_SOURCES += test/declgen.c
-check_PROGRAMS += test/randomdecl
-endif
+test_randomdecl_SOURCES = test/randomdecl.c test/declgen.c test/rng.c
+test_randomdecl_LDADD = libtest.a libcdecl.la libgnu.la $(LDEXP_LIBM)
+$(test_randomdecl_OBJECTS): $(gnulib_headers)
 
-test_crossparse_LDADD = libtest.la libcdecl.la libgnu.la
+test_crossparse_LDADD = libtest.a libcdecl.la libgnu.la
 $(test_crossparse_OBJECTS): $(gnulib_headers)
-test_randomdecl_LDADD = libtest.la libcdecl.la libgnu.la
-$(test_randomdecl_OBJECTS): $(gnulib_headers)
-test_normalize_LDADD = libtest.la src/output.lo src/normalize.lo \
+test_normalize_LDADD = libtest.a src/output.lo src/normalize.lo \
                        libcdecl.la libgnu.la
 $(test_normalize_OBJECTS): $(gnulib_headers)
 
@@ -90,7 +83,7 @@ src/parse.lo: src/scan.h
 src/scan.lo: src/parse.h
 src/parse-decl.lo: src/scan.h src/parse.h src/typemap.h
 src/output.lo: src/specstr.h
-test/declgen.lo: test/typegen.h
+test/declgen.$(OBJEXT): test/typegen.h
 
 # Supporting rules for gettext.
 include $(top_srcdir)/common/snippet/gettext.mk