Don't parse command-line options more than once.

[cdecl99.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3955dd5026cc6e6b74eafde1343cbdedd9b366c0..258d84a1cbfff6be01ac58aefbe8c33ccc46b665 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.
@@ -16,14 +16,12 @@ AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
        -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
 
 DISTCLEANFILES =
 
-CLEANFILES = $(EXTRA_LTLIBRARIES)
+CLEANFILES = $(EXTRA_LTLIBRARIES) $(EXTRA_LIBRARIES)
 
 EXTRA_DIST = bootstrap $(DX_BASEDIR)/scripts/fix-gnulib.pl m4/gnulib-cache.m4 \
              src/types.lst src/parse.y src/parse.stamp src/scan.l \
@@ -37,26 +35,40 @@ noinst_HEADERS = conf_pre.h conf_post.h common/src/help.h \
 
 noinst_DATA = $(MOFILES)
 
+shared_gl_objects = $(gnulib_symfiles:.glsym=.lo)
+static_gl_objects = $(gnulib_extra_objects:.lo=.@OBJEXT@)
+
 lib_LTLIBRARIES = libcdecl.la
-libcdecl_la_LDFLAGS = -export-symbols-regex '^cdecl_[[:lower:]]' \
+libcdecl_la_LDFLAGS = -export-symbols-regex '^cdecl_([[:lower:]]|_gl_)' \
                       -no-undefined -version-info 1:0:0
 libcdecl_la_SOURCES = src/scan.c src/parse.c src/parse-decl.c src/output.c \
                       src/explain.c src/declare.c src/error.c src/normalize.c \
                       src/cdecl-internal.h
-libcdecl_la_LIBADD = libgnu.la $(LTLIBINTL) $(LTLIBTHREAD)
+libcdecl_la_LIBADD = $(shared_gl_objects) $(LTLIBINTL) $(LIBTHREAD)
+EXTRA_libcdecl_la_DEPENDENCIES = $(shared_gl_objects)
 $(libcdecl_la_OBJECTS): $(gnulib_headers)
 
 if USE_NLS
 libcdecl_la_SOURCES += src/i18n.c
 endif
 
+EXTRA_LIBRARIES = libgnu.a
+libgnu_a_SOURCES =
+libgnu_a_SHORTNAME = s
+libgnu_a_CFLAGS = $(AM_CFLAGS)
+libgnu_a_LIBADD = $(static_gl_objects)
+EXTRA_libgnu_a_SOURCES = $(libgnu_la_SOURCES) $(EXTRA_libgnu_la_SOURCES)
+
+EXTRA_libgnu_a_DEPENDENCIES = $(static_gl_objects)
+dummy $(static_gl_objects): $(gnulib_headers)
+
 bin_PROGRAMS = cdecl99
 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)
+                libgnu.a $(LTLIBICONV) $(LTLIBINTL) $(LTLIBREADLINE)
 $(cdecl99_OBJECTS): $(gnulib_headers)
 
-EXTRA_LIBRARIES = libexec.a
+EXTRA_LIBRARIES += libexec.a
 libexec_a_SOURCES = src/execute.c src/commands.h
 $(libexec_a_OBJECTS): $(gnulib_headers)
 $(libexec_a_OBJECTS): src/commands.h src/cmdlist.h
@@ -66,30 +78,32 @@ 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 test/rng-test
+check_LIBRARIES = libtest.a
+libtest_a_SOURCES = test/testlib.c test/rng.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_LIBS = libtest.a libcdecl.la libgnu.a $(LDEXP_LIBM)
 
-test_crossparse_LDADD = libtest.la libcdecl.la libgnu.la
-$(test_crossparse_OBJECTS): $(gnulib_headers)
-test_randomdecl_LDADD = libtest.la libcdecl.la libgnu.la
+test_randomdecl_SOURCES = test/randomdecl.c test/declgen.c
+test_randomdecl_LDADD = $(TEST_LIBS)
 $(test_randomdecl_OBJECTS): $(gnulib_headers)
-test_normalize_LDADD = libtest.la src/output.lo src/normalize.lo \
-                       libcdecl.la libgnu.la
+
+test_crossparse_LDADD = $(TEST_LIBS)
+$(test_crossparse_OBJECTS): $(gnulib_headers)
+
+test_normalize_LDADD = src/output.lo src/normalize.lo $(TEST_LIBS)
 $(test_normalize_OBJECTS): $(gnulib_headers)
 
+test_rng_test_LDADD = $(TEST_LIBS)
+$(test_rng_test_OBJECTS): $(gnulib_headers)
+EXTRA_DIST += test/xos256p.c
+
 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