[Spice-devel] [spice-common v2 1/2] Remove spice-protocol submodule

[Frediano Ziglio]

Tested!

Acked!

And I would add happy to remove one submodule

Frediano

> 
> spice-protocol is a separate project which is having releases, so there
> is no need to have a private spice-protocol copy in each spice-common
> user, especially as after installation, the system-wide spice-protocol
> copy will be used instead of the private one the module was built
> against.
> ---
>  .gitmodules    | 3 ---
>  Makefile.am    | 1 -
>  configure.ac   | 4 +---
>  spice-protocol | 1 -
>  4 files changed, 1 insertion(+), 8 deletions(-)
>  delete mode 160000 spice-protocol
> 
> diff --git a/.gitmodules b/.gitmodules
> index f7de75d..e69de29 100644
> --- a/.gitmodules
> +++ b/.gitmodules
> @@ -1,3 +0,0 @@
> -[submodule "spice-protocol"]
> -	path = spice-protocol
> -	url = ../spice-protocol
> diff --git a/Makefile.am b/Makefile.am
> index 380bf24..e39273d 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -2,7 +2,6 @@ NULL =
>  ACLOCAL_AMFLAGS = -I m4
>  
>  SUBDIRS = python_modules common
> -DIST_SUBDIRS = spice-protocol $(SUBDIRS)
>  
>  EXTRA_DIST =				\
>  	spice_codegen.py		\
> diff --git a/configure.ac b/configure.ac
> index 4287f92..1dacfa2 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -28,9 +28,7 @@ AM_PROG_CC_C_O
>  SPICE_CHECK_SYSDEPS
>  
>  # Checks for libraries
> -AC_CONFIG_SUBDIRS([spice-protocol])
> -PROTOCOL_CFLAGS='-I ${top_srcdir}/spice-protocol'
> -AC_SUBST(PROTOCOL_CFLAGS)
> +PKG_CHECK_MODULES([PROTOCOL], [spice-protocol])
>  
>  SPICE_CHECK_PYTHON_MODULES()
>  
> diff --git a/spice-protocol b/spice-protocol
> deleted file mode 160000
> index cd78176..0000000
> --- a/spice-protocol
> +++ /dev/null
> @@ -1 +0,0 @@
> -Subproject commit cd7817603834251e5c1c4cda39980abbfc850580
> --
> 2.4.3
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
>