[patch] https://github.com/sigrokproject/libsigrok/pull/132

libsigrok-libtool.patch (text/plain), 1.52 KB, created by orbea on 2021-04-09 16:46:09 UTC

From ae7816ffab2ac3dfe05203c2d267ac429abc5e4a Mon Sep 17 00:00:00 2001
From: orbea <[e-mail]>
Date: Fri, 9 Apr 2021 09:38:19 -0700
Subject: [PATCH] build: Correct linking of libsigrok.la.

---
 Makefile.am | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1f51684f4..951150e83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,20 +199,12 @@ libsigrok_la_SOURCES += \
 noinst_LTLIBRARIES = src/libdrivers.la \
 	src/libdrivers_head.la src/libdrivers_tail.la
 
-src/libdrivers.o: src/libdrivers.la \
-		src/libdrivers_head.la src/libdrivers_tail.la
-	$(AM_V_CCLD)$(LINK) src/libdrivers_head.la src/libdrivers.la \
-		src/libdrivers_tail.la
-src/libdrivers.lo: src/libdrivers.o
-	$(AM_V_GEN)echo "# Generated by libtool" > $@
-	$(AM_V_at)echo "pic_object='libdrivers.o'" >> $@
-	$(AM_V_at)echo "non_pic_object='libdrivers.o'" >> $@
-
 src_libdrivers_head_la_SOURCES = src/driver_list_start.c
 
 src_libdrivers_tail_la_SOURCES = src/driver_list_stop.c
 
 src_libdrivers_la_SOURCES = src/drivers.c
+src_libdrivers_la_LIBADD = src/libdrivers_head.la src/libdrivers_tail.la
 
 if HW_AGILENT_DMM
 src_libdrivers_la_SOURCES += \
@@ -675,7 +667,7 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/zketech-ebd-usb/api.c
 endif
 
-libsigrok_la_LIBADD = src/libdrivers.lo $(SR_EXTRA_LIBS) $(LIBSIGROK_LIBS)
+libsigrok_la_LIBADD = src/libdrivers.la $(SR_EXTRA_LIBS) $(LIBSIGROK_LIBS)
 libsigrok_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined
 
 library_includedir = $(includedir)/libsigrok