]> sigrok.org Git - libsigrok.git/blobdiff - Makefile.am
projects / libsigrok.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Build: Set local include directories in Makefile.am
[libsigrok.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index cfa07d57937f657fd2a2afc57f2e0de3deb9b884..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
 
@@ -68,6 +71,13 @@ libsigrok_la_SOURCES += \
        src/output/srzip.c \
        src/output/vcd.c
 
+# Transform modules
+libsigrok_la_SOURCES += \
+       src/transform/transform.c \
+       src/transform/nop.c \
+       src/transform/scale.c \
+       src/transform/invert.c
+
 # SCPI support
 libsigrok_la_SOURCES += \
        src/scpi/scpi.c \
@@ -99,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 \
@@ -108,11 +126,15 @@ 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
 libsigrok_la_SOURCES += \
        src/lcr/es51919.c
+endif
 
 # Hardware drivers
 if HW_AGILENT_DMM
@@ -138,6 +160,14 @@ libsigrok_la_SOURCES += \
        src/hardware/atten-pps3xxx/protocol.c \
        src/hardware/atten-pps3xxx/api.c
 endif
+if HW_BAYLIBRE_ACME
+libsigrok_la_SOURCES += \
+       src/hardware/baylibre-acme/protocol.h \
+       src/hardware/baylibre-acme/protocol.c \
+       src/hardware/baylibre-acme/api.c \
+       src/hardware/baylibre-acme/gpio.h \
+       src/hardware/baylibre-acme/gpio.c
+endif
 if HW_BEAGLELOGIC
 libsigrok_la_SOURCES += \
        src/hardware/beaglelogic/beaglelogic.h \
@@ -206,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 += \
@@ -256,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 \
@@ -378,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 \
@@ -402,29 +442,30 @@ EXTRA_DIST = \
 
 if HAVE_CHECK
 
-TESTS = tests/check_main
+TESTS = tests/main
 
 check_PROGRAMS = ${TESTS}
 
-tests_check_main_SOURCES = \
+tests_main_SOURCES = \
        include/libsigrok/libsigrok.h \
        tests/lib.c \
        tests/lib.h \
-       tests/check_main.c \
-       tests/check_core.c \
-       tests/check_input_all.c \
-       tests/check_input_binary.c \
-       tests/check_output_all.c \
-       tests/check_session.c \
-       tests/check_strutil.c \
-       tests/check_version.c \
-       tests/check_driver_all.c \
-       tests/check_device.c \
-       tests/check_trigger.c
+       tests/main.c \
+       tests/core.c \
+       tests/input_all.c \
+       tests/input_binary.c \
+       tests/output_all.c \
+       tests/transform_all.c \
+       tests/session.c \
+       tests/strutil.c \
+       tests/version.c \
+       tests/driver_all.c \
+       tests/device.c \
+       tests/trigger.c
 
-tests_check_main_CFLAGS = @check_CFLAGS@
+tests_main_CFLAGS = @check_CFLAGS@
 
-tests_check_main_LDADD = $(top_builddir)/libsigrok.la @check_LIBS@
+tests_main_LDADD = $(top_builddir)/libsigrok.la @check_LIBS@
 
 endif
 
@@ -442,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 \
@@ -456,9 +499,9 @@ bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp
 
 bindings/cxx/include/libsigrokcxx/enums.hpp: bindings/cxx/enums.timestamp
 
-bindings/cxx/enums.timestamp: bindings/cxx/enums.py doxy/xml/index.xml \
+bindings/cxx/enums.timestamp: $(srcdir)/bindings/cxx/enums.py doxy/xml/index.xml \
                bindings/cxx/ConfigKey_methods.cpp bindings/cxx/QuantityFlag_methods.cpp
-       $(AM_V_GEN)$(PYTHON) $< doxy/xml/index.xml
+       $(AM_V_GEN)$(PYTHON) $(srcdir)/bindings/cxx/enums.py doxy/xml/index.xml
        $(AM_V_at)touch $@
 
 bindings/cxx/classes.lo: bindings/cxx/classes.cpp bindings/cxx/enums.cpp \
@@ -545,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)
@@ -557,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)
Hardware access and backend lib