[gtkmm] Avoid a tarball dependency on mm-common.



commit faff1fa3b20c15a40de19b912dd261d27135b88c
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Mar 25 14:01:12 2011 +0100

    Avoid a tarball dependency on mm-common.
    
    * configure.ac: Add a call to MM_CONFIG_DOCTOOL_DIR() telling it to
    copy the files locally and use them from there.
    * docs/Makefile.am: Dist the copied files, so that the build does not
    try to use the versions installed by mm-common.

 ChangeLog        |    9 +++++++++
 configure.ac     |    5 +++++
 docs/Makefile.am |    7 +++++++
 3 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 81e4126..9b10e0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-25  Murray Cumming  <murrayc murrayc com>
+
+	Avoid a tarball dependency on mm-common.
+
+	* configure.ac: Add a call to MM_CONFIG_DOCTOOL_DIR() telling it to
+	copy the files locally and use them from there.
+	* docs/Makefile.am: Dist the copied files, so that the build does not
+	try to use the versions installed by mm-common.
+
 2.99.7:
 
 2011-03-23  Murray Cumming  <murrayc murrayc com>
diff --git a/configure.ac b/configure.ac
index 8399dba..7b95053 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,11 @@ MM_PREREQ([0.9.3])
 MM_INIT_MODULE([gdkmm-3.0])
 MM_INIT_MODULE([gtkmm-3.0])
 
+# Copy the mm-common .pl scripts into docs/,
+# and use them from there,
+# so we can dist them to avoid a tarball-build dependency.
+MM_CONFIG_DOCTOOL_DIR([docs])
+
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 AC_SUBST([LIBGTKMM_SO_VERSION], [2:0:1])
 
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 93ca5df..7c343e3 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -37,3 +37,10 @@ dist_noinst_DATA +=				\
 	reference/widget_hierarchy.dia		\
 	reference/widget_hierarchy.html		\
 	reference/widget_hierarchy.png
+
+# These are copied here by mm-common:
+dist_noinst_DATA += \
+	doc-install.pl \
+	doc-postprocess.pl \
+	tagfile-to-devhelp2.xsl \
+	doxygen.css



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]