X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=cedd8250512f1bd27b3e3c726e64116275cc6226;hb=767ca13532a96ecc76c083b3041a2d9409977fa5;hp=f56573396b04dc1f94d417df2139b61ea79ee682;hpb=a8e913c4521da86886d32793c1e28a49530b9bf8;p=libsigrok.git diff --git a/Makefile.am b/Makefile.am index f5657339..cedd8250 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,7 @@ lib_LTLIBRARIES = libsigrok.la # Backend files libsigrok_la_SOURCES = \ src/backend.c \ + src/conversion.c \ src/device.c \ src/session.c \ src/session_file.c \ @@ -167,15 +168,22 @@ libsigrok_la_SOURCES += \ src/scale/kern.c # Hardware drivers -noinst_LTLIBRARIES = src/libdrivers.la +noinst_LTLIBRARIES = src/libdrivers.la \ + src/libdrivers_head.la src/libdrivers_tail.la -src/libdrivers.o: src/libdrivers.la - $(AM_V_CCLD)$(LINK) src/libdrivers.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 if HW_AGILENT_DMM @@ -221,7 +229,9 @@ src_libdrivers_la_SOURCES += \ src/hardware/beaglelogic/beaglelogic.h \ src/hardware/beaglelogic/protocol.h \ src/hardware/beaglelogic/protocol.c \ - src/hardware/beaglelogic/api.c + src/hardware/beaglelogic/api.c \ + src/hardware/beaglelogic/beaglelogic_native.c \ + src/hardware/beaglelogic/beaglelogic_tcp.c endif if HW_BRYMEN_BM86X src_libdrivers_la_SOURCES += \ @@ -452,11 +462,11 @@ src_libdrivers_la_SOURCES += \ src/hardware/saleae-logic16/protocol.c \ src/hardware/saleae-logic16/api.c endif -if HW_SALEAE_LOGICPRO +if HW_SALEAE_LOGIC_PRO src_libdrivers_la_SOURCES += \ - src/hardware/saleae-logicpro/protocol.h \ - src/hardware/saleae-logicpro/protocol.c \ - src/hardware/saleae-logicpro/api.c + src/hardware/saleae-logic-pro/protocol.h \ + src/hardware/saleae-logic-pro/protocol.c \ + src/hardware/saleae-logic-pro/api.c endif if HW_SCPI_PPS src_libdrivers_la_SOURCES += \