From e1c85dc5667f1d0f0ba2106c802dc930aeead64e Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 26 Sep 2026 13:32:26 +0000 Subject: Support building both shared and static libraries, using libtool. FossilOrigin-Name: 8d2e0bf113b6268f735f93bfc60d2ecd6981aa4415b7a890a133ae1f4fa2ec0c --- Makefile.am | 3 ++- configure.ac | 3 ++- src/Makefile.am | 2 +- src/bin/Makefile.am | 2 +- src/lib/Makefile.am | 6 ++++-- tests/Makefile.am | 8 ++++---- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 602d0df..3576fdb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,8 @@ +ACLOCAL_AMFLAGS = -I m4 bin_PROGRAMS = noinst_PROGRAMS = check_PROGRAMS = -lib_LIBRARIES = +lib_LTLIBRARIES = include_HEADERS = noinst_HEADERS = BUILT_SOURCES = diff --git a/configure.ac b/configure.ac index 155748d..b3094da 100644 --- a/configure.ac +++ b/configure.ac @@ -10,9 +10,10 @@ AC_CONFIG_MACRO_DIRS([m4]) AC_PROG_CC AX_PROG_CC_FOR_BUILD AC_C_FLEXIBLE_ARRAY_MEMBER -AC_PROG_RANLIB AM_PROG_AR +LT_INIT + AC_ARG_ENABLE([build-mode], [AS_HELP_STRING([--enable-build-mode=MODE], [select build mode: debug, release or coverage (default: release)])], diff --git a/src/Makefile.am b/src/Makefile.am index 0c20c80..b4cd291 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ include src/bin/Makefile.am include src/include/Makefile.am include src/lib/Makefile.am -include src/unicode/Makefile.am include src/tools/Makefile.am +include src/unicode/Makefile.am diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index bc25fbb..e4d2204 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -5,4 +5,4 @@ aplwc_SOURCES = \ src/bin/main.c \ src/bin/util.c -aplwc_LDADD = libaplwc.a +aplwc_LDADD = libaplwc.la diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 9cbbfae..b0f60f8 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,6 +1,6 @@ -lib_LIBRARIES += libaplwc.a +lib_LTLIBRARIES += libaplwc.la -libaplwc_a_SOURCES = \ +libaplwc_la_SOURCES = \ src/lib/aplwc_internal.h \ src/lib/eval.c \ src/lib/main.c \ @@ -11,4 +11,6 @@ libaplwc_a_SOURCES = \ src/lib/syntax.c \ src/lib/unicode.c +libaplwc_la_LDFLAGS = -version-info 0:0:0 + EXTRA_DIST += src/lib/boot.aplwc diff --git a/tests/Makefile.am b/tests/Makefile.am index 479b7ac..06d233d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,12 +4,12 @@ EXTRA_DIST += tests/scripts/simfail.sh check_PROGRAMS += testbin-aplwc_errstr testbin_aplwc_errstr_SOURCES = tests/aplwc_errstr.c -testbin_aplwc_errstr_LDADD = libaplwc.a +testbin_aplwc_errstr_LDADD = libaplwc.la TESTS += testbin-aplwc_errstr check_PROGRAMS += testbin-aplwc_utf8 testbin_aplwc_utf8_SOURCES= tests/aplwc_utf8.c -testbin_aplwc_utf8_LDADD = libaplwc.a +testbin_aplwc_utf8_LDADD = libaplwc.la TESTS += testbin-aplwc_utf8 TEST_EXTENSIONS += .txt @@ -18,7 +18,7 @@ EXTRA_DIST += $(TXT_LOG_COMPILER) check_PROGRAMS += testbin-aplwc_eval testbin_aplwc_eval_SOURCES= tests/aplwc_eval.c -testbin_aplwc_eval_LDADD = libaplwc.a +testbin_aplwc_eval_LDADD = libaplwc.la TEST_INPUTS += \ tests/aplwc_eval/good/1.txt \ tests/aplwc_eval/good/2.txt \ @@ -26,7 +26,7 @@ TEST_INPUTS += \ check_PROGRAMS += testbin-aplwc_read testbin_aplwc_read_SOURCES= tests/aplwc_read.c -testbin_aplwc_read_LDADD = libaplwc.a +testbin_aplwc_read_LDADD = libaplwc.la TEST_INPUTS += \ tests/aplwc_read/good/1.txt \ tests/aplwc_read/good/2.txt \ -- cgit v1.2.3