mirror of
https://gitlab.uni-freiburg.de/opensourcevdi/spice
synced 2025-12-26 22:48:19 +00:00
2a4614ea94
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. |
||
|---|---|---|
| .. | ||
| win | ||
| .gitignore | ||
| canvas_base.c | ||
| canvas_base.h | ||
| canvas_utils.c | ||
| canvas_utils.h | ||
| draw.h | ||
| gdi_canvas.c | ||
| gdi_canvas.h | ||
| gl_canvas.c | ||
| gl_canvas.h | ||
| gl_utils.h | ||
| glc.c | ||
| glc.c.save | ||
| glc.h | ||
| lines.c | ||
| lines.h | ||
| lz_common.h | ||
| lz_compress_tmpl.c | ||
| lz_config.h | ||
| lz_decompress_tmpl.c | ||
| lz.c | ||
| lz.h | ||
| Makefile.am | ||
| marshaller.c | ||
| marshaller.h | ||
| mem.c | ||
| mem.h | ||
| messages.h | ||
| mutex.h | ||
| ogl_ctx.c | ||
| ogl_ctx.h | ||
| pixman_utils.c | ||
| pixman_utils.h | ||
| quic_config.h | ||
| quic_family_tmpl.c | ||
| quic_rgb_tmpl.c | ||
| quic_tmpl.c | ||
| quic.c | ||
| quic.h | ||
| rect.h | ||
| region.c | ||
| region.h | ||
| ring.h | ||
| rop3.c | ||
| rop3.h | ||
| spice_common.h | ||
| sw_canvas.c | ||
| sw_canvas.h | ||