autotools: refactor the whole build machinery

spice Makefile.am setup is a bit confusing, with source file
names being listed several times in different Makefile.am
(generally, once in EXTRA_DIST and another time in another
Makefile.am in _SOURCES). The client binaries are built
by client/x11/Makefile.am, which means recursing into client,
then into x11 to finally build spicec. This Makefile.am is
also referencing files from common/ and client/, which is
a bit unusual with autotools.

This patch attempts to simplify the build process to get
something more usual from an autotools point of view.
The source from common/ are compiled into a libtool convenience
library, which the server and the client links against which avoids
referencing source files from common/ when building the server and
the client. The client is built in client/Makefile.am and directly
builds files from x11/ windows/ and gui/ if needed (without
recursing in these subdirectories).

This makes the build simpler to understand, and also makes it
possible to list source files once, which avoids potential
make distcheck breakage when adding new files.

There is a regression in this patch with respect to
sw_canvas/gl_canvas/gdi_canvas. They should be built with
different preprocessor #defines resulting in different behaviour
of the canvas for the client and the server. However, this is not
currently the case, both the client and the server will use the same
code for now (which probably means one of them is broken). This will
be fixed in a subsequent commit.

make distcheck passes, but compilation on windows using the
autotools build system hasn't been tested, which means it's likely
to be broken. It shouldn't be too hard ot fix it though, just let
me know of any issues with this.

2 files changed, 58 insertions, 98 deletions

diff --git a/server/Makefile.am b/server/Makefile.am
index 37ff1830..73a886fd 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -3,23 +3,21 @@ SUBDIRS = . tests
 NULL =
 
 INCLUDES = \
-	-I.					\
+	-I$(top_srcdir)				\
 	-I$(top_srcdir)/common			\
-	-I$(top_srcdir)/common/linux	\
-	$(PROTOCOL_CFLAGS)			\
-	$(JPEG_CFLAGS)				\
+	-DRED_STATISTICS			\
+	-DSW_CANVAS_IMAGE_CACHE			\
+	$(Z_LIBS)				\
+	$(CELT051_CFLAGS)			\
 	$(PIXMAN_CFLAGS)			\
-	$(GL_CFLAGS)				\
-	$(SSL_CFLAGS)				\
+	$(PROTOCOL_CFLAGS)			\
 	$(SASL_CFLAGS)				\
-	$(CELT051_CFLAGS)			\
 	$(SLIRP_CFLAGS)				\
-	-DSW_CANVAS_IMAGE_CACHE			\
-	-DRED_STATISTICS			\
-	$(WARN_CFLAGS)                          \
+	$(SMARTCARD_CFLAGS)			\
+	$(SSL_CFLAGS)				\
 	$(VISIBILITY_HIDDEN_CFLAGS)		\
-	$(SMARTCARD_CFLAGS)				\
-	-std=gnu99 \
+	$(WARN_CFLAGS)				\
+	-std=gnu99				\
 	$(NULL)
 
 spice_built_sources = generated_marshallers.c generated_marshallers.h generated_demarshallers.c
@@ -34,29 +32,6 @@ generated_marshallers.c: $(top_srcdir)/spice.proto
 generated_marshallers.h: $(top_srcdir)/spice.proto
 	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers $(STRUCTS) --server -H $(top_srcdir)/spice.proto generated_marshallers.h
 
-if SUPPORT_GL
-GL_SRCS =				\
-	$(top_srcdir)/common/gl_canvas.c		\
-	$(top_srcdir)/common/glc.c			\
-	$(top_srcdir)/common/ogl_ctx.c			\
-	$(NULL)
-else
-GL_SRCS =
-endif
-
-COMMON_SRCS =						\
-	$(top_srcdir)/common/sw_canvas.c		\
-	$(top_srcdir)/common/pixman_utils.c		\
-	$(top_srcdir)/common/lines.c			\
-	$(top_srcdir)/common/region.c			\
-	$(top_srcdir)/common/rop3.c			\
-	$(top_srcdir)/common/quic.c			\
-	$(top_srcdir)/common/lz.c			\
-	$(top_srcdir)/common/canvas_utils.c		\
-	$(top_srcdir)/common/mem.c			\
-	$(top_srcdir)/common/marshaller.c		\
-	$(NULL)
-
 lib_LTLIBRARIES = libspice-server.la
 
 libspice_server_la_LDFLAGS =			\
@@ -64,51 +39,43 @@ libspice_server_la_LDFLAGS =			\
 	-no-undefined				\
 	$(NULL)
 
-libspice_server_la_LIBADD =			\
-	$(GL_LIBS)				\
-	$(JPEG_LIBS)				\
-	$(PIXMAN_LIBS)				\
-	$(SSL_LIBS)				\
-	$(SASL_LIBS)				\
-	$(CELT051_LIBS)				\
-	$(SLIRP_LIBS)				\
-	$(LIBRT)				\
-	$(Z_LIBS)				\
+libspice_server_la_LIBADD =				\
+	$(top_builddir)/common/libspice-common.la	\
+	$(CELT051_LIBS)					\
+	$(GL_LIBS)					\
+	$(JPEG_LIBS)					\
+	$(LIBRT)					\
+	$(PIXMAN_LIBS)					\
+	$(SASL_LIBS)					\
+	$(SLIRP_LIBS)					\
+	$(SSL_LIBS)					\
 	$(NULL)
 
-if SUPPORT_TUNNEL
-TUNNEL_SRCS =			\
-	red_tunnel_worker.c	\
-	red_tunnel_worker.h	\
-	$(NULL)
-else
-TUNNEL_SRCS =
-endif
-
-if SUPPORT_SMARTCARD
-SMARTCARD_SRCS =		\
-	smartcard.c			\
-	smartcard.h			\
-	$(NULL)
-else
-SMARTCARD_SRCS =
-endif
-
 libspice_server_la_SOURCES =			\
 	agent-msg-filter.c			\
 	agent-msg-filter.h			\
+	char_device.h				\
 	demarshallers.h				\
+	generated_demarshallers.c		\
+	generated_marshallers.c			\
+	generated_marshallers.h			\
 	glz_encoder.c				\
+	glz_encoder.h				\
 	glz_encoder_config.h			\
 	glz_encoder_dictionary.c		\
 	glz_encoder_dictionary.h		\
 	glz_encoder_dictionary_protected.h	\
-	glz_encoder.h				\
+	inputs_channel.c			\
+	inputs_channel.h			\
 	jpeg_encoder.c				\
 	jpeg_encoder.h				\
-	mjpeg_encoder.h				\
+	main_channel.c				\
+	main_channel.h				\
 	mjpeg_encoder.c				\
+	mjpeg_encoder.h				\
 	red_bitmap_utils.h			\
+	red_channel.c				\
+	red_channel.h				\
 	red_client_cache.h			\
 	red_client_shared_cache.h		\
 	red_common.h				\
@@ -118,31 +85,33 @@ libspice_server_la_SOURCES =			\
 	red_memslots.h				\
 	red_parse_qxl.c				\
 	red_parse_qxl.h				\
-	reds.c					\
-	main_channel.c				\
-	inputs_channel.c			\
-	reds.h					\
-	stat.h					\
 	red_worker.c				\
 	red_worker.h				\
+	reds.c					\
+	reds.h					\
 	snd_worker.c				\
 	snd_worker.h				\
-	red_channel.h				\
-	red_channel.c				\
-	spice.h					\
 	spice-experimental.h			\
-	generated_demarshallers.c		\
-	generated_marshallers.c			\
-	generated_marshallers.h			\
+	spice.h					\
+	stat.h					\
 	zlib_encoder.c				\
 	zlib_encoder.h				\
-	char_device.h				\
-	$(TUNNEL_SRCS)				\
-	$(SMARTCARD_SRCS)			\
-	$(COMMON_SRCS)				\
-	$(GL_SRCS)				\
 	$(NULL)
 
+if SUPPORT_TUNNEL
+libspice_server_la_SOURCES +=	\
+	red_tunnel_worker.c	\
+	red_tunnel_worker.h	\
+	$(NULL)
+endif
+
+if SUPPORT_SMARTCARD
+libspice_server_la_SOURCES +=	\
+	smartcard.c		\
+	smartcard.h		\
+	$(NULL)
+endif
+
 libspice_serverincludedir = $(includedir)/spice-server
 libspice_serverinclude_HEADERS =		\
 	spice.h					\
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 9d202648..8ec4094f 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -1,35 +1,26 @@
 NULL =
 
-INCLUDES =                          \
-	-I..                            \
-	-I../../common                  \
+INCLUDES =                              \
+	-I$(top_srcdir)                 \
+	-I$(top_srcdir)/common          \
+	-I$(top_srcdir)/server          \
+	-I$(top_srcdir)/server/tests    \
 	$(PROTOCOL_CFLAGS)              \
 	$(SPICE_NONPKGCONFIG_CFLAGS)    \
 	$(NULL)
 
-AM_LDFLAGS = -L../.libs -lspice-server
+AM_LDFLAGS = $(top_builddir)/server/libspice-server.la
 
 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 = test_display_streaming.c test_display_base.c basic_event_loop.c basic_event_loop.h test_util.h
+test_display_streaming_SOURCES = test_display_streaming.c test_display_base.c test_display_base.h basic_event_loop.c basic_event_loop.h test_util.h
 
-test_display_no_ssl_SOURCES = test_display_no_ssl.c test_display_base.c basic_event_loop.c basic_event_loop.h test_util.h
-
-test_display_no_ssl_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS)
+test_display_no_ssl_SOURCES = test_display_no_ssl.c test_display_base.c test_display_base.h basic_event_loop.c basic_event_loop.h test_util.h
 
 test_just_sockets_no_ssl_SOURCES = test_just_sockets_no_ssl.c basic_event_loop.c basic_event_loop.h test_util.h
 
-test_just_sockets_no_ssl_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS)
-
 test_empty_success_SOURCES = test_empty_success.c
 
-test_empty_success_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS)
-
 test_fail_on_null_core_interface_SOURCES = test_fail_on_null_core_interface.c
 
-test_fail_on_null_core_interface_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS)
-
 test_playback_SOURCES = test_playback.c basic_event_loop.c basic_event_loop.h test_util.h
-
-test_playback_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS)
-