diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | client/Makefile.am | 15 | ||||
| -rw-r--r-- | client/gui/Makefile.am | 21 | ||||
| -rw-r--r-- | client/windows/Makefile.am | 39 | ||||
| -rw-r--r-- | client/x11/Makefile.am | 1 | ||||
| -rw-r--r-- | common/Makefile.am | 16 | ||||
| -rw-r--r-- | common/win/my_getopt-1.5/Makefile.test (renamed from common/win/my_getopt-1.5/Makefile) | 0 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | python_modules/Makefile.am | 2 | ||||
| -rw-r--r-- | server/Makefile.am | 1 |
10 files changed, 89 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 0caf9fec..d90357fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,3 +7,5 @@ DISTCLEANFILES = \ spice-server.pc EXTRA_DIST = spice.proto spice1.proto spice_codegen.py + +DISTCHECK_CONFIGURE_FLAGS=--enable-opengl --enable-gui --enable-tunnel diff --git a/client/Makefile.am b/client/Makefile.am index d5602b52..185518a9 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -1,7 +1,7 @@ NULL = -SUBDIRS = . $(red_target) -DIST_SUBDIRS = x11 #windows +SUBDIRS = . $(red_target) gui +DIST_SUBDIRS = x11 windows gui spice_built_sources = generated_demarshallers.cpp generated_marshallers.cpp generated_demarshallers1.cpp generated_marshallers1.cpp @@ -81,10 +81,12 @@ RED_COMMON_SRCS = \ menu.h \ mjpeg_decoder.h \ mjpeg_decoder.cpp \ + event_sources.h \ pixels_source.h \ platform.h \ playback_channel.cpp \ process_loop.cpp \ + process_loop.h \ quic.cpp \ read_write_mutex.h \ record_channel.cpp \ @@ -119,8 +121,15 @@ RED_COMMON_SRCS = \ zlib_decoder.h \ $(NULL) +GDI_FILES = \ + gdi_canvas.cpp \ + red_gdi_canvas.cpp \ + red_gdi_canvas.h \ + red_pixmap_gdi.h \ + $(NULL) + MAINTAINERCLEANFILES = $(spice_built_sources) -EXTRA_DIST = $(RED_COMMON_SRCS) $(spice_built_sources) $(GL_SRCS) +EXTRA_DIST = $(RED_COMMON_SRCS) $(spice_built_sources) $(GL_SRCS) $(GDI_FILES) BUILT_SOURCES = $(spice_built_sources) diff --git a/client/gui/Makefile.am b/client/gui/Makefile.am new file mode 100644 index 00000000..e1204c92 --- /dev/null +++ b/client/gui/Makefile.am @@ -0,0 +1,21 @@ +NULL = + +EXTRA_DIST = \ + commonv2c.ttf.c \ + commonwealth-10.font.c \ + dejavu_sans-10.font.c \ + dejavu_sans.ttf.c \ + gui.cpp \ + gui.h \ + resource_provider.cpp \ + resource_provider.h \ + softrenderer.cpp \ + softrenderer.h \ + softtexture.cpp \ + softtexture.h \ + taharez_look.imageset.c \ + taharez_look.looknfeel.c \ + taharez_look.scheme.c \ + taharez_look.tga.c \ + $(NULL) + diff --git a/client/windows/Makefile.am b/client/windows/Makefile.am new file mode 100644 index 00000000..a9babd6f --- /dev/null +++ b/client/windows/Makefile.am @@ -0,0 +1,39 @@ +NULL = + +EXTRA_DIST = \ + atomic_count.h \ + event_sources_p.cpp \ + event_sources_p.h \ + generate1.bat \ + generate.bat \ + main.cpp \ + my_getopt.cpp \ + named_pipe.cpp \ + named_pipe.h \ + pixels_source.cpp \ + pixels_source_p.h \ + platform.cpp \ + platform_utils.cpp \ + platform_utils.h \ + playback.cpp \ + playback.h \ + record.cpp \ + record.h \ + redc.rc \ + redc.sln \ + redc.vcproj \ + red_drawable.cpp \ + red_pixmap.cpp \ + red_pixmap_gdi.cpp \ + red_pixmap_sw.cpp \ + red_window.cpp \ + red_window_p.h \ + resource.h \ + spicec.exe.manifest \ + spice.ico \ + static_title.bmp \ + stdint.h \ + sticky_alt.bmp \ + win_platform.h \ + $(NULL) + diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am index ce4813b0..dc83f58c 100644 --- a/client/x11/Makefile.am +++ b/client/x11/Makefile.am @@ -150,6 +150,7 @@ bin_PROGRAMS = spicec spicec_SOURCES = \ atomic_count.h \ event_sources_p.cpp \ + event_sources_p.h \ main.cpp \ named_pipe.h \ named_pipe.cpp \ diff --git a/common/Makefile.am b/common/Makefile.am index 5c1d6e07..407de1df 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,6 +1,8 @@ +SUBDIRS = win + NULL = -COMMON_SRCS = \ +COMMON_SRCS = \ sw_canvas.h \ sw_canvas.c \ pixman_utils.h \ @@ -10,6 +12,8 @@ COMMON_SRCS = \ canvas_utils.h \ canvas_utils.c \ draw.h \ + gdi_canvas.h \ + gdi_canvas.c \ gl_canvas.h \ gl_canvas.c \ glc.h \ @@ -22,11 +26,7 @@ COMMON_SRCS = \ quic.h \ quic.c \ quic_config.h \ - qxl_dev.h \ rect.h \ - red_error_codes.h \ - red.h \ - reds_stat.h \ region.h \ region.c \ ring.h \ @@ -41,12 +41,12 @@ COMMON_SRCS = \ lz.h \ marshaller.h \ marshaller.c \ + messages.h \ + mem.h \ + mem.c \ quic_family_tmpl.c \ quic_rgb_tmpl.c \ quic_tmpl.c \ - ipc_ring.h \ - vd_agent.h \ - quic_tmpl.c \ $(NULL) EXTRA_DIST = $(COMMON_SRCS) diff --git a/common/win/my_getopt-1.5/Makefile b/common/win/my_getopt-1.5/Makefile.test index 083cc4aa..083cc4aa 100644 --- a/common/win/my_getopt-1.5/Makefile +++ b/common/win/my_getopt-1.5/Makefile.test diff --git a/configure.ac b/configure.ac index dc13caf1..03529d09 100644 --- a/configure.ac +++ b/configure.ac @@ -350,11 +350,15 @@ AC_OUTPUT([ Makefile spice-server.pc common/Makefile +common/win/Makefile +common/win/my_getopt-1.5/Makefile python_modules/Makefile server/Makefile client/Makefile client/x11/Makefile client/x11/images/Makefile +client/gui/Makefile +client/windows/Makefile ]) dnl ========================================================================== diff --git a/python_modules/Makefile.am b/python_modules/Makefile.am index 4b3c960f..f304ec0f 100644 --- a/python_modules/Makefile.am +++ b/python_modules/Makefile.am @@ -1,6 +1,6 @@ NULL = -PYTHON_MODULES = __init__.py codegen.py demarshal.py ptypes.py spice_parser.py +PYTHON_MODULES = __init__.py codegen.py demarshal.py marshal.py ptypes.py spice_parser.py EXTRA_DIST = $(PYTHON_MODULES) diff --git a/server/Makefile.am b/server/Makefile.am index a12009c3..debcd276 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -80,6 +80,7 @@ TUNNEL_SRCS = endif libspice_server_la_SOURCES = \ + demarshallers.h \ glz_encoder.c \ glz_encoder_config.h \ glz_encoder_dictionary.c \ |