From d7fb7b0b36545dbc58b5b83beebdecf4819a4169 Mon Sep 17 00:00:00 2001 From: "Eduardo Lima (Etrunko)" Date: Wed, 15 Jun 2016 16:27:48 -0300 Subject: [PATCH] Move lz4-encoder.[ch] to conditional block in Makefile.am 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) Acked-by: Christophe Fergeau --- 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 09710ebc..0af8a1b2 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 7b6359f6..f193fd86 100644 --- a/server/lz4-encoder.c +++ b/server/lz4-encoder.c @@ -18,8 +18,6 @@ #include #endif -#ifdef USE_LZ4 - #define SPICE_LOG_DOMAIN "SpiceLz4Encoder" #include @@ -119,5 +117,3 @@ int lz4_encode(Lz4EncoderContext *lz4, int height, int stride, uint8_t *io_ptr, return out_size; } - -#endif // USE_LZ4