Fix an issue when building in directories that are symlinks.

Explicitly use SRCDIR and BUILDDIR in Doxyfile files to reference input
files. This seems to be a sufficient fix for an issue where the build
would fail when libsigrok/ was located in a directory that was a symlink.

This fixes bug #547.

diff --git a/Doxyfile b/Doxyfile
index 51b9c2bdeb22557f1e8b7f3a5702e84cb627cd11..252e504ef929b15ecac231d8a77411d4e8625926 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -743,7 +743,7 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = src include $(BUILDDIR)include/libsigrok
+INPUT                  = $(SRCDIR)src $(SRCDIR)include $(BUILDDIR)include/libsigrok
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

diff --git a/Makefile.am b/Makefile.am
index 9a98c07adf2cdca6cec5d448c220bc4b53d76e0a..69f05263c206cba5e0aee1332d6a5982cf692a23 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -730,7 +730,7 @@ nodist_bindings_cxx_libsigrokcxx_la_include_HEADERS = \
 pkgconfig_DATA += bindings/cxx/libsigrokcxx.pc
 
 doxy/xml/index.xml: include/libsigrok/libsigrok.h
-       $(AM_V_GEN)cd $(srcdir) && BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null
+       $(AM_V_GEN)cd $(srcdir) && SRCDIR=$(abs_srcdir)/ BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null
 
 bindings/swig/enums.i: bindings/cxx/enums.timestamp
 bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp
@@ -765,7 +765,7 @@ CPPXMLDOC = bindings/cxx/doxy/xml/index.xml
 
 $(CPPXMLDOC): bindings/cxx/include/libsigrokcxx/libsigrokcxx.hpp \
                bindings/cxx/enums.timestamp
-       $(AM_V_GEN)cd $(srcdir)/bindings/cxx && BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null
+       $(AM_V_GEN)cd $(srcdir)/bindings/cxx && SRCDIR=$(abs_srcdir)/bindings/cxx/ BUILDDIR=$(abs_builddir)/bindings/cxx/ doxygen Doxyfile 2>/dev/null
 
 # Macro definitions to be used by the SWIG parser.
 swig_defs = -Dnoexcept= -Dprivate=protected -DG_GNUC_BEGIN_IGNORE_DEPRECATIONS= -DG_GNUC_END_IGNORE_DEPRECATIONS=
@@ -813,7 +813,7 @@ python-clean:
        -$(AM_V_at)$(setup_py) clean --all 2>/dev/null
 
 python-doc:
-       $(AM_V_at)cd $(srcdir)/$(PDIR) && BUILDDIR="$(abs_builddir)/$(PDIR)/" doxygen Doxyfile 2>/dev/null
+       $(AM_V_at)cd $(srcdir)/$(PDIR) && SRCDIR="$(abs_srcdir)/$(PDIR)/" BUILDDIR="$(abs_builddir)/$(PDIR)/" doxygen Doxyfile 2>/dev/null
 
 BUILD_EXTRA += python-build
 INSTALL_EXTRA += python-install
@@ -930,7 +930,7 @@ java-clean:
        -$(AM_V_at)rm -fr $(JDIR)/doxy
 
 java-doc:
-       $(AM_V_at)cd $(srcdir)/$(JDIR) && BUILDDIR="$(abs_builddir)/$(JDIR)/" doxygen Doxyfile
+       $(AM_V_at)cd $(srcdir)/$(JDIR) && SRCDIR="$(abs_srcdir)/$(JDIR)/" BUILDDIR="$(abs_builddir)/$(JDIR)/" doxygen Doxyfile
 
 BUILD_EXTRA += java-build
 INSTALL_EXTRA += java-install

diff --git a/bindings/cxx/Doxyfile b/bindings/cxx/Doxyfile
index 7d35ae9b2f23d2213c423b8a253f598cabc747ee..de1db0cf5e86710a933fd8a67d2cd5361ed62de1 100644 (file)
--- a/bindings/cxx/Doxyfile
+++ b/bindings/cxx/Doxyfile
@@ -743,7 +743,7 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = include/libsigrokcxx/libsigrokcxx.hpp \
+INPUT                  = $(SRCDIR)include/libsigrokcxx/libsigrokcxx.hpp \
                          $(BUILDDIR)include/libsigrokcxx/enums.hpp
 
 # This tag can be used to specify the character encoding of the source files

diff --git a/bindings/java/Doxyfile b/bindings/java/Doxyfile
index fd2313bd8de4e7ae98f582303c003a32181897fc..6d445eb23ea98a47ea0e127dd538895b58ae2d2e 100644 (file)
--- a/bindings/java/Doxyfile
+++ b/bindings/java/Doxyfile
@@ -743,7 +743,7 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = org/sigrok/core $(BUILDDIR)org/sigrok/core
+INPUT                  = $(SRCDIR)org/sigrok/core $(BUILDDIR)org/sigrok/core
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses