[HarfBuzz] harfbuzz: Branch 'master' - 3 commits

[Behdad Esfahbod]

 autogen.sh                 |    2 +-
 docs/reference/Makefile.am |    5 -----
 src/Makefile.am            |   12 ++++++------
 3 files changed, 7 insertions(+), 12 deletions(-)

New commits:
commit 63dd4b0ac2076fe9cc3dfe5d31ef3616d4ed01e5
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Sep 3 20:01:40 2013 -0400

    [gtk-doc] Remove hack for deleting tmpl/
    
    This was introduced in 029f46bde7e39094d3decb46525e91a97c5cc02c
    and was in fact a bug in gtk-doc master:
    
      https://bugzilla.gnome.org/show_bug.cgi?id=707426

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index f5309ee..7817648 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -109,9 +109,4 @@ TESTS_ENVIRONMENT = cd $(srcdir) && \
 #TESTS = $(GTKDOC_CHECK)
 endif
 
-maintainer-clean-local: maintainer-clean-tmpl
-
-maintainer-clean-tmpl:
-	-rm -rf $(srcdir)/tmpl
-
 -include $(top_srcdir)/git.mk
commit 213001aa99003422199245e96878f9fe348c55b4
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Sep 3 20:00:16 2013 -0400

    [build] Fix EXTRA_DIST
    
    I was under the impression that EXTRA_DISTs will happen regardless of
    automake conditionals.  Apparently I was wrong.

diff --git a/src/Makefile.am b/src/Makefile.am
index ca3718b..a776822 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -198,8 +198,8 @@ libharfbuzz_icu_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_IN
 libharfbuzz_icu_la_LIBADD = $(ICU_LIBS) libharfbuzz.la
 pkginclude_HEADERS += hb-icu.h
 pkgconfig_DATA += harfbuzz-icu.pc
-EXTRA_DIST += harfbuzz-icu.pc.in
 endif
+EXTRA_DIST += harfbuzz-icu.pc.in
 
 if HAVE_GOBJECT
 lib_LTLIBRARIES += libharfbuzz-gobject.la
@@ -211,16 +211,11 @@ libharfbuzz_gobject_la_LIBADD = $(GOBJECT_LIBS) libharfbuzz.la
 pkginclude_HEADERS += hb-gobject.h hb-gobject-structs.h
 nodist_pkginclude_HEADERS += hb-gobject-enums.h
 pkgconfig_DATA += harfbuzz-gobject.pc
-EXTRA_DIST += harfbuzz-gobject.pc.in
 
 BUILT_SOURCES += \
 	hb-gobject-enums.cc \
 	hb-gobject-enums.h \
 	$(NULL)
-EXTRA_DIST += \
-	hb-gobject-enums.cc.tmpl \
-	hb-gobject-enums.h.tmpl \
-	$(NULL)
 DISTCLEANFILES += \
 	hb-gobject-enums.cc \
 	hb-gobject-enums.h \
@@ -232,6 +227,11 @@ hb-gobject-enums.%: hb-gobject-enums.%.tmpl $(HBHEADERS)
 	sed 's/_t_get_type/_get_type/g; s/_T (/ (/g' > "$@.tmp" && \
 	mv "$@.tmp" "$@" || ( $(RM) "@.tmp" && false )
 endif
+EXTRA_DIST += \
+	harfbuzz-gobject.pc.in \
+	hb-gobject-enums.cc.tmpl \
+	hb-gobject-enums.h.tmpl \
+	$(NULL)
 
 
 %.pc: %.pc.in $(top_builddir)/config.status
commit 1e994a8fcc94dfea42a6cbfe23a401142d79a1a6
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Sep 3 18:11:47 2013 -0400

    [gtk-doc] Copy makefile

diff --git a/autogen.sh b/autogen.sh
index 42e69d0..6f4e903 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ which gtkdocize || {
 	echo "*** No gtkdocize found, please install it ***"
 	exit 1
 }
-gtkdocize || exit 1
+gtkdocize --copy || exit 1
 
 echo -n "checking for autoreconf... "
 which autoreconf || {