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) <etrunko@redhat.com>
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
Eduardo Lima (Etrunko) 2016-06-15 16:27:48 -03:00
parent ed429a618e
commit d7fb7b0b36
2 changed files with 7 additions and 6 deletions

View File

@ -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 \

View File

@ -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