Drop trailing whitespace in various files.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cd8a49d3a810f60d910a96ad8e257a7ad2e0d5b0..5501968fa42bfc28d2e848fcc079fd50a0705880 100644 (file)
--- 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 \
@@ -586,13 +601,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 +648,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 +670,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 +805,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 +835,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