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

diff --git a/Doxyfile b/Doxyfile
index e254e10592b4906d3a845c59bc04caca351462d0..a1e69b983b65285beab27d856df5b512a5ecb439 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -58,7 +58,7 @@ PROJECT_LOGO           = contrib/sigrok-logo-notext.png
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 

-OUTPUT_DIRECTORY       = doxy
+OUTPUT_DIRECTORY       = $(BUILDDIR)doxy

 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and


@@ -144,7 +144,7 @@ FULL_PATH_NAMES        = YES
 # will be relative from the directory where doxygen is started.
 # This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
 # will be relative from the directory where doxygen is started.
 # This tag requires that the tag FULL_PATH_NAMES is set to YES.
 

-STRIP_FROM_PATH        =
+STRIP_FROM_PATH        = . $(BUILDDIR)

 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
 # path mentioned in the documentation of a class, which tells the reader which
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
 # path mentioned in the documentation of a class, which tells the reader which


@@ -743,7 +743,7 @@ WARN_LOGFILE           =
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 

-INPUT                  = .
+INPUT                  = src 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
 
 # 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 915f0a9c283786ce5e5a698063ff833737d8e341..aa162adcb03db8dfffd67a87fdc56442966d2c38 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -410,7 +410,7 @@ library_include_HEADERS += \
 pkgconfig_DATA += bindings/cxx/libsigrokxx.pc
 
 doxy/xml/index.xml: include/libsigrok/libsigrok.h
 pkgconfig_DATA += bindings/cxx/libsigrokxx.pc
 
 doxy/xml/index.xml: include/libsigrok/libsigrok.h

-       $(AM_V_GEN)doxygen Doxyfile 2>/dev/null
+       $(AM_V_GEN)cd $(srcdir) && BUILDDIR=$(abs_builddir)/ doxygen Doxyfile 2>/dev/null

 
 bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp
 
 
 bindings/cxx/enums.cpp: bindings/cxx/enums.timestamp