X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=Makefile.am;h=500d662010f91c2f4895d5b7bcf0e81947270b83;hp=db51c43a90a8f9139dce76d6dafba6107bf5e12e;hb=dbc519f72038baff3bc026e45efa683e95880c19;hpb=6cf1a87bfb803e088234e2e313891d27379880cf

diff --git a/Makefile.am b/Makefile.am
index db51c43a..500d6620 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 \
@@ -73,10 +74,12 @@ libsigrok_la_SOURCES += \
 	src/input/binary.c \
 	src/input/chronovu_la8.c \
 	src/input/csv.c \
+	src/input/logicport.c \
 	src/input/raw_analog.c \
 	src/input/trace32_ad.c \
 	src/input/vcd.c \
-	src/input/wav.c
+	src/input/wav.c \
+	src/input/null.c
 
 # Output modules
 libsigrok_la_SOURCES += \
@@ -91,7 +94,8 @@ libsigrok_la_SOURCES += \
 	src/output/hex.c \
 	src/output/ols.c \
 	src/output/srzip.c \
-	src/output/vcd.c
+	src/output/vcd.c \
+	src/output/null.c
 
 # Transform modules
 libsigrok_la_SOURCES += \
@@ -104,7 +108,6 @@ libsigrok_la_SOURCES += \
 libsigrok_la_SOURCES += \
 	src/scpi.h \
 	src/scpi/scpi.c \
-	src/scpi/helpers.c \
 	src/scpi/scpi_tcp.c
 if NEED_RPC
 libsigrok_la_SOURCES += \
@@ -143,17 +146,21 @@ endif
 
 # Hardware (DMM chip parsers)
 libsigrok_la_SOURCES += \
+	src/dmm/asycii.c \
+	src/dmm/bm25x.c \
+	src/dmm/dtm0660.c \
+	src/dmm/eev121gw.c \
 	src/dmm/es519xx.c \
 	src/dmm/fs9721.c \
 	src/dmm/fs9922.c \
 	src/dmm/m2110.c \
 	src/dmm/metex14.c \
+	src/dmm/ms8250d.c \
 	src/dmm/rs9lcd.c \
-	src/dmm/bm25x.c \
-	src/dmm/ut71x.c \
 	src/dmm/ut372.c \
+	src/dmm/ut71x.c \
 	src/dmm/vc870.c \
-	src/dmm/dtm0660.c
+	src/dmm/vc96.c
 
 # Hardware (LCR chip parsers)
 if NEED_SERIAL
@@ -166,15 +173,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
@@ -220,7 +234,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 += \
@@ -267,16 +283,26 @@ src_libdrivers_la_SOURCES += \
 endif
 if HW_DEMO
 src_libdrivers_la_SOURCES += \
-	src/hardware/demo/demo.c
+	src/hardware/demo/protocol.h \
+	src/hardware/demo/protocol.c \
+	src/hardware/demo/api.c
 endif
-if HW_DEREE_DE5000
+if HW_DREAMSOURCELAB_DSLOGIC
 src_libdrivers_la_SOURCES += \
-	src/hardware/deree-de5000/api.c
+	src/hardware/dreamsourcelab-dslogic/protocol.h \
+	src/hardware/dreamsourcelab-dslogic/protocol.c \
+	src/hardware/dreamsourcelab-dslogic/api.c
+endif
+if HW_FLUKE_45
+src_libdrivers_la_SOURCES += \
+	src/hardware/fluke-45/protocol.h \
+	src/hardware/fluke-45/protocol.c \
+	src/hardware/fluke-45/api.c
 endif
 if HW_FLUKE_DMM
 src_libdrivers_la_SOURCES += \
-	src/hardware/fluke-dmm/fluke-dmm.h \
-	src/hardware/fluke-dmm/fluke.c \
+	src/hardware/fluke-dmm/protocol.h \
+	src/hardware/fluke-dmm/protocol.c \
 	src/hardware/fluke-dmm/api.c
 endif
 if HW_FTDI_LA
@@ -289,9 +315,7 @@ if HW_FX2LAFW
 src_libdrivers_la_SOURCES += \
 	src/hardware/fx2lafw/protocol.h \
 	src/hardware/fx2lafw/protocol.c \
-	src/hardware/fx2lafw/api.c \
-	src/hardware/fx2lafw/dslogic.c \
-	src/hardware/fx2lafw/dslogic.h
+	src/hardware/fx2lafw/api.c
 endif
 if HW_GMC_MH_1X_2X
 src_libdrivers_la_SOURCES += \
@@ -305,12 +329,24 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/gwinstek-gds-800/protocol.c \
 	src/hardware/gwinstek-gds-800/api.c
 endif
+if HW_GWINSTEK_GPD
+src_libdrivers_la_SOURCES += \
+	src/hardware/gwinstek-gpd/protocol.h \
+	src/hardware/gwinstek-gpd/protocol.c \
+	src/hardware/gwinstek-gpd/api.c
+endif
 if HW_HAMEG_HMO
 src_libdrivers_la_SOURCES += \
 	src/hardware/hameg-hmo/protocol.h \
 	src/hardware/hameg-hmo/protocol.c \
 	src/hardware/hameg-hmo/api.c
 endif
+if HW_HANTEK_4032L
+src_libdrivers_la_SOURCES += \
+	src/hardware/hantek-4032l/protocol.h \
+	src/hardware/hantek-4032l/protocol.c \
+	src/hardware/hantek-4032l/api.c
+endif
 if HW_HANTEK_6XXX
 src_libdrivers_la_SOURCES += \
 	src/hardware/hantek-6xxx/protocol.h \
@@ -319,8 +355,8 @@ src_libdrivers_la_SOURCES += \
 endif
 if HW_HANTEK_DSO
 src_libdrivers_la_SOURCES += \
-	src/hardware/hantek-dso/dso.h \
-	src/hardware/hantek-dso/dso.c \
+	src/hardware/hantek-dso/protocol.h \
+	src/hardware/hantek-dso/protocol.c \
 	src/hardware/hantek-dso/api.c
 endif
 if HW_HP_3457A
@@ -329,6 +365,12 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/hp-3457a/protocol.c \
 	src/hardware/hp-3457a/api.c
 endif
+if HW_HP_3478A
+src_libdrivers_la_SOURCES += \
+	src/hardware/hp-3478a/protocol.h \
+	src/hardware/hp-3478a/protocol.c \
+	src/hardware/hp-3478a/api.c
+endif
 if HW_HUNG_CHANG_DSO_2100
 src_libdrivers_la_SOURCES += \
 	src/hardware/hung-chang-dso-2100/protocol.h \
@@ -347,6 +389,12 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/ikalogic-scanaplus/protocol.c \
 	src/hardware/ikalogic-scanaplus/api.c
 endif
+if HW_IPDBG_LA
+src_libdrivers_la_SOURCES += \
+	src/hardware/ipdbg-la/protocol.h \
+	src/hardware/ipdbg-la/protocol.c \
+	src/hardware/ipdbg-la/api.c
+endif
 if HW_KECHENG_KC_330B
 src_libdrivers_la_SOURCES += \
 	src/hardware/kecheng-kc-330b/protocol.h \
@@ -377,6 +425,12 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/lecroy-logicstudio/protocol.c \
 	src/hardware/lecroy-logicstudio/api.c
 endif
+if HW_LECROY_XSTREAM
+src_libdrivers_la_SOURCES += \
+	src/hardware/lecroy-xstream/protocol.h \
+	src/hardware/lecroy-xstream/protocol.c \
+	src/hardware/lecroy-xstream/api.c
+endif
 if HW_MANSON_HCS_3XXX
 src_libdrivers_la_SOURCES += \
 	src/hardware/manson-hcs-3xxx/protocol.h \
@@ -389,6 +443,12 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/maynuo-m97/protocol.c \
 	src/hardware/maynuo-m97/api.c
 endif
+if HW_MICROCHIP_PICKIT2
+src_libdrivers_la_SOURCES += \
+	src/hardware/microchip-pickit2/protocol.h \
+	src/hardware/microchip-pickit2/protocol.c \
+	src/hardware/microchip-pickit2/api.c
+endif
 if HW_MIC_985XX
 src_libdrivers_la_SOURCES += \
 	src/hardware/mic-985xx/protocol.h \
@@ -425,18 +485,42 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/pipistrello-ols/protocol.c \
 	src/hardware/pipistrello-ols/api.c
 endif
+if HW_RDTECH_DPS
+src_libdrivers_la_SOURCES += \
+	src/hardware/rdtech-dps/protocol.h \
+	src/hardware/rdtech-dps/protocol.c \
+	src/hardware/rdtech-dps/api.c
+endif
 if HW_RIGOL_DS
 src_libdrivers_la_SOURCES += \
 	src/hardware/rigol-ds/protocol.h \
 	src/hardware/rigol-ds/protocol.c \
 	src/hardware/rigol-ds/api.c
 endif
+if HW_ROHDE_SCHWARZ_SME_0X
+src_libdrivers_la_SOURCES += \
+	src/hardware/rohde-schwarz-sme-0x/protocol.h \
+	src/hardware/rohde-schwarz-sme-0x/protocol.c \
+	src/hardware/rohde-schwarz-sme-0x/api.c
+endif
 if HW_SALEAE_LOGIC16
 src_libdrivers_la_SOURCES += \
 	src/hardware/saleae-logic16/protocol.h \
 	src/hardware/saleae-logic16/protocol.c \
 	src/hardware/saleae-logic16/api.c
 endif
+if HW_SALEAE_LOGIC_PRO
+src_libdrivers_la_SOURCES += \
+	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_DMM
+src_libdrivers_la_SOURCES += \
+	src/hardware/scpi-dmm/protocol.h \
+	src/hardware/scpi-dmm/protocol.c \
+	src/hardware/scpi-dmm/api.c
+endif
 if HW_SCPI_PPS
 src_libdrivers_la_SOURCES += \
 	src/hardware/scpi-pps/protocol.h \
@@ -450,6 +534,16 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/serial-dmm/protocol.c \
 	src/hardware/serial-dmm/api.c
 endif
+if HW_SERIAL_LCR
+src_libdrivers_la_SOURCES += \
+	src/hardware/serial-lcr/api.c
+endif
+if HW_SIGLENT_SDS
+src_libdrivers_la_SOURCES += \
+	src/hardware/siglent-sds/protocol.h \
+	src/hardware/siglent-sds/protocol.c \
+	src/hardware/siglent-sds/api.c
+endif
 if HW_SYSCLK_LWLA
 src_libdrivers_la_SOURCES += \
 	src/hardware/sysclk-lwla/lwla.h \
@@ -514,6 +608,12 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/zeroplus-logic-cube/protocol.c \
 	src/hardware/zeroplus-logic-cube/api.c
 endif
+if HW_ZKETECH_EBD_USB
+src_libdrivers_la_SOURCES += \
+	src/hardware/zketech-ebd-usb/protocol.h \
+	src/hardware/zketech-ebd-usb/protocol.c \
+	src/hardware/zketech-ebd-usb/api.c
+endif
 
 libsigrok_la_LIBADD = src/libdrivers.lo $(SR_EXTRA_LIBS) $(LIBSIGROK_LIBS)
 libsigrok_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined
@@ -529,6 +629,15 @@ noinst_HEADERS = src/libsigrok-internal.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrok.pc
 
+mimeappdir = $(datadir)/mime/packages
+mimeapp_DATA = contrib/vnd.sigrok.session.xml
+
+mimeicondir = $(datadir)/icons/hicolor/48x48/mimetypes
+mimeicon_DATA = contrib/libsigrok.png
+
+mimeiconscalabledir = $(datadir)/icons/hicolor/scalable/mimetypes
+mimeiconscalable_DATA = contrib/libsigrok.svg
+
 EXTRA_DIST = \
 	Doxyfile \
 	HACKING \
@@ -553,8 +662,13 @@ EXTRA_DIST = \
 	bindings/swig/classes.i \
 	bindings/swig/doc.py \
 	bindings/swig/templates.i \
-	contrib/sigrok-logo-notext.png \
-	contrib/z60_libsigrok.rules
+	contrib/libsigrok_112x112.png \
+	contrib/libsigrok.png \
+	contrib/libsigrok.svg \
+	contrib/vnd.sigrok.session.xml \
+	contrib/60-libsigrok.rules \
+	contrib/61-libsigrok-plugdev.rules \
+	contrib/61-libsigrok-uaccess.rules
 
 if HAVE_CHECK
 TESTS = tests/main
@@ -586,13 +700,18 @@ INSTALL_EXTRA =
 UNINSTALL_EXTRA =
 CLEAN_EXTRA =
 
+libsigrok-uninstall:
+	-rmdir $(DESTDIR)$(includedir)/libsigrok
+
+UNINSTALL_EXTRA += libsigrok-uninstall
+
 if BINDINGS_CXX
 
 lib_LTLIBRARIES += bindings/cxx/libsigrokcxx.la
 
 bindings_cxx_libsigrokcxx_la_SOURCES = bindings/cxx/classes.cpp
 
-bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(SR_EXTRA_LIBS) $(LIBSIGROKCXX_LIBS)
+bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(SR_EXTRA_LIBS) $(LIBSIGROKCXX_LIBS) $(SR_EXTRA_CXX_LIBS)
 bindings_cxx_libsigrokcxx_la_LDFLAGS = -version-info $(SR_LIB_VERSION) -no-undefined
 
 bindings_cxx_libsigrokcxx_la_includedir = $(includedir)/libsigrokcxx
@@ -628,6 +747,11 @@ cxx-clean:
 
 CLEAN_EXTRA += cxx-clean
 
+cxx-uninstall:
+	-rmdir $(DESTDIR)$(includedir)/libsigrokcxx
+
+UNINSTALL_EXTRA += cxx-uninstall
+
 endif
 
 CPPXMLDOC = bindings/cxx/doxy/xml/index.xml
@@ -645,7 +769,7 @@ PDIR = bindings/python
 PDOC_START = bindings/python/sigrok/core/doc_start.i
 PDOC_END = bindings/python/sigrok/core/doc_end.i
 
-setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' CXXFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' LDADD='$(PYSIGROK_LIBS)'
+setup_vars = VERSION='$(PACKAGE_VERSION)' CC='$(CXX)' CXX='$(CXX)' CFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' CXXFLAGS='$(CXXFLAGS) $(SR_WXXFLAGS) $(PYSIGROK_CFLAGS)' LDADD='$(PYSIGROK_LIBS)'
 setup_quiet = --quiet
 setup_py = $(PYTHON) $(srcdir)/$(PDIR)/setup.py $(setup_vars) $(setup_quiet)
 
@@ -780,9 +904,9 @@ $(JLIB): $(JCXX) \
 		$(bindings_cxx_libsigrokcxx_la_include_HEADERS) \
 		$(nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS) \
 		@ORDER@ bindings/cxx/libsigrokcxx.la
-	$(AM_V_GEN)$(CXXCOMPILE) $(JNI_CPPFLAGS) -L.libs -Lbindings/cxx/.libs \
+	$(AM_V_GEN)$(CXXCOMPILE) $(JNI_CPPFLAGS) $(LDFLAGS) -L.libs -Lbindings/cxx/.libs \
 		-fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
-		-lsigrokcxx $(LIBSIGROKCXX_LIBS) -o $(JLIB)
+		-lsigrokcxx $(LIBSIGROKCXX_LIBS) $(SR_EXTRA_CXX_LIBS) -o $(JLIB)
 
 java-install:
 	$(INSTALL) -d $(DESTDIR)$(libdir)/jni
@@ -810,7 +934,7 @@ endif
 
 all-local: $(BUILD_EXTRA)
 install-exec-local: $(INSTALL_EXTRA)
-uninstall-local: $(UNINSTALL_EXTRA)
+uninstall-hook: $(UNINSTALL_EXTRA)
 clean-local: $(CLEAN_EXTRA)
 
 .PHONY: dist-changelog