diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-03-21 14:42:35 +0100 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2012-03-25 18:59:10 +0200 |
commit | 359fc1cb5dbbcf32132c3e8ee6f881a23deff684 (patch) | |
tree | 3ae7cc1c8b4d0449d50a13cb9640a6ef75f51f11 /server/tests | |
parent | 4df135c858d7dfb1aa0ae5d3cb17d786410d1544 (diff) | |
download | spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.tar.gz spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.tar.xz spice-359fc1cb5dbbcf32132c3e8ee6f881a23deff684.zip |
Use the spice-common submodule
This patch will replace the common/ directory with the spice-common
project. It is for now a simple project subdirectory shared with
spice-gtk, but the goal is to make it a proper library later on.
With this change, the spice-server build is broken. The following
commits fix the build, and have been seperated to ease the review.
v2
- moves all the generated marshallers to spice-common library
- don't attempt to fix windows VS build, which should somehow be
splitted with spice-common (or built from tarball only to avoid
generation tools/libs deps)
v3
- uses libspice-common-client
- fix a mutex.h inclusion reported by Alon
Diffstat (limited to 'server/tests')
-rw-r--r-- | server/tests/Makefile.am | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am index 52e55a88..e77865c7 100644 --- a/server/tests/Makefile.am +++ b/server/tests/Makefile.am @@ -1,21 +1,22 @@ NULL = -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/common \ - -I$(top_srcdir)/server \ - -I$(top_srcdir)/server/tests \ - $(PROTOCOL_CFLAGS) \ - $(SPICE_NONPKGCONFIG_CFLAGS) \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/common \ + -I$(top_srcdir)/server \ + -I$(top_srcdir)/server/tests \ + $(COMMON_CFLAGS) \ + $(SMARTCARD_CFLAGS) \ + $(SPICE_NONPKGCONFIG_CFLAGS) \ $(NULL) if SUPPORT_AUTOMATED_TESTS INCLUDES += -DAUTOMATED_TESTS endif -LDADD = \ - $(top_builddir)/common/libspice-common.la \ - $(top_builddir)/server/libspice-server.la \ +LDADD = \ + $(top_builddir)/spice-common/common/libspice-common.la \ + $(top_builddir)/server/libspice-server.la \ $(NULL) COMMON_BASE = \ |