Committer: Diego Biurrun <diego@xxxxxxxxxx> Date: 01/04/2010 at 16:51:12 Revision: 4121 Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: trunk Log: Build Doxygen documentation directly from the root of the source tree. Modified: M Makefile.am M doc/Doxyfile === modified file 'Makefile.am' --- Makefile.am 2010-03-30 17:59:14 +0000 +++ Makefile.am 2010-04-01 13:50:12 +0000 @@ -622,7 +622,7 @@ endif # HAVE_PYTHON doxygen: - cd @top_srcdir@/doc && doxygen + doxygen doc/Doxyfile # The olddeb target is for maemo builds only bin deb increl olddeb rpm syncrepo: === modified file 'doc/Doxyfile' --- doc/Doxyfile 2010-03-31 17:15:13 +0000 +++ doc/Doxyfile 2010-04-01 13:50:12 +0000 @@ -38,7 +38,7 @@ # If a relative path is 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 = doc/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 @@ -123,7 +123,7 @@ # If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = ../ +STRIP_FROM_PATH = # 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 @@ -487,21 +487,20 @@ # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = ../agent \ - ../firewall \ - ../hipd \ - ../test \ - ../tools \ - ../doc \ - ../lib/conf \ - ../lib/core \ - ../lib/dht \ - ../lib/gui \ - ../lib/ipsec \ - ../lib/opphip \ - ../lib/performance \ - ../lib/tool - +INPUT = agent \ + doc \ + firewall \ + hipd \ + test \ + tools \ + lib/conf \ + lib/core \ + lib/dht \ + lib/gui \ + lib/ipsec \ + lib/opphip \ + lib/performance \ + lib/tool \ # This tag can be used to specify the character encoding of the source files that # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default