[Spice-devel] [protocol] Add spice/Makefile to the generated .gitignore

[Alon Levy]

On Thu, Jul 05, 2012 at 08:04:10PM -0500, Jeremy White wrote:
> Okay, I wrote to Behdad Esfahbod, who rapidly and cheerfully fixed the upstream issue.
> 
> Attached is the upstream patch.  If applied to spice-protocol, then it should no longer
> be the case that a clone spice; ./autogen.sh; make; git status reports a dirty submodule.
> 
> Cheers,
> 
> Jeremy

I still can't figure out how it works, but it does, thanks for caring :)


> From eb3a2db3ad9bed3f816dc04ecc1c37e08e5109e6 Mon Sep 17 00:00:00 2001
> From: Behdad Esfahbod <behdad at behdad.org>
> Date: Thu, 5 Jul 2012 11:56:07 -0400
> Subject: [PATCH] Fix "make gitignore" subdirectory recursion
> 
> As reported by Jeremy White.  "make gitignore" was not recursing into
> directories listed in SUBDIRS.  This was caused by commit
> 054f9efae262d793b2a396bab672e3b8345128f0.
> ---
>  git.mk |   19 +++++++++++++------
>  1 file changed, 13 insertions(+), 6 deletions(-)
> 
> diff --git a/git.mk b/git.mk
> index 5313358..79934dc 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:
>  #
> @@ -198,18 +204,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.9.5
> 

> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel