[patch] Patch against the upstream git.

scute-libtool.patch (text/plain), 2.37 KB, created by orbea on 2021-04-11 22:23:31 UTC

commit d640bfdb9c9809bb6c1966a24cf08cdcf231430e
Author: orbea <[e-mail]>
Date:   Sun Apr 11 14:57:30 2021 -0700

    build: Use a canonical library name.

diff --git a/src/Makefile.am b/src/Makefile.am
index 806f6db..fe7f185 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -59,11 +59,7 @@ scute_version_script_cmd =
 endif
 
 
-if HAVE_DARWIN_SYSTEM
 lib_LTLIBRARIES = libscute.la
-else
-lib_LTLIBRARIES = scute.la
-endif
 
 if HAVE_W32_SYSTEM
 
@@ -118,28 +114,24 @@ scute_libadd =
 
 endif
 
-if HAVE_DARWIN_SYSTEM
-libscute_la_LDFLAGS = $(scute_res_ldflag) $(no_undefined) -avoid-version $(export_symbols) \
+libscute_la_LDFLAGS =
+
+if !HAVE_DARWIN_SYSTEM
+libscute_la_LDFLAGS += -module
+endif
+
+libscute_la_LDFLAGS += $(scute_res_ldflag) $(no_undefined) -avoid-version $(export_symbols) \
 	$(scute_version_script_cmd) -version-info \
 	@LIBSCUTE_LT_CURRENT@:@LIBSCUTE_LT_REVISION@:@LIBSCUTE_LT_AGE@
+
 libscute_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libscute.vers $(scute_deps)
-libscute_la_LIBADD = $(scute_libadd) \
-	@LTLIBOBJS@ @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
 
-libscute_la_CPPFLAGS = -I$(srcdir)/../include \
-	@LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@
-libscute_la_SOURCES = $(sources)
-else
-scute_la_LDFLAGS = $(scute_res_ldflag) $(no_undefined) -module -avoid-version $(export_symbols) \
-	$(scute_version_script_cmd) -version-info \
-	@LIBSCUTE_LT_CURRENT@:@LIBSCUTE_LT_REVISION@:@LIBSCUTE_LT_AGE@
-scute_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libscute.vers $(scute_deps)
 # scute_libadd must come BEFORE libassuan and gpg-error, because we
 # override it on Windows targets.
-scute_la_LIBADD = $(scute_libadd) \
+libscute_la_LIBADD = $(scute_libadd) \
 	@LTLIBOBJS@ @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ $(scute_w32_extra_libs)
 
-scute_la_CPPFLAGS = -I$(srcdir)/../include \
+libscute_la_CPPFLAGS = -I$(srcdir)/../include \
 	@LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@
-scute_la_SOURCES = $(sources)
-endif
+
+libscute_la_SOURCES = $(sources)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 620d997..680ea44 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,11 +32,7 @@ EXTRA_DIST = clean-socketdir
 TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src
-if HAVE_DARWIN_SYSTEM
 LDADD = ../src/libscute.la
-else
-LDADD = ../src/scute.la
-endif
 
 clean-local:
 	$(TESTS_ENVIRONMENT) $(srcdir)/clean-socketdir