From 42b31a811f58460497c78974618743c618e3b9cf Mon Sep 17 00:00:00 2001 From: orbea Date: Wed, 7 Apr 2021 20:03:56 -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..65d9b367f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -199,15 +199,6 @@ 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 @@ -675,7 +666,8 @@ 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 src/libdrivers_tail.la \ + src/libdrivers_head.la $(SR_EXTRA_LIBS) $(LIBSIGROK_LIBS) libsigrok_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined library_includedir = $(includedir)/libsigrok