Update git.mk from upstream

This commit is contained in:
Behdad Esfahbod 2015-02-26 13:52:50 -08:00
parent 5f541f8f7b
commit d146678d10
1 changed files with 28 additions and 7 deletions

35
git.mk
View File

@ -9,7 +9,8 @@
# notice and this notice are preserved. # notice and this notice are preserved.
# #
# The latest version of this file can be downloaded from: # 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: # Bugs, etc, should be reported upstream at:
# https://github.com/behdad/git.mk # https://github.com/behdad/git.mk
# #
@ -45,7 +46,8 @@
# build dir. # build dir.
# #
# This file knows how to handle autoconf, automake, libtool, gtk-doc, # 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: # This makefile provides the following targets:
# #
@ -90,6 +92,7 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
missing \ missing \
mkinstalldirs \ mkinstalldirs \
test-driver \ test-driver \
ylwrap \
; do echo "$$AUX_DIR/$$x"; done` \ ; do echo "$$AUX_DIR/$$x"; done` \
`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \ `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done` head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
@ -147,7 +150,10 @@ git-mk-install:
fi; \ fi; \
fi; done; test -z "$$any_failed" 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) \ $(gsettings__enum_file) \
; do echo "/$$x"; done; \ ; do echo "/$$x"; done; \
fi; \ 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 \ if test -f $(srcdir)/po/Makefile.in.in; then \
for x in \ for x in \
po/Makefile.in.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 \ if test "x$(am__dirstamp)" = x; then :; else \
echo "$(am__dirstamp)"; \ echo "$(am__dirstamp)"; \
fi; \ 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 \ for x in \
"*.lo" \ "*.lo" \
".libs" "_libs" \ ".libs" "_libs" \
@ -261,7 +277,9 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(TEST_LOGS) \ $(TEST_LOGS) \
$(TEST_LOGS:.log=.trs) \ $(TEST_LOGS:.log=.trs) \
$(TEST_SUITE_LOG) \ $(TEST_SUITE_LOG) \
"*.$(OBJEXT)" \ $(TESTS:=.test) \
"*.gcda" \
"*.gcno" \
$(DISTCLEANFILES) \ $(DISTCLEANFILES) \
$(am__CONFIG_DISTCLEAN_FILES) \ $(am__CONFIG_DISTCLEAN_FILES) \
$(CONFIG_CLEAN_FILES) \ $(CONFIG_CLEAN_FILES) \
@ -269,11 +287,10 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
"*.tab.c" \ "*.tab.c" \
$(MAINTAINERCLEANFILES) \ $(MAINTAINERCLEANFILES) \
$(BUILT_SOURCES) \ $(BUILT_SOURCES) \
$(DEPDIR) \
$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \ $(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
$(filter %_vala.stamp,$(DIST_COMMON)) \ $(filter %_vala.stamp,$(DIST_COMMON)) \
$(filter %.vapi,$(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 \
Makefile.in \ Makefile.in \
"*.orig" \ "*.orig" \
@ -283,6 +300,10 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
".*.sw[nop]" \ ".*.sw[nop]" \
".dirstamp" \ ".dirstamp" \
; do echo "/$$x"; done; \ ; do echo "/$$x"; done; \
for x in \
"*.$(OBJEXT)" \
$(DEPDIR) \
; do echo "$$x"; done; \
} | \ } | \
sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \ sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
sed 's@/[.]/@/@g' | \ sed 's@/[.]/@/@g' | \