From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 3 Mar 2021 02:21:50 +0000 (-0500)
Subject: Fix testcase compilation with --disable-shared.
X-Git-Tag: v1.1~14
X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/commitdiff_plain/a5bd3ad316db03f0e4de775908a920a3833f2a26?hp=55e350dc7050d5384f8d33a1583d6c8d8da4e1c3

Fix testcase compilation with --disable-shared.

Since the libtest library depends on functions in libcdecl,
we must list libcdecl after libtest on the linker command line,
otherwise required objects from static libcdecl will not be
pulled in to the link.  A similar problem also occurs when
building tests with LDFLAGS=-Wl,--as-needed.
---

diff --git a/Makefile.am b/Makefile.am
index d4d375f..1d40ab3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,9 +77,9 @@ libtest_la_SOURCES += test/declgen.c
 check_PROGRAMS += test/randomdecl
 endif
 
-test_crossparse_LDADD = libcdecl.la libtest.la libgnu.la
+test_crossparse_LDADD = libtest.la libcdecl.la libgnu.la
 $(test_crossparse_OBJECTS): $(gnulib_headers)
-test_randomdecl_LDADD = libcdecl.la libtest.la libgnu.la
+test_randomdecl_LDADD = libtest.la libcdecl.la libgnu.la
 $(test_randomdecl_OBJECTS): $(gnulib_headers)
 
 src/parse.lo: src/scan.h
diff --git a/NEWS b/NEWS
index 64e572a..2ba5206 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,4 @@
+Release 1a:
+
 Release 1:
 	* Initial release.
diff --git a/configure.ac b/configure.ac
index 90440e3..5fd17d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl This is free software: you are free to do what the fuck you want to.
 dnl There is NO WARRANTY, to the extent permitted by law.
 
 AC_PREREQ([2.68])
-AC_INIT([cdecl99], [1], [nbowler@draconx.ca])
+AC_INIT([cdecl99], [1a], [nbowler@draconx.ca])
 AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects dist-xz])