[Spice-devel] [PATCH 2/2 spice-server] Move lz4-encoder.[ch] to conditional block in Makefile.am

[Christophe Fergeau]

Yes, more consistent indeed,

Acked-by: Christophe Fergeau <cfergeau at redhat.com>

On Wed, Jun 15, 2016 at 04:35:17PM -0300, Eduardo Lima (Etrunko) wrote:
> Let's follow the 'standard' for optional components. This commit also
> drops (now) unecessary #ifdef USE_LZ4 from lz4-encode.c, as the decision
> to build this file is now made in Makefile.
> 
> Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
> ---
>  server/Makefile.am   | 9 +++++++--
>  server/lz4-encoder.c | 4 ----
>  2 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/server/Makefile.am b/server/Makefile.am
> index 09710eb..0af8a1b 100644
> --- a/server/Makefile.am
> +++ b/server/Makefile.am
> @@ -88,8 +88,6 @@ libserver_la_SOURCES =				\
>  	inputs-channel-client.h		\
>  	jpeg-encoder.c				\
>  	jpeg-encoder.h				\
> -	lz4-encoder.c				\
> -	lz4-encoder.h				\
>  	main-channel.c				\
>  	main-channel.h				\
>  	main-channel-client.c			\
> @@ -154,6 +152,13 @@ libserver_la_SOURCES =				\
>  	dcc-encoders.h					\
>  	$(NULL)
>  
> +if HAVE_LZ4
> +libserver_la_SOURCES +=	\
> +	lz4-encoder.c				\
> +	lz4-encoder.h				\
> +	$(NULL)
> +endif
> +
>  if HAVE_SMARTCARD
>  libserver_la_SOURCES +=	\
>  	smartcard.c		\
> diff --git a/server/lz4-encoder.c b/server/lz4-encoder.c
> index 7b6359f..f193fd8 100644
> --- a/server/lz4-encoder.c
> +++ b/server/lz4-encoder.c
> @@ -18,8 +18,6 @@
>  #include <config.h>
>  #endif
>  
> -#ifdef USE_LZ4
> -
>  #define SPICE_LOG_DOMAIN "SpiceLz4Encoder"
>  
>  #include <arpa/inet.h>
> @@ -119,5 +117,3 @@ int lz4_encode(Lz4EncoderContext *lz4, int height, int stride, uint8_t *io_ptr,
>  
>      return out_size;
>  }
> -
> -#endif // USE_LZ4
> -- 
> 2.5.5
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20160616/5854bd14/attachment.sig>