summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathon Jongsma <jjongsma@gnome.org>2006-04-05 01:53:42 +0000
committerJonathon Jongsma <jjongsma@gnome.org>2006-04-05 01:53:42 +0000
commit700147ae14cdf683bfedf12a19317215343d762e (patch)
treeff2ecd0e84967bba68108ea42c6fa8770cbfe801
parent98eb76dfeef2a0342d4ded84a99474caa29b71c1 (diff)
2006-04-04 Jonathon Jongsma <jonathon.jongsma@gmail.com>RELEASE_0_6_0
* docs/reference/Doxyfile.in: * docs/reference/Makefile.am: A couple minor build fixes to make distcheck happy
-rw-r--r--ChangeLog6
-rw-r--r--docs/reference/Doxyfile.in2
-rw-r--r--docs/reference/Makefile.am2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ade3a0c..26598ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-04-04 Jonathon Jongsma <jonathon.jongsma@gmail.com>
+ * docs/reference/Doxyfile.in:
+ * docs/reference/Makefile.am: A couple minor build fixes to make distcheck
+ happy
+
+2006-04-04 Jonathon Jongsma <jonathon.jongsma@gmail.com>
+
* NEWS: add news for 0.6.0 release
* configure.in: bump version to 0.6.0
diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in
index 5f71e5a..1d74bd0 100644
--- a/docs/reference/Doxyfile.in
+++ b/docs/reference/Doxyfile.in
@@ -71,7 +71,7 @@ WARN_LOGFILE = undocumented.txt
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = @top_srcdir@/cairomm introduction.h
+INPUT = @top_srcdir@/cairomm @srcdir@/introduction.h
FILE_PATTERNS = *.h
RECURSIVE = NO
EXCLUDE = @top_srcdir@/cairomm/private.h
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index b1b605f..0c356c5 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -11,7 +11,7 @@ index_html = html/index.html
$(index_html): $(DOXYGEN_CONFIGFILE)
-rm -rf html
- doxygen $(doxygen_configfile) \
+ doxygen $(DOXYGEN_CONFIGFILE) \
2> doxygen-warnings.txt | tee doxygen-output.txt && cat doxygen-warnings.txt
html: $(index_html)