Looks fine, Acked-by: Victor Toso <victortoso@xxxxxxxxxx> * CI Seal of approval https://gitlab.freedesktop.org/victortoso/spice-common/pipelines/808 On Fri, Jun 08, 2018 at 12:01:15PM +0200, Christophe Fergeau wrote: > https://raw.githubusercontent.com/behdad/git.mk/master/git.mk has a > newer version than what we are using now. > --- > git.mk | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++------- > 1 file changed, 199 insertions(+), 26 deletions(-) > > diff --git a/git.mk b/git.mk > index d5bf7b8..90de80f 100644 > --- a/git.mk > +++ b/git.mk > @@ -1,7 +1,8 @@ > -# git.mk > +# git.mk, a small Makefile to autogenerate .gitignore files > +# for autotools-based projects. > # > # Copyright 2009, Red Hat, Inc. > -# Copyright 2010,2011 Behdad Esfahbod > +# Copyright 2010,2011,2012,2013 Behdad Esfahbod > # Written by Behdad Esfahbod > # > # Copying and distribution of this file, with or without modification, > @@ -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. > +# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata, > +# appstream, hotdoc. > # > # This makefile provides the following targets: > # > @@ -64,14 +67,116 @@ > # example. > # > > + > + > +############################################################################### > +# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES: > +############################################################################### > + > +# > +# Most autotools-using modules should be fine including this variable in their > +# toplevel MAINTAINERCLEANFILES: > +GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \ > + $(srcdir)/aclocal.m4 \ > + $(srcdir)/autoscan.log \ > + $(srcdir)/configure.scan \ > + `AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \ > + test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \ > + for x in \ > + ar-lib \ > + compile \ > + config.guess \ > + config.rpath \ > + config.sub \ > + depcomp \ > + install-sh \ > + ltmain.sh \ > + 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` > +# > +# All modules should also be fine including the following variable, which > +# removes automake-generated Makefile.in files: > +GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \ > + `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \ > + while read f; do \ > + case $$f in Makefile|*/Makefile) \ > + test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \ > + done` > +# > +# Modules that use libtool and use AC_CONFIG_MACRO_DIR() may also include this, > +# though it's harmless to include regardless. > +GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \ > + `MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \ > + if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \ > + for x in \ > + libtool.m4 \ > + ltoptions.m4 \ > + ltsugar.m4 \ > + ltversion.m4 \ > + lt~obsolete.m4 \ > + ; do echo "$$MACRO_DIR/$$x"; done; \ > + fi` > +# > +# Modules that use gettext and use AC_CONFIG_MACRO_DIR() may also include this, > +# though it's harmless to include regardless. > +GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT = \ > + `MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \ > + if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \ > + for x in \ > + codeset.m4 \ > + extern-inline.m4 \ > + fcntl-o.m4 \ > + gettext.m4 \ > + glibc2.m4 \ > + glibc21.m4 \ > + iconv.m4 \ > + intdiv0.m4 \ > + intl.m4 \ > + intldir.m4 \ > + intlmacosx.m4 \ > + intmax.m4 \ > + inttypes-pri.m4 \ > + inttypes_h.m4 \ > + lcmessage.m4 \ > + lib-ld.m4 \ > + lib-link.m4 \ > + lib-prefix.m4 \ > + lock.m4 \ > + longlong.m4 \ > + nls.m4 \ > + po.m4 \ > + printf-posix.m4 \ > + progtest.m4 \ > + size_max.m4 \ > + stdint_h.m4 \ > + threadlib.m4 \ > + uintmax_t.m4 \ > + visibility.m4 \ > + wchar_t.m4 \ > + wint_t.m4 \ > + xsize.m4 \ > + ; do echo "$$MACRO_DIR/$$x"; done; \ > + fi` > + > + > + > +############################################################################### > +# Default rule is to install ourselves in all Makefile.am files: > +############################################################################### > + > git-all: git-mk-install > > git-mk-install: > - @echo Installing git makefile > + @echo "Installing git makefile" > @any_failed=; \ > find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \ > if grep 'include .*/git.mk' $$x >/dev/null; then \ > - echo $$x already includes git.mk; \ > + echo "$$x already includes git.mk"; \ > else \ > failed=; \ > echo "Updating $$x"; \ > @@ -83,27 +188,49 @@ git-mk-install: > mv $$x.tmp $$x || failed=1; \ > fi; \ > if test x$$failed = x; then : else \ > - echo Failed updating $$x; >&2 \ > + echo "Failed updating $$x"; >&2 \ > any_failed=1; \ > 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 > > -### .gitignore generation > > -$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk > - $(AM_V_GEN) \ > - { \ > + > +############################################################################### > +# Actual .gitignore generation: > +############################################################################### > + > +$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(top_srcdir)/configure.ac > + @echo "git.mk: Generating $@" > + @{ \ > if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \ > for x in \ > $(DOC_MODULE)-decl-list.txt \ > $(DOC_MODULE)-decl.txt \ > tmpl/$(DOC_MODULE)-unused.sgml \ > "tmpl/*.bak" \ > + $(REPORT_FILES) \ > + $(DOC_MODULE).pdf \ > xml html \ > - ; do echo /$$x; done; \ > + ; 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 \ > @@ -111,7 +238,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk > $(if $(DOC_MODULE),$(DOC_MODULE).xml) \ > $(DOC_PAGES) \ > $(DOC_INCLUDES) \ > - ; do echo /$$lc/$$x; done; \ > + ; do echo "/$$lc/$$x"; done; \ > done; \ > for x in \ > $(_DOC_OMF_ALL) \ > @@ -123,36 +250,63 @@ $(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 \ > $(HELP_FILES) \ > "$$lc.stamp" \ > "$$lc.mo" \ > - ; do echo /$$lc/$$x; done; \ > + ; do echo "/$$lc/$$x"; done; \ > done; \ > fi; \ > if test "x$(gsettings_SCHEMAS)" = x; then :; else \ > for x in \ > $(gsettings_SCHEMAS:.xml=.valid) \ > $(gsettings__enum_file) \ > - ; do echo /$$x; done; \ > + ; 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 \ > + ABOUT-NLS \ > po/Makefile.in.in \ > + po/Makefile.in.in~ \ > po/Makefile.in \ > po/Makefile \ > + po/Makevars.template \ > po/POTFILES \ > + po/Rules-quot \ > po/stamp-it \ > + po/stamp-po \ > po/.intltool-merge-cache \ > "po/*.gmo" \ > + "po/*.header" \ > "po/*.mo" \ > + "po/*.sed" \ > + "po/*.sin" \ > po/$(GETTEXT_PACKAGE).pot \ > intltool-extract.in \ > intltool-merge.in \ > intltool-update.in \ > - ; do echo /$$x; done; \ > + ; do echo "/$$x"; done; \ > fi; \ > if test -f $(srcdir)/configure; then \ > for x in \ > @@ -162,14 +316,23 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk > stamp-h1 \ > libtool \ > config.lt \ > - ; do echo /$$x; done; \ > + ; do echo "/$$x"; done; \ > fi; \ > if test "x$(DEJATOOL)" = x; then :; else \ > for x in \ > $(DEJATOOL) \ > - ; do echo /$$x.sum; echo /$$x.log; done; \ > + ; do echo "/$$x.sum"; echo "/$$x.log"; done; \ > echo /site.exp; \ > fi; \ > + if test "x$(am__dirstamp)" = x; then :; else \ > + echo "$(am__dirstamp)"; \ > + fi; \ > + 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" \ > + ; do echo "$$x"; done; \ > + fi; \ > for x in \ > .gitignore \ > $(GITIGNOREFILES) \ > @@ -178,10 +341,13 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk > $(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \ > $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \ > so_locations \ > - .libs _libs \ > $(MOSTLYCLEANFILES) \ > - "*.$(OBJEXT)" \ > - "*.lo" \ > + $(TEST_LOGS) \ > + $(TEST_LOGS:.log=.trs) \ > + $(TEST_SUITE_LOG) \ > + $(TESTS:=.test) \ > + "*.gcda" \ > + "*.gcno" \ > $(DISTCLEANFILES) \ > $(am__CONFIG_DISTCLEAN_FILES) \ > $(CONFIG_CLEAN_FILES) \ > @@ -189,7 +355,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 $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \ > Makefile \ > Makefile.in \ > "*.orig" \ > @@ -198,7 +367,11 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk > "*~" \ > ".*.sw[nop]" \ > ".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@/[.]/@/@g' | \ > @@ -212,12 +385,12 @@ gitignore-recurse-maybe: > @for subdir in $(DIST_SUBDIRS); do \ > case " $(SUBDIRS) " in \ > *" $$subdir "*) :;; \ > - *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse-maybe || echo "Skipping $$subdir");; \ > + *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \ > esac; \ > done > gitignore-recurse: > @for subdir in $(DIST_SUBDIRS); do \ > - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir"); \ > + test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \ > done > > maintainer-clean: gitignore-clean > -- > 2.17.1 > > _______________________________________________ > Spice-devel mailing list > Spice-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/spice-devel
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel