From e9ad69b4c8f2436737e4d46e71e0ba3c1e2f3f19 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Fri, 19 Jul 2013 17:10:02 +0200
Subject: fixed Doxyfile & build docs directly in doc/

---
 .gitignore      | 2 +-
 doc/Doxyfile.in | 5 ++---
 doc/Makefile.am | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index d0fae48..57511ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,4 @@ stamp-*
 # Generated
 cclosure-marshallers.[ch]
 /doc/Doxyfile
-/doc/doxygen
+/doc/html
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 367fab9..01b013b 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -38,7 +38,7 @@ PROJECT_NUMBER         = @PACKAGE_VERSION@
 # 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       = doxygen
+OUTPUT_DIRECTORY       =
 
 # 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
@@ -574,8 +574,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @top_srcdir@/lib \
-			 @top_srcdir@/src
+INPUT                  = "@top_srcdir@/src"
 
 # 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
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 05d48c0..2ec8095 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,12 +2,12 @@
 # Doxygen processing
 #
 if BUILD_DOXYGEN
-doc_DATA = doxygen/
+html_DATA = html/
 endif
 
-.PHONY: doxygen/
-doxygen/ : Doxyfile
+.PHONY: html/
+html/ : Doxyfile
 	@DOXYGEN@ $<
 
 clean-local:
-	-rm -rf doxygen/
+	-rm -rf html/
-- 
cgit v1.2.3