summaryrefslogtreecommitdiffstats
path: root/server/Makefile.am
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2010-04-08 17:09:32 +0200
committerAlexander Larsson <alexl@redhat.com>2010-04-08 17:09:32 +0200
commitde4306af331f5a68c28949c5cfed60adea24f753 (patch)
tree47cb5aa82829eba5b90a6f2d6449e8a8e69c2e2c /server/Makefile.am
parent18485cef06283c17ddd98fd5411b71bcb64201a3 (diff)
downloadspice-de4306af331f5a68c28949c5cfed60adea24f753.tar.gz
spice-de4306af331f5a68c28949c5cfed60adea24f753.tar.xz
spice-de4306af331f5a68c28949c5cfed60adea24f753.zip
Initialize _kill_mark so we don't get spurious valgrind warnings
Diffstat (limited to 'server/Makefile.am')
-rw-r--r--server/Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/server/Makefile.am b/server/Makefile.am
index d09e2d20..5c4524a5 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES = \
-I$(top_srcdir)/common \
-I$(top_srcdir)/common/linux \
$(PROTOCOL_CFLAGS) \
- $(FFMPEG_CFLAGS) \
+ $(JPEG_CFLAGS) \
$(PIXMAN_CFLAGS) \
$(GL_CFLAGS) \
$(LOG4CPP_CFLAGS) \
@@ -42,7 +42,7 @@ libspice_server_la_LDFLAGS = \
libspice_server_la_LIBADD = \
$(GL_LIBS) \
- $(FFMPEG_LIBS) \
+ $(JPEG_LIBS) \
$(PIXMAN_LIBS) \
$(SSL_LIBS) \
$(CELT051_LIBS) \
@@ -66,6 +66,8 @@ libspice_server_la_SOURCES = \
glz_encoder_dictionary.h \
glz_encoder_dictionary_protected.h \
glz_encoder.h \
+ mjpeg_encoder.h \
+ mjpeg_encoder.c \
red_bitmap_utils.h \
red_client_cache.h \
red_client_shared_cache.h \
@@ -77,7 +79,6 @@ libspice_server_la_SOURCES = \
stat.h \
red_worker.c \
red_worker.h \
- red_yuv.h \
snd_worker.c \
snd_worker.h \
red_channel.h \