[grilomm] Use $(MMDOCTOOLDIR) instead of @MMDOCTOOLDIR@ in Doxyfile.in.
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilomm] Use $(MMDOCTOOLDIR) instead of @MMDOCTOOLDIR@ in Doxyfile.in.
- Date: Wed, 3 Oct 2012 15:16:31 +0000 (UTC)
commit cf4d04901cea88ad3ae816a435ad41e2db5be0ae
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Wed Oct 3 16:49:03 2012 +0200
Use $(MMDOCTOOLDIR) instead of @MMDOCTOOLDIR@ in Doxyfile.in.
* configure.ac: Add MM_CONFIG_DOCTOOL_DIR([doc]).
* doc/reference/Doxyfile.in: Replace @MMDOCTOOLDIR@ by $(MMDOCTOOLDIR).
* .gitignore: Add some files in doc/.
Bug #673984.
.gitignore | 6 ++++++
configure.ac | 4 ++++
doc/reference/Doxyfile.in | 2 +-
3 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e5ab21e..a7ee5bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,5 +23,11 @@ stamp-h?
# codegen/
/codegen/extradefs/generate_extra_defs
+# doc
+/doc/doc-install.pl
+/doc/doc-postprocess.pl
+/doc/doxygen.css
+/doc/tagfile-to-devhelp2.xsl
+
# grilo/ has its own .gitignore
diff --git a/configure.ac b/configure.ac
index 75c2e08..a697819 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,10 @@ AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
MM_PREREQ([0.9])
MM_INIT_MODULE([grilomm-1.0])
+# Copy the mm-common .pl scripts into doc/, and use them from there,
+# so we can dist them to avoid a tarball-build dependency.
+MM_CONFIG_DOCTOOL_DIR([doc])
+
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
AC_SUBST([GRILOMM_SO_VERSION], [0:0:0])
diff --git a/doc/reference/Doxyfile.in b/doc/reference/Doxyfile.in
index 8424bcd..fd04374 100644
--- a/doc/reference/Doxyfile.in
+++ b/doc/reference/Doxyfile.in
@@ -142,7 +142,7 @@ HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html
HTML_HEADER =
HTML_FOOTER =
-HTML_STYLESHEET = "@MMDOCTOOLDIR@/doxygen.css"
+HTML_STYLESHEET = "$(MMDOCTOOLDIR)/doxygen.css"
HTML_ALIGN_MEMBERS = YES
HTML_DYNAMIC_SECTIONS = NO
GENERATE_DOCSET = NO
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]