[latexila] build: update git.mk
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [latexila] build: update git.mk
- Date: Sun, 18 Dec 2016 16:00:15 +0000 (UTC)
commit 31247c91136213548ef1f56ce87946363787687a
Author: Sébastien Wilmet <swilmet gnome org>
Date: Sun Dec 18 16:18:13 2016 +0100
build: update git.mk
Makefile.am | 1 -
git.mk | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 48 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4868a6f..420ef99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,6 @@ MAINTAINERCLEANFILES = \
compile \
config.guess \
config.h.in \
- config.rpath \
config.sub \
configure.scan \
depcomp \
diff --git a/git.mk b/git.mk
index 5638488..facca55 100644
--- a/git.mk
+++ b/git.mk
@@ -1,4 +1,5 @@
-# git.mk
+# git.mk, a small Makefile to autogenerate .gitignore files
+# for autotools-based projects.
#
# Copyright 2009, Red Hat, Inc.
# Copyright 2010,2011,2012,2013 Behdad Esfahbod
@@ -9,7 +10,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 +47,8 @@
# build dir.
#
# This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata.
+# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata,
+# appstream, hotdoc.
#
# This makefile provides the following targets:
#
@@ -83,6 +86,7 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
ar-lib \
compile \
config.guess \
+ config.rpath \
config.sub \
depcomp \
install-sh \
@@ -90,6 +94,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 +152,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
@@ -164,10 +172,24 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(DOC_MODULE)-decl.txt \
tmpl/$(DOC_MODULE)-unused.sgml \
"tmpl/*.bak" \
+ $(REPORT_FILES) \
+ $(DOC_MODULE).pdf \
xml html \
; do echo "/$$x"; done; \
FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
+ if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-types"; then \
+ echo "/$(DOC_MODULE).types"; \
+ fi; \
+ if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-sections"; then \
+ echo "/$(DOC_MODULE)-sections.txt"; \
+ fi; \
+ if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
+ for x in \
+ $(SETUP_FILES) \
+ $(DOC_MODULE).types \
+ ; do echo "/$$x"; done; \
+ fi; \
fi; \
if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
for lc in $(DOC_LINGUAS); do \
@@ -187,6 +209,15 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
"*/*.omf.out" \
; do echo /$$x; done; \
fi; \
+ if test "x$(HOTDOC)" = x; then :; else \
+ $(foreach project, $(HOTDOC_PROJECTS),echo "/$(call HOTDOC_TARGET,$(project))"; \
+ echo "/$(shell $(call HOTDOC_PROJECT_COMMAND,$(project)) --get-conf-path
output)" ; \
+ echo "/$(shell $(call HOTDOC_PROJECT_COMMAND,$(project))
--get-private-folder)" ; \
+ ) \
+ for x in \
+ .hotdoc.d \
+ ; do echo "/$$x"; done; \
+ fi; \
if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
for lc in $(HELP_LINGUAS); do \
for x in \
@@ -207,8 +238,14 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(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 \
+ ABOUT-NLS \
po/Makefile.in.in \
po/Makefile.in.in~ \
po/Makefile.in \
@@ -217,6 +254,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
po/POTFILES \
po/Rules-quot \
po/stamp-it \
+ po/stamp-po \
po/.intltool-merge-cache \
"po/*.gmo" \
"po/*.header" \
@@ -248,7 +286,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$(findstring libtool,$(LTCOMPILE))" = x -a "x$(findstring libtool,$(LTCXXCOMPILE))"
= x -a "x$(GTKDOC_RUN)" = x; then :; else \
for x in \
"*.lo" \
".libs" "_libs" \
@@ -266,7 +304,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(TEST_LOGS) \
$(TEST_LOGS:.log=.trs) \
$(TEST_SUITE_LOG) \
- "*.$(OBJEXT)" \
+ $(TESTS:=.test) \
"*.gcda" \
"*.gcno" \
$(DISTCLEANFILES) \
@@ -276,7 +314,6 @@ $(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)) \
@@ -290,6 +327,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' | \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]