Build: Set local include directories in Makefile.am

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 16007a8001a270820e34271782d43841887b625a..c0a228656e2f2a1c190ea2808e64d7465c125163 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,10 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-AM_CPPFLAGS = -I$(srcdir)/src -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src
+local_includes += -Ibindings/cxx/include -I${srcdir}/bindings/cxx/include -Ibindings/cxx
+
+AM_CPPFLAGS = $(local_includes) -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -106,6 +109,14 @@ libsigrok_la_SOURCES += \
        src/scpi/scpi_libgpib.c
 endif
 
+# 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 += \
        src/dmm/es519xx.c \
@@ -115,7 +126,9 @@ libsigrok_la_SOURCES += \
        src/dmm/metex14.c \
        src/dmm/rs9lcd.c \
        src/dmm/bm25x.c \
-       src/dmm/ut71x.c
+       src/dmm/ut71x.c \
+       src/dmm/ut372.c \
+       src/dmm/vc870.c
 
 # Hardware (LCR chip parsers)
 if NEED_SERIAL
@@ -223,7 +236,9 @@ if HW_FX2LAFW
 libsigrok_la_SOURCES += \
        src/hardware/fx2lafw/protocol.h \
        src/hardware/fx2lafw/protocol.c \
-       src/hardware/fx2lafw/api.c
+       src/hardware/fx2lafw/api.c \
+       src/hardware/fx2lafw/dslogic.c \
+       src/hardware/fx2lafw/dslogic.h
 endif
 if HW_GMC_MH_1X_2X
 libsigrok_la_SOURCES += \
@@ -273,6 +288,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 \
@@ -395,6 +416,8 @@ libsigrok_la_LIBADD = $(LIBOBJS)
 
 libsigrok_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
+libsigrok_la_LDFLAGS += -no-undefined
+
 library_includedir = $(includedir)/libsigrok
 library_include_HEADERS = \
        include/libsigrok/libsigrok.h \
@@ -460,6 +483,8 @@ bindings_cxx_libsigrokcxx_la_LIBADD = libsigrok.la $(glibmm_LIBS)
 
 bindings_cxx_libsigrokcxx_la_LDFLAGS = $(SR_LIB_LDFLAGS)
 
+bindings_cxx_libsigrokcxx_la_LDFLAGS += -no-undefined
+
 bindings_cxx_libsigrokcxx_la_includedir = $(includedir)/libsigrokcxx
 bindings_cxx_libsigrokcxx_la_include_HEADERS = \
        bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \
@@ -563,7 +588,7 @@ $(JDOC): bindings/swig/doc.py $(CPPXMLDOC)
 $(JCXX): $(JSWG) $(JDOC) bindings/swig/classes.i $(library_include_HEADERS)
        $(AM_V_at)make java-clean
        $(AM_V_GEN)swig -c++ -java -package org.sigrok.core.classes \
-               -I$(srcdir)/include -I$(srcdir)/bindings/cxx/include -I$(srcdir) -I$(JCLS) -Ibindings/cxx/include -outdir $(JCLS) -o $@ $<
+               $(local_includes) -I$(JCLS) -I. -I$(srcdir) -outdir $(JCLS) -o $@ $<
 
 $(JJAR): $(JCXX)
        $(AM_V_GEN)$(JAVAC) -sourcepath $(JDIR) -d $(JDIR) $(JSRC)
@@ -575,10 +600,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)