]> sigrok.org Git - libsigrok.git/blobdiff - Makefile.am
projects / libsigrok.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
SCPI: Ignore IDN header in *IDN? response
[libsigrok.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index b2cc799886096f2fafc596ff22802fd479ba5784..cedd8250512f1bd27b3e3c726e64116275cc6226 100644 (file)
--- 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 \
@@ -148,6 +149,7 @@ libsigrok_la_SOURCES += \
        src/dmm/fs9922.c \
        src/dmm/m2110.c \
        src/dmm/metex14.c \
+       src/dmm/asycii.c \
        src/dmm/rs9lcd.c \
        src/dmm/bm25x.c \
        src/dmm/ut71x.c \
@@ -166,22 +168,29 @@ 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
 src_libdrivers_la_SOURCES += \
-       src/hardware/agilent-dmm/api.c \
-       src/hardware/agilent-dmm/agilent-dmm.h \
-       src/hardware/agilent-dmm/sched.c
+       src/hardware/agilent-dmm/protocol.h \
+       src/hardware/agilent-dmm/protocol.c \
+       src/hardware/agilent-dmm/api.c
 endif
 if HW_APPA_55II
 src_libdrivers_la_SOURCES += \
@@ -220,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 += \
@@ -267,16 +278,20 @@ 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_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 +304,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 += \
@@ -319,8 +332,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
@@ -377,6 +390,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 \
@@ -431,12 +450,24 @@ src_libdrivers_la_SOURCES += \
        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_PPS
 src_libdrivers_la_SOURCES += \
        src/hardware/scpi-pps/protocol.h \
@@ -450,6 +481,10 @@ 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_SYSCLK_LWLA
 src_libdrivers_la_SOURCES += \
        src/hardware/sysclk-lwla/lwla.h \
@@ -529,6 +564,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,12 +597,10 @@ EXTRA_DIST = \
        bindings/swig/classes.i \
        bindings/swig/doc.py \
        bindings/swig/templates.i \
-       contrib/gnuplot_chronovu_la8.gpi \
-       contrib/gnuplot_rigol_ds1xx2.gpi \
-       contrib/gnuplot_usbeesx.gpi \
-       contrib/gnuplot_usbeedx8.gpi \
-       contrib/gnuplot_usbeedx16.gpi \
-       contrib/sigrok-logo-notext.png \
+       contrib/libsigrok_112x112.png \
+       contrib/libsigrok.png \
+       contrib/libsigrok.svg \
+       contrib/vnd.sigrok.session.xml \
        contrib/z60_libsigrok.rules
 
 if HAVE_CHECK
@@ -591,13 +633,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
@@ -633,6 +680,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
@@ -650,7 +702,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)
 
@@ -785,9 +837,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
@@ -815,7 +867,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
Hardware access and backend lib