X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=8114f660dc921b5ac5f6d58916482b1b15017519;hb=503220ec8d00a8a351a2c1bc659d42132a40f64a;hp=82a3eb7ccd752bc4eec4919e0acbe9780db1a124;hpb=104f02fda1f991654de3e87fb9f40c599fa26c80;p=libsigrok.git

diff --git a/Makefile.am b/Makefile.am
index 82a3eb7c..8114f660 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 \
@@ -271,10 +272,6 @@ src_libdrivers_la_SOURCES += \
 	src/hardware/demo/protocol.c \
 	src/hardware/demo/api.c
 endif
-if HW_DEREE_DE5000
-src_libdrivers_la_SOURCES += \
-	src/hardware/deree-de5000/api.c
-endif
 if HW_FLUKE_DMM
 src_libdrivers_la_SOURCES += \
 	src/hardware/fluke-dmm/protocol.h \
@@ -452,6 +449,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 \
@@ -594,7 +595,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
@@ -782,9 +783,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