1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
From c5c25dcfcba5bdf099ed95ffc203a096d39ea6c2 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 13 Sep 2024 17:13:55 +0000
Subject: [PATCH] Add libtool (for shared lib support) and install targets
---
Makefile.am | 13 ++++++++-----
configure.ac | 6 +++++-
testsuite/Makefile.am | 2 +-
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5b58d46..3a59ddd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,18 +23,21 @@ SUBDIRS = . testsuite
LIBOBJS = @LIBOBJS@
-noinst_LIBRARIES = libargp.a
noinst_PROGRAMS = argp-test
-noinst_HEADERS = argp.h argp-fmtstream.h argp-namefrob.h # argp-comp.h
+noinst_HEADERS = argp-fmtstream.h argp-namefrob.h # argp-comp.h
EXTRA_DIST = mempcpy.c strchrnul.c strndup.c Versions
+ACLOCAL_AMFLAGS = -I m4
+lib_LTLIBRARIES = libargp.la
# Leaves out argp-fs-xinl.c and argp-xinl.c
-libargp_a_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
+libargp_la_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
argp-help.c argp-parse.c argp-pv.c \
argp-pvh.c
+libargp_la_HEADERS = argp.h
+libargp_ladir = $(includedir)
-libargp_a_LIBADD = $(LIBOBJS)
+libargp_la_LIBADD = $(LIBOBJS)
-argp_test_LDADD = libargp.a
+argp_test_LDADD = libargp.la
diff --git a/configure.ac b/configure.ac
index 386215d..345f6fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl This configure.ac is only for building a standalone argp library.
AC_PREREQ(2.54)
AC_INIT(argp-ba.c)
-AM_INIT_AUTOMAKE(argp, standalone-1.4.0)
+AM_INIT_AUTOMAKE(argp, standalone-1.4.1)
AM_CONFIG_HEADER(config.h)
# GNU libc defaults to supplying the ISO C library functions only. The
@@ -18,6 +18,8 @@ AC_PROG_MAKE_SET
AC_PROG_RANLIB
AM_PROG_CC_STDC
+LT_INIT
+
if test "x$am_cv_prog_cc_stdc" = xno ; then
AC_ERROR([the C compiler doesn't handle ANSI-C])
fi
@@ -93,4 +95,6 @@ fi
CPPFLAGS="$CPPFLAGS -I$srcdir"
+PKG_INSTALLDIR
+
AC_OUTPUT(Makefile testsuite/Makefile)
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 9993541..0e34120 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -5,7 +5,7 @@ TS_ALL = $(TS_PROGS) $(TS_SH)
noinst_PROGRAMS = $(TS_PROGS) ex1 ex3 ex4
-LDADD = ../libargp.a
+LDADD = ../libargp.la
EXTRA_DIST = $(TS_SH) run-tests
CLEANFILES = test.out
|
