Append "-git" to the version string.

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3383972213fd43801404e89b8f636829bf4cd235..3e2388982bd03ab9e70d3529040dbf92ad975161 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,9 +106,13 @@ libsigrok_la_SOURCES += \
        src/scpi/scpi_libgpib.c
 endif
 
-# modbus support
+# Modbus support
 libsigrok_la_SOURCES += \
        src/modbus/modbus.c
+if NEED_SERIAL
+libsigrok_la_SOURCES += \
+       src/modbus/modbus_serial_rtu.c
+endif
 
 # Hardware (DMM chip parsers)
 libsigrok_la_SOURCES += \
@@ -281,6 +285,12 @@ libsigrok_la_SOURCES += \
        src/hardware/manson-hcs-3xxx/protocol.c \
        src/hardware/manson-hcs-3xxx/api.c
 endif
+if HW_MAYNUO_M97
+libsigrok_la_SOURCES += \
+       src/hardware/maynuo-m97/protocol.h \
+       src/hardware/maynuo-m97/protocol.c \
+       src/hardware/maynuo-m97/api.c
+endif
 if HW_MIC_985XX
 libsigrok_la_SOURCES += \
        src/hardware/mic-985xx/protocol.h \
@@ -587,10 +597,10 @@ $(JLIB): $(JCXX) bindings/cxx/libsigrokcxx.la $(library_include_HEADERS)
                -lsigrokcxx -o $(JLIB)
 
 java-install:
-       $(INSTALL) -d $(libdir)/jni
-       $(INSTALL) $(JLIB) -t $(libdir)/jni
-       $(INSTALL) -d $(datadir)/java
-       $(INSTALL) $(JJAR) -t $(datadir)/java
+       $(INSTALL) -d $(DESTDIR)$(libdir)/jni
+       $(INSTALL) $(JLIB) -t $(DESTDIR)$(libdir)/jni
+       $(INSTALL) -d $(DESTDIR)$(datadir)/java
+       $(INSTALL) $(JJAR) -t $(DESTDIR)$(datadir)/java
 
 java-clean:
        $(AM_V_at)rm -f $(JCXX)