On Tue, Mar 28, 2017 at 04:48:57PM +0200, marcandre.lureau@xxxxxxxxxx wrote: > From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx> I would include in the comment a small summary of the changes and inclusions. It helps :) (...) > +MAINTAINERCLEANFILES = \ > + $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ > + $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \ > + $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ > + m4/gtk-doc.m4 \ > + m4/intltool.m4 \ > + gtk-doc.make \ > $(NULL) You still need $(GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT) Otherwise we get a few untracked m4/*.m4 files (...) > -.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 btw, it seems that we can update .git.mk once again. A part from that, looks good. Reviewed-by: Victor Toso <victortoso@xxxxxxxxxx> > @@ -166,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 \ > @@ -189,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 \ > @@ -216,6 +245,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk > 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 \ > @@ -224,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" \ > @@ -255,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$(LTCXXCOMPILE)" = 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" \ > @@ -273,6 +304,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk > $(TEST_LOGS) \ > $(TEST_LOGS:.log=.trs) \ > $(TEST_SUITE_LOG) \ > + $(TESTS:=.test) \ > "*.gcda" \ > "*.gcno" \ > $(DISTCLEANFILES) \ > -- > 2.12.0.191.gc5d8de91d > > _______________________________________________ > 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