Now that spice-protocol is no longer a submodule, it's no longer
possible to automatically overwrite enums.h within the spice-protocol
submodule when spice.proto changes in the spice-common module.
This commit replaces this with manual generation of this file with
'make -C common/ enums.h'
This enums.h file is shipped by spice-protocol, and contains enum
definitions used by the SPICE protocol. It's generated from the
spice.proto/spice1.proto files, so must be updated whenever they change.
---
common/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/Makefile.am b/common/Makefile.am
index 4abd89c..683f3c3 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -14,7 +14,7 @@ SERVER_MARSHALLERS = \
generated_server_marshallers.h \
$(NULL)
-BUILT_SOURCES = $(CLIENT_MARSHALLERS) $(SERVER_MARSHALLERS)
$(top_srcdir)/spice-protocol/spice/enums.h
+BUILT_SOURCES = $(CLIENT_MARSHALLERS) $(SERVER_MARSHALLERS)
noinst_LTLIBRARIES = libspice-common.la libspice-common-server.la
libspice-common-client.la
libspice_common_la_SOURCES = \
@@ -139,7 +139,7 @@ generated_server_marshallers.h: $(top_srcdir)/spice.proto
$(MARSHALLERS_DEPS)
# this is going to upset automake distcheck, since we try to write to
# readonly srcdir. To limit the fail chances, rebuild automatically
# enums.h only if the spice.proto has changed.
-$(top_srcdir)/spice-protocol/spice/enums.h: $(top_srcdir)/spice.proto #
$(MARSHALLERS_DEPS)
+enums.h: $(top_srcdir)/spice.proto # $(MARSHALLERS_DEPS)
$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-enums $<
$@ >/dev/null
EXTRA_DIST = \
--
2.1.0
_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel
