[poppler] 2 commits - glib/reference Makefile.am

[Carlos Garcia Campos]

 Makefile.am                |   22 +++++++++++++++++++---
 glib/reference/Makefile.am |    2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 31ac578942b82cbd16b064abca586ccb89dfa7ce
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Thu Jul 15 15:05:10 2010 +0200

    Rework ChangeLog generation to fix make distcheck

diff --git a/Makefile.am b/Makefile.am
index b9b9188..55bdaa6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,7 +106,23 @@ EXTRA_DIST +=							\
 
 
 
-dist-hook: ChangeLog
+distclean-local:
+	if test "$(srcdir)" = "."; then :; else \
+		rm -f ChangeLog; \
+	fi
+
+ChangeLog:
+	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
+	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $@.tmp \
+	  && mv -f $@.tmp $@ \
+	  || ($(RM) $@.tmp; \
+	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	      (test -f $@ || echo git log is required to generate this file >> $@)); \
+	else \
+	  test -f $@ || \
+	  (echo A git checkout and git log is required to generate ChangeLog >&2 && \
+	  echo A git checkout and git log is required to generate this file >> $@); \
+	fi
+
+.PHONY: ChangeLog
 
-ChangeLog : .git/HEAD
-	$(AM_V_GEN) git log --stat > ChangeLog
commit 5da5825ecab63089a19aac694826271019a94e6d
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Thu Jul 15 15:03:20 2010 +0200

    [glib] docs: Add version.xml to content_files var

diff --git a/glib/reference/Makefile.am b/glib/reference/Makefile.am
index 273336d..61955c7 100644
--- a/glib/reference/Makefile.am
+++ b/glib/reference/Makefile.am
@@ -55,7 +55,7 @@ HTML_IMAGES=
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=
+content_files=version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files