X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=Makefile.am;h=731726355ad4b63bcd04e494d4eac4190f39e532;hp=b2cc799886096f2fafc596ff22802fd479ba5784;hb=8256ed15c605db4f472f928dc67e9734947e0ab9;hpb=f9c6b5cfd3c0f6cb737f6a68f69034ce6819f36d

diff --git a/Makefile.am b/Makefile.am
index b2cc7998..73172635 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -148,6 +148,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 \
@@ -179,9 +180,9 @@ 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 += \
@@ -267,16 +268,14 @@ src_libdrivers_la_SOURCES += \
 endif
 if HW_DEMO
 src_libdrivers_la_SOURCES += \
-	src/hardware/demo/demo.c
-endif
-if HW_DEREE_DE5000
-src_libdrivers_la_SOURCES += \
-	src/hardware/deree-de5000/api.c
+	src/hardware/demo/protocol.h \
+	src/hardware/demo/protocol.c \
+	src/hardware/demo/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
@@ -319,8 +318,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 +376,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,6 +436,12 @@ 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 \
@@ -450,6 +461,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 \
@@ -553,11 +568,6 @@ 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/z60_libsigrok.rules
 
@@ -597,7 +607,7 @@ 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
@@ -650,7 +660,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 +795,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