Makefile.am | 1 +
autogen.sh | 9 +++++++--
docs/Makefile.am | 2 ++
git.mk | 35 ++++++++++++++++++++++++++++-------
4 files changed, 38 insertions(+), 9 deletions(-)
New commits:
commit 1e03d7ac83f3e17aafed1e37390d9ff8394e36da
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Thu Feb 26 13:58:32 2015 -0800
Better error message if libtool is not installed
Fixes https://github.com/behdad/harfbuzz/pull/88
diff --git a/autogen.sh b/autogen.sh
index a267f29..a81d2aa 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,17 +19,22 @@ which pkg-config || {
exit 1
}
+echo -n "checking for libtoolize... "
+which libtoolize || {
+ echo "*** No libtoolize (libtool) found, please install it ***"
+ exit 1
+}
echo -n "checking for gtkdocize... "
if which gtkdocize ; then
gtkdocize --copy || exit 1
else
- echo "*** No gtkdocize found, skipping documentation ***"
+ echo "*** No gtkdocize (gtk-doc) found, skipping documentation ***"
echo "EXTRA_DIST = " > gtk-doc.make
fi
echo -n "checking for autoreconf... "
which autoreconf || {
- echo "*** No autoreconf found, please install it ***"
+ echo "*** No autoreconf (autoconf) found, please install it ***"
exit 1
}
commit 6c918e2997fb82e89485f2b50bee2bf4fcd70592
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Thu Feb 26 13:55:34 2015 -0800
Clean up gtk-doc.make
diff --git a/Makefile.am b/Makefile.am
index 58afd9b..47aeb97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@ MAINTAINERCLEANFILES = \
$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
$(srcdir)/INSTALL \
$(srcdir)/ChangeLog \
+ $(srcdir)/gtk-doc.make \
$(NULL)
commit 5ec5875acb12cf07447c9ebfb03212601368dfc4
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Thu Feb 26 13:53:05 2015 -0800
Install git.mk in docs/
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f3ddc22..034926c 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1 +1,3 @@
SUBDIRS = reference
+
+-include $(top_srcdir)/git.mk
commit d146678d103425b3da7ef393bc6d66f6ba4c5593
Author: Behdad Esfahbod <beh...@behdad.org>
Date: Thu Feb 26 13:52:50 2015 -0800
Update git.mk from upstream
diff --git a/git.mk b/git.mk
index 18c07f6..091d7ec 100644
--- a/git.mk
+++ b/git.mk
@@ -9,7 +9,8 @@
# notice and this notice are preserved.
#
# The latest version of this file can be downloaded from:
-# https://raw.github.com/behdad/git.mk/master/git.mk
+GIT_MK_URL = https://raw.githubusercontent.com/behdad/git.mk/master/git.mk
+#
# Bugs, etc, should be reported upstream at:
# https://github.com/behdad/git.mk
#
@@ -45,7 +46,8 @@
# build dir.
#
# This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
+# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata,
+# appstream.
#
# This makefile provides the following targets:
#
@@ -90,6 +92,7 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
missing \
mkinstalldirs \
test-driver \
+ ylwrap \
; do echo "$$AUX_DIR/$$x"; done` \
`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1'
./configure.ac | \
head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
@@ -147,7 +150,10 @@ git-mk-install:
fi; \
fi; done; test -z "$$any_failed"
-.PHONY: git-all git-mk-install
+git-mk-update:
+ wget $(GIT_MK_URL) -O $(top_srcdir)/git.mk
+
+.PHONY: git-all git-mk-install git-mk-update
@@ -202,6 +208,16 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(gsettings__enum_file) \
; do echo "/$$x"; done; \
fi; \
+ if test "x$(appdata_XML)" = x; then :; else \
+ for x in \
+ $(appdata_XML:.xml=.valid) \
+ ; do echo "/$$x"; done; \
+ fi; \
+ if test "x$(appstream_XML)" = x; then :; else \
+ for x in \
+ $(appstream_XML:.xml=.valid) \
+ ; do echo "/$$x"; done; \
+ fi; \
if test -f $(srcdir)/po/Makefile.in.in; then \
for x in \
po/Makefile.in.in \
@@ -243,7 +259,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
if test "x$(am__dirstamp)" = x; then :; else \
echo "$(am__dirstamp)"; \
fi; \
- if test "x$(LTCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :;
else \
+ if test "x$(LTCOMPILE)" = x -a "x$(LTCXXCOMPILE)" = x -a
"x$(GTKDOC_RUN)" = x; then :; else \
for x in \
"*.lo" \
".libs" "_libs" \
@@ -261,7 +277,9 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(TEST_LOGS) \
$(TEST_LOGS:.log=.trs) \
$(TEST_SUITE_LOG) \
- "*.$(OBJEXT)" \
+ $(TESTS:=.test) \
+ "*.gcda" \
+ "*.gcno" \
$(DISTCLEANFILES) \
$(am__CONFIG_DISTCLEAN_FILES) \
$(CONFIG_CLEAN_FILES) \
@@ -269,11 +287,10 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
"*.tab.c" \
$(MAINTAINERCLEANFILES) \
$(BUILT_SOURCES) \
- $(DEPDIR) \
$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
$(filter %_vala.stamp,$(DIST_COMMON)) \
$(filter %.vapi,$(DIST_COMMON)) \
- $(filter %$(patsubst %.vapi,%.h,$(filter
%.vapi,$(DIST_COMMON))),$(DIST_COMMON)) \
+ $(filter $(addprefix %,$(notdir $(patsubst
%.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \
Makefile \
Makefile.in \
"*.orig" \
@@ -283,6 +300,10 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
".*.sw[nop]" \
".dirstamp" \
; do echo "/$$x"; done; \
+ for x in \
+ "*.$(OBJEXT)" \
+ $(DEPDIR) \
+ ; do echo "$$x"; done; \
} | \
sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
sed 's@/[.]/@/@g' | \
_______________________________________________
HarfBuzz mailing list
HarfBuzz@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/harfbuzz
