summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Elstner <danielk@openismus.com>2009-08-28 11:50:36 +0200
committerDaniel Elstner <danielk@openismus.com>2009-08-28 11:50:36 +0200
commit0d07f9249a5276ad3c4ad82d0b2d909e15eda6d9 (patch)
tree6e9b8d3800a9d130be7d6a1f0656b983b2c79c42
parent4ee564ec5df646f17330f4b057dc406a665a062d (diff)
downloadglibmm-0d07f9249a5276ad3c4ad82d0b2d909e15eda6d9.tar.gz
Use shared mm-common Doxygen style sheet
* configure.ac (MM_PREREQ): Require mm-common 0.7. * docs/Makefile.am (dist_doctool_DATA): List doxygen.css. * docs/reference/Doxyfile.in (HTML_STYLESHEET): Assign path to the shared doxygen.css provided by mm-common.
-rw-r--r--ChangeLog9
-rw-r--r--configure.ac2
-rw-r--r--docs/Makefile.am2
-rw-r--r--docs/reference/Doxyfile.in2
4 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ed184ac3..2ff0b7ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2009-08-28 Daniel Elstner <danielk@openismus.com>
+ Use shared mm-common Doxygen style sheet
+
+ * configure.ac (MM_PREREQ): Require mm-common 0.7.
+ * docs/Makefile.am (dist_doctool_DATA): List doxygen.css.
+ * docs/reference/Doxyfile.in (HTML_STYLESHEET): Assign path
+ to the shared doxygen.css provided by mm-common.
+
+2009-08-28 Daniel Elstner <danielk@openismus.com>
+
Remove header and footer HTML fragments
* docs/reference/glibmm_{header,footer}.html_fragment: Delete
diff --git a/configure.ac b/configure.ac
index f709f5a5..25fec772 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 no-define nostdinc tar-pax])
AM_MAINTAINER_MODE
AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
-MM_PREREQ([0.6.1])
+MM_PREREQ([0.7])
MM_INIT_MODULE([glibmm-2.4])
MM_INIT_MODULE([giomm-2.4])
MM_CONFIG_DOCTOOL_DIR([docs])
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f0a00a7f..010f501e 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -28,7 +28,7 @@ doc_input = $(addprefix $(top_srcdir)/glib/glibmm/,$(glibmm_files_h)) \
$(addprefix $(top_srcdir)/gio/giomm/,$(giomm_files_h))
doctooldir = $(datadir)/$(GLIBMM_MODULE_NAME)/doctool
-dist_doctool_DATA = doc-install.pl doc-postprocess.pl tagfile-to-devhelp2.xsl
+dist_doctool_DATA = doc-install.pl doc-postprocess.pl doxygen.css tagfile-to-devhelp2.xsl
docimagesdir = $(libdocdir)/images
dist_docimages_DATA = images/gtkmm_logo.gif images/top.gif
diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in
index 74e84ee9..28da714d 100644
--- a/docs/reference/Doxyfile.in
+++ b/docs/reference/Doxyfile.in
@@ -148,7 +148,7 @@ HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html
HTML_HEADER =
HTML_FOOTER =
-HTML_STYLESHEET =
+HTML_STYLESHEET = "@abs_top_srcdir@/docs/doxygen.css"
HTML_ALIGN_MEMBERS = YES
HTML_DYNAMIC_SECTIONS = NO
GENERATE_DOCSET = NO