[Spice-devel] [PATCH spice 2/2] build-sys: fix make distcheck

Christophe Fergeau cfergeau at redhat.com
Thu Mar 1 01:47:12 PST 2012


NACK, I can't even spot the actual fixes in the middle of all this
reformatting...

Christophe

On Thu, Mar 01, 2012 at 12:39:41AM +0100, Marc-André Lureau wrote:
> ---
>  server/tests/Makefile.am |   44 +++++++++++++++++++++++++++++++++++++-------
>  1 files changed, 37 insertions(+), 7 deletions(-)
> 
> diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
> index bc4e00e..ff0e3ed 100644
> --- a/server/tests/Makefile.am
> +++ b/server/tests/Makefile.am
> @@ -13,21 +13,51 @@ if SUPPORT_AUTOMATED_TESTS
>  INCLUDES += -DAUTOMATED_TESTS
>  endif
>  
> -AM_LDFLAGS = $(top_builddir)/server/libspice-server.la
> +LDADD =							\
> +	$(top_builddir)/common/libspice-common.la	\
> +	$(top_builddir)/server/libspice-server.la	\
> +	$(NULL)
>  
> -COMMON_BASE=basic_event_loop.c basic_event_loop.h test_util.h ../../common/backtrace.c
> +COMMON_BASE =					\
> +	basic_event_loop.c			\
> +	basic_event_loop.h			\
> +	test_util.h				\
> +	$(NULL)
>  
> +noinst_PROGRAMS =				\
> +	test_display_no_ssl			\
> +	test_display_streaming			\
> +	test_empty_success			\
> +	test_fail_on_null_core_interface	\
> +	test_just_sockets_no_ssl		\
> +	test_playback				\
> +	$(NULL)
>  
> -noinst_PROGRAMS = test_just_sockets_no_ssl test_empty_success test_fail_on_null_core_interface test_display_no_ssl test_display_streaming test_playback
> +test_display_streaming_SOURCES =		\
> +	$(COMMON_BASE)				\
> +	test_display_base.c			\
> +	test_display_base.h			\
> +	test_display_streaming.c		\
> +	$(NULL)
>  
> -test_display_streaming_SOURCES = test_display_streaming.c test_display_base.c test_display_base.h $(COMMON_BASE)
> +test_display_no_ssl_SOURCES =			\
> +	$(COMMON_BASE)				\
> +	test_display_base.c			\
> +	test_display_base.h			\
> +	test_display_no_ssl.c 			\
> +	$(NULL)
>  
> -test_display_no_ssl_SOURCES = test_display_no_ssl.c test_display_base.c test_display_base.h $(COMMON_BASE)
> +test_just_sockets_no_ssl_SOURCES =		\
> +	$(COMMON_BASE)				\
> +	test_just_sockets_no_ssl.c		\
> +	$(NULL)
>  
> -test_just_sockets_no_ssl_SOURCES = test_just_sockets_no_ssl.c $(COMMON_BASE)
> +test_playback_SOURCES =				\
> +	$(COMMON_BASE)				\
> +	test_playback.c				\
> +	$(NULL)
>  
>  test_empty_success_SOURCES = test_empty_success.c
>  
>  test_fail_on_null_core_interface_SOURCES = test_fail_on_null_core_interface.c
>  
> -test_playback_SOURCES = test_playback.c $(COMMON_BASE)
> -- 
> 1.7.7.6
> 
> _______________________________________________
> 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: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20120301/d7f083f4/attachment.pgp>


More information about the Spice-devel mailing list