On Thu, Oct 20, 2016 at 04:08:27PM +0200, Victor Toso wrote: > From: Victor Toso <me@xxxxxxxxxxxxxx> > > The generated spice_protocol.html file and the Makefile were not > included in gitignore. This patch fixes it. > --- > docs/Makefile.am | 2 ++ > git.mk | 1 + > 2 files changed, 3 insertions(+) > > diff --git a/docs/Makefile.am b/docs/Makefile.am > index 0b09b82..212acba 100644 > --- a/docs/Makefile.am > +++ b/docs/Makefile.am > @@ -15,3 +15,5 @@ endif > > clean-local: > rm -f spice_protocol.html > + > +-include $(top_srcdir)/git.mk ack to that hunk > diff --git a/git.mk b/git.mk > index d5bf7b8..8be04f9 100644 > --- a/git.mk > +++ b/git.mk > @@ -193,6 +193,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk > Makefile \ > Makefile.in \ > "*.orig" \ > + "*.html" \ > "*.rej" \ > "*.bak" \ > "*~" \ I'd rather that we don't modify this file as it's a copy of an old version of https://raw.githubusercontent.com/behdad/git.mk/master/git.mk git.mk header says: # This enables automatic .gitignore generation. If you need to ignore # more files, add them to the GITIGNOREFILES variable in your # Makefile.am. # But think twice before doing that. If a file has to be in .gitignore, # chances are very high that it's a generated file and should be in one # of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or # MAINTAINERCLEANFILES. and the patch below seems to fix it too: diff --git a/docs/Makefile.am b/docs/Makefile.am index 0b09b82..3f98680 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -13,5 +13,6 @@ spice_protocol.html: spice_protocol.txt $(AM_V_GEN) $(ASCIIDOC) -n $(ASCIIDOC_FLAGS) -o $@ $< endif -clean-local: - rm -f spice_protocol.html +CLEANFILES=spice_protocol.html + +-include $(top_srcdir)/git.mk Christophe
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel