[glibmm] Avoid a tarball dependency on mm-common.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Avoid a tarball dependency on mm-common.
- Date: Thu, 24 Mar 2011 08:14:11 +0000 (UTC)
commit bc28ff1457c15eaebc8b1c7b1a078ac66d94b420
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Mar 24 09:14:02 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 | 9 ++++++++-
3 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5745d73..233256f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-24 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.27.98:
2011-03-23 Murray Cumming <murrayc murrayc com>
diff --git a/configure.ac b/configure.ac
index 99789f8..d035705 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,11 @@ MM_PREREQ([0.9.3])
MM_INIT_MODULE([glibmm-2.4])
MM_INIT_MODULE([giomm-2.4])
+# 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([LIBGLIBMM_SO_VERSION], [4:0:3])
diff --git a/docs/Makefile.am b/docs/Makefile.am
index c6daf4d..3bcea89 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -33,7 +33,14 @@ dist_docimages_DATA = images/gtkmm_logo.gif images/top.gif
include $(top_srcdir)/build/doc-reference.am
-dist_noinst_DATA += \
+# These are copied here by mm-common:
+dist_noinst_DATA += \
+ doc-install.pl \
+ doc-postprocess.pl \
+ tagfile-to-devhelp2.xsl \
+ doxygen.css
+
+dist_noinst_DATA += \
internal/documentation_generation.txt \
internal/gmmproc_internals.txt \
internal/using_gmmproc.txt \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]