Makefile.am: Fix doxygen invocation in out-of-tree build

[libsigrok.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7c0ae45ed39370fa5cec8b770af41c86ab0f004c..aa162adcb03db8dfffd67a87fdc56442966d2c38 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I autostuff
 
-AM_CPPFLAGS = -Isrc -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+AM_CPPFLAGS = -I$(srcdir)/src -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
 
 lib_LTLIBRARIES = libsigrok.la
 
@@ -378,6 +378,7 @@ tests_check_main_SOURCES = \
        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
@@ -409,7 +410,7 @@ library_include_HEADERS += \
 pkgconfig_DATA += bindings/cxx/libsigrokxx.pc
 
 doxy/xml/index.xml: include/libsigrok/libsigrok.h
-       $(AM_V_GEN)doxygen Doxyfile
+       $(AM_V_GEN)cd $(srcdir) && BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null
 
 bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp
 
@@ -438,7 +439,7 @@ CPPXMLDOC = bindings/cxx/doxy/xml/index.xml
 
 $(CPPXMLDOC): bindings/cxx/include/libsigrok/libsigrok.hpp \
                bindings/cxx/enums.timestamp
-       $(AM_V_GEN)cd bindings/cxx && doxygen Doxyfile
+       $(AM_V_GEN)cd bindings/cxx && doxygen Doxyfile 2>/dev/null
 
 if BINDINGS_PYTHON
 
@@ -470,7 +471,7 @@ python-clean:
        $(AM_V_at)rm -rf $(PDIR)/doxy/
 
 python-doc:
-       $(AM_V_at)cd $(PDIR) && doxygen Doxyfile
+       $(AM_V_at)cd $(PDIR) && doxygen Doxyfile 2>/dev/null
 
 BUILD_EXTRA += python-build
 INSTALL_EXTRA += python-install
@@ -525,7 +526,7 @@ java-clean:
        rm -rf $(JDIR)/doxy/
 
 java-doc:
-       $(AM_v_at)cd $(JDIR) && doxygen Doxyfile
+       $(AM_v_at)cd $(JDIR) && doxygen Doxyfile 2>/dev/null
 
 BUILD_EXTRA += java-build
 INSTALL_EXTRA += java-install