[Spice-devel] [PATCH] Make update-symbol-files work when builddir != srcdir

[Christophe Fergeau]

On Tue, Apr 14, 2015 at 12:35:32PM -0500, Jonathon Jongsma wrote:
> rewrite the update-symbol-files rule to use dependencies and automatic
> variables ($<) so that VPATH will allow make to find these files in the
> srcdir as well as the builddir.

ACK.

> ---
>  gtk/Makefile.am | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/gtk/Makefile.am b/gtk/Makefile.am
> index ab50c79..e1d5d93 100644
> --- a/gtk/Makefile.am
> +++ b/gtk/Makefile.am
> @@ -688,16 +688,22 @@ typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
>  CLEANFILES += $(gir_DATA) $(typelibs_DATA)
>  endif
>  
> -update-symbol-files:
> +update-map-file: $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS)
>  	( echo "SPICEGTK_1 {" ; \
>  	  echo "global:" ; \
> -	  ctags -f - -I G_GNUC_CONST --c-kinds=p $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS) | awk '/^spice_/ { print $$1 ";" }' | sort ; \
> +	  ctags -f - -I G_GNUC_CONST --c-kinds=p $^ | awk '/^spice_/ { print $$1 ";" }' | sort ; \
>  	  echo "local:" ;  \
>  	  echo "*;" ; \
>  	  echo "};" ) > $(srcdir)/map-file
> -	( ctags -f - -I G_GNUC_CONST --c-kinds=p $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS) | awk '/^spice_/ { print $$1 }' | sort ; \
> +
> +update-glib-sym-file: $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS)
> +	( ctags -f - -I G_GNUC_CONST --c-kinds=p $^ | awk '/^spice_/ { print $$1 }' | sort ; \
>  	) > $(srcdir)/spice-glib-sym-file
> -	( ctags -f - -I G_GNUC_CONST --c-kinds=p $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) | awk '/^spice_/ { print $$1 }' | sort ; \
> +
> +update-gtk-sym-file: $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS)
> +	( ctags -f - -I G_GNUC_CONST --c-kinds=p $^ | awk '/^spice_/ { print $$1 }' | sort ; \
>  	) > $(srcdir)/spice-gtk-sym-file
>  
> +update-symbol-files: update-map-file update-glib-sym-file update-gtk-sym-file
> +
>  -include $(top_srcdir)/git.mk
> -- 
> 2.1.0
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20150415/f0ca3d05/attachment.sig>