[glib] Makefile.am: move gtk-doc.make back to EXTRA_DIST
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Makefile.am: move gtk-doc.make back to EXTRA_DIST
- Date: Sat, 22 Jun 2013 13:29:10 +0000 (UTC)
commit 15477ebd4216a6d71556eb381974b0dd93019dda
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Jun 5 18:46:29 2013 -0400
Makefile.am: move gtk-doc.make back to EXTRA_DIST
0192c599377c35cc465eed1ae61de56d5a1034e8 moved this file from EXTRA_DIST TO
BUILT_EXTRA_DIST for an unknown reason.
Having it here causes the timestamp to be updated during 'make dist' to
something newer than docs/reference/*/Makefile.in. This is a problem
because those Makefile.in are generated by including gtk-doc.make, so
automake becomes convinced that they need to be regenerated. This is a
problem for people who don't have automake installed, or have the wrong
version.
The timestamp problem has been around for quite a while, but it only
became a problem recently after automake changed policy about this in
commit a22717dffe37f30ef2ad2c355b68c9b3b5e4b8c7.
Specifically:
https://bugzilla.gnome.org/show_bug.cgi?id=700350
Makefile.am | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 807bc60..a156f85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,9 @@ EXTRA_DIST += \
gio-2.0.pc.in \
gio-unix-2.0.pc.in \
gio-windows-2.0.pc.in \
- check-abis.sh
+ check-abis.sh \
+ gtk-doc.make \
+ $(NULL)
# These may be in the builddir too
@@ -67,7 +69,7 @@ BUILT_EXTRA_DIST += \
INSTALL \
ChangeLog \
config.h.win32 \
- gtk-doc.make
+ $(NULL)
CONFIGURE_DEPENDENCIES = acglib.m4
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]