On Wed, Aug 08, 2012 at 07:46:02PM +0200, Marc-André Lureau wrote: > Revert to usage of DIST_SUBDIRS to avoid make install under > spice-protocol. Use an updated version of git.mk that fixes .gitignore > generation under DIST_SUBDIRS. These 2 unrelated sentences are a strong hint that the commits should be split, especially as there is one big mechanical change (update git.mk), and then a smaller change on top of that. ACK (even if not split) Christophe > --- > Makefile.am | 3 ++- > git.mk | 48 ++++++++++++++++++++++++++++++------------------ > 2 files changed, 32 insertions(+), 19 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 30c4f37..380bf24 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -1,7 +1,8 @@ > NULL = > ACLOCAL_AMFLAGS = -I m4 > > -SUBDIRS = python_modules common spice-protocol > +SUBDIRS = python_modules common > +DIST_SUBDIRS = spice-protocol $(SUBDIRS) > > EXTRA_DIST = \ > spice_codegen.py \ > diff --git a/git.mk b/git.mk > index 8aebb8d..4da8fe2 100644 > --- a/git.mk > +++ b/git.mk > @@ -44,6 +44,12 @@ > # This file knows how to handle autoconf, automake, libtool, gtk-doc, > # gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu. > # > +# This makefile provides the following targets: > +# > +# - all: "make all" will build all gitignore files. > +# - gitignore: makes all gitignore files in the current dir and subdirs. > +# - .gitignore: make gitignore file for the current dir. > +# - gitignore-recurse: makes all gitignore files in the subdirs. > # > # KNOWN ISSUES: > # > @@ -97,25 +103,31 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk > ; do echo /$$x; done; \ > fi; \ > if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \ > + for lc in $(DOC_LINGUAS); do \ > + for x in \ > + $(if $(DOC_MODULE),$(DOC_MODULE).xml) \ > + $(DOC_PAGES) \ > + $(DOC_INCLUDES) \ > + ; do echo /$$lc/$$x; done; \ > + done; \ > for x in \ > - $(_DOC_C_DOCS) \ > - $(_DOC_LC_DOCS) \ > $(_DOC_OMF_ALL) \ > $(_DOC_DSK_ALL) \ > $(_DOC_HTML_ALL) \ > $(_DOC_MOFILES) \ > - $(_DOC_POFILES) \ > $(DOC_H_FILE) \ > "*/.xml2po.mo" \ > "*/*.omf.out" \ > ; do echo /$$x; done; \ > fi; \ > if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \ > - for x in \ > - $(_HELP_LC_FILES) \ > - $(_HELP_LC_STAMPS) \ > - $(_HELP_MOFILES) \ > - ; do echo /$$x; done; \ > + for lc in $(HELP_LINGUAS); do \ > + for x in \ > + $(HELP_FILES) \ > + "$$lc.stamp" \ > + "$$lc.mo" \ > + ; do echo /$$lc/$$x; done; \ > + done; \ > fi; \ > if test "x$(gsettings_SCHEMAS)" = x; then :; else \ > for x in \ > @@ -159,10 +171,9 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk > .gitignore \ > $(GITIGNOREFILES) \ > $(CLEANFILES) \ > - $(PROGRAMS) \ > - $(check_PROGRAMS) \ > - $(EXTRA_PROGRAMS) \ > - $(LTLIBRARIES) \ > + $(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \ > + $(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \ > + $(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \ > so_locations \ > .libs _libs \ > $(MOSTLYCLEANFILES) \ > @@ -192,18 +203,19 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk > mv $@.tmp $@; > > all: $(srcdir)/.gitignore gitignore-recurse-maybe > +gitignore: $(srcdir)/.gitignore gitignore-recurse > + > gitignore-recurse-maybe: > - @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \ > - $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \ > - fi; > -gitignore-recurse: > @for subdir in $(DIST_SUBDIRS); do \ > case " $(SUBDIRS) " in \ > *" $$subdir "*) :;; \ > - *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \ > + *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse-maybe || echo "Skipping $$subdir");; \ > esac; \ > done > -gitignore: $(srcdir)/.gitignore gitignore-recurse > +gitignore-recurse: > + @for subdir in $(DIST_SUBDIRS); do \ > + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir"); \ > + done > > maintainer-clean: gitignore-clean > gitignore-clean: > -- > 1.7.10.4 > > _______________________________________________ > Spice-devel mailing list > Spice-devel@xxxxxxxxxxxxxxxxxxxxx > http://lists.freedesktop.org/mailman/listinfo/spice-devel
Attachment:
pgpAVK9lNrSFj.pgp
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel