diff options
| author | Frediano Ziglio <fziglio@redhat.com> | 2020-03-11 20:53:27 +0000 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2020-04-01 12:30:38 +0100 |
| commit | 5ed23e95ecb3a6eae638e1e210045587be4c77f3 (patch) | |
| tree | eb505555abb456cd5397adff091b0f45628d9cc6 | |
| parent | cf5a336d9b0730e7075b4b511914b45933cdc431 (diff) | |
spice-protocol: Update to get new message definitions
The EXTRA_DIST part in Makefile.am is needed as spice-protocol
removed support for Autoconf.
We don't need anymore "ignore=untracked" in the submodule as
we are not going to add or modify files anymore.
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
| -rw-r--r-- | .gitmodules | 1 | ||||
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| m--------- | spice-protocol | 0 |
4 files changed, 14 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules index 46920ea..f946a4d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,3 @@ [submodule "spice-protocol"] path = spice-protocol url = git://git.freedesktop.org/git/spice/spice-protocol.git - ignore=untracked diff --git a/Makefile.am b/Makefile.am index 79dea8b..8da212e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,8 +2,6 @@ NULL = EXTRA_DIST = mingw-spice-vdagent.spec MAINTAINERCLEANFILES = mingw-spice-vdagent.spec -DIST_SUBDIRS = spice-protocol - AM_CPPFLAGS = \ -DUNICODE \ -D_UNICODE \ @@ -140,6 +138,20 @@ EXTRA_DIST += \ vdservice/vdservice.rc \ CMakeLists.txt +## spice-protocol moved to Meson, distribute manually +EXTRA_DIST += \ + spice-protocol/spice/barrier.h \ + spice-protocol/spice/end-packed.h \ + spice-protocol/spice/enums.h \ + spice-protocol/spice/ipc_ring.h \ + spice-protocol/spice/macros.h \ + spice-protocol/spice/qxl_dev.h \ + spice-protocol/spice/qxl_windows.h \ + spice-protocol/spice/start-packed.h \ + spice-protocol/spice/types.h \ + spice-protocol/spice/vd_agent.h \ + $(NULL) + # see git-version-gen dist-hook: echo $(VERSION) > $(distdir)/.tarball-version diff --git a/configure.ac b/configure.ac index 8f25879..312b88a 100644 --- a/configure.ac +++ b/configure.ac @@ -118,7 +118,6 @@ ACX_SET_VAR(CFLAGS, "$CFLAGS $LIBPNG_CFLAGS -Wall", dnl --------------------------------------------------------------------------- dnl - Makefiles, etc. dnl --------------------------------------------------------------------------- -AC_CONFIG_SUBDIRS([spice-protocol]) AC_CONFIG_FILES([ Makefile mingw-spice-vdagent.spec diff --git a/spice-protocol b/spice-protocol -Subproject dca5931a3ac405139b8d05da68544cc43ae56d8 +Subproject 2d3324b8999b06442fd92c03b260c08a5110152 |