We want to enable running autogen.sh from spice subdirs (common, client, server)
This is useful for e.g configuring and compiling the server on one
machine and the client on another machine.
Also each subdir has its own "make dist" that includes configuration files
such that one can build spice components separately.
Uri Lublin (27):
autogen: remove copied code - srcdir and ORIGDIR (subdir config)
autogen: add possibly missing AUTOMAKE definition (subdir config)
autogen: exit upon errors (subdir config)
autogen: run "do_cmd auto*" for subdirs too (subdir config)
configure.ac: move most checks to configure.ac.shared (subdir config)
configure.ac: check for (and require) cairo-spice instead of qspice
configure.ac: define SPICE_COMMON_SRCDIR, to be used by Makefile.am
(subdir config)
configure.ac: use SPICE_COMMON_SRCDIR in server/Makefile.am (subdir
config)
configure.ac: client: replace $(top_srcdir) in x11/Makefile.am
(subdir config)
Add server/configure.ac (subdir config)
Add client/configure.ac (subdir config)
Add common/configure.ac (subdir config)
client: remove '../common' from #include directive (subdir config)
spice: client: Makefile.am: add missing files to file-list (subdir
config)
configure.ac.shared: prefer ffmpeg-spice (if exists) over ffmpeg
(subdir config)
configure.ac: use AC_CONFIG_SUBDIRS to run configure in subdirs
(subdir config)
common: add spice-common.pc (subdir config)
common: add "install" target for make (subdir config)
spice: configure.ac.shared: add option to use spice-common package
(subdir config)
spice: server: common/ files are not needed by "make dist" (subdir
config)
spice: configure.ac.shared: add PATCHID and DISTRIBUTION variables
(subdir config)
spice: subdirs: support ./autogen.sh in a "make dist" tarball (subdir
config)
client/x11/Makefile.am: make CLIENT_DIR $(top_srcdir) instead of ..
spice: configure: mv ffmpeg_inc.h.in from common/ to client/
spice: autogen.sh: call autogen.sh.shared separately from subdirs
(subdir config)
spice: common: Do not m4_include configure.ac.shared (subdir config)
spice: server: rename spice.pc to spice-server.pc
Makefile.am | 6 -
autogen.sh | 169 ++-------------
autogen.sh.shared | 158 +++++++++++++
client/Makefile.am | 15 ++-
client/autogen.sh | 1 +
client/cairo_canvas.cpp | 2 +-
client/canvas_utils.cpp | 2 +-
client/configure.ac | 78 +++++++
client/configure.ac.shared | 1 +
client/gdi_canvas.cpp | 2 +-
client/gl_canvas.cpp | 2 +-
client/glc.cpp | 2 +-
client/lz.cpp | 2 +-
client/quic.cpp | 2 +-
client/region.cpp | 2 +-
client/rop3.cpp | 2 +-
{common/win => client/windows}/ffmpeg_inc.h | 0
client/x11/Makefile.am | 151 +++++++------
{common/linux => client/x11}/ffmpeg_inc.h.in | 0
common/Makefile.am | 11 +
common/autogen.sh | 1 +
common/configure.ac | 33 +++
common/configure.ac.shared | 1 +
common/spice-common.pc.in | 6 +
configure.ac | 308 +-------------------------
configure.ac.shared | 282 +++++++++++++++++++++++
server/Makefile.am | 38 ++-
server/autogen.sh | 1 +
server/configure.ac | 49 ++++
server/configure.ac.shared | 1 +
{common/linux => server}/ffmpeg_inc.h.in | 2 -
spice.pc.in => server/spice-server.pc.in | 0
32 files changed, 767 insertions(+), 563 deletions(-)
create mode 100755 autogen.sh.shared
create mode 120000 client/autogen.sh
create mode 100644 client/configure.ac
create mode 100644 client/configure.ac.shared
rename {common/win => client/windows}/ffmpeg_inc.h (100%)
copy {common/linux => client/x11}/ffmpeg_inc.h.in (100%)
create mode 120000 common/autogen.sh
create mode 100644 common/configure.ac
create mode 100644 common/configure.ac.shared
create mode 100644 common/spice-common.pc.in
create mode 100644 configure.ac.shared
create mode 120000 server/autogen.sh
create mode 100644 server/configure.ac
create mode 100644 server/configure.ac.shared
rename {common/linux => server}/ffmpeg_inc.h.in (98%)
rename spice.pc.in => server/spice-server.pc.in (100%)
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Spice-space-devel mailing list
Spice-space-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spice-space-devel
