This file was hand generated until now, resulting in the wierd situation where it is different for spice-gtk and spice-server even though they both use the same spice-common and spice-protocol (or at least close) versions. This patch generates the enums.h files from spice-common. While that file is actually in the spice-protocol submodule, it cannot be generated from spice-protocol since it lacks access to spice.proto and spice_codegen.py. So in affect whenvever it will differ the spice-protocol module will become dirty and hence hopefully commited with the new enums.h. enums.h is generated from spice.proto is a superset of that generated from spice1.proto. --- common/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/Makefile.am b/common/Makefile.am index 08c4b83..3210fc8 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -14,7 +14,7 @@ SERVER_MARSHALLERS = \ $(srcdir)/generated_server_marshallers.h \ $(NULL) -BUILT_SOURCES = $(CLIENT_MARSHALLERS) $(SERVER_MARSHALLERS) +BUILT_SOURCES = $(CLIENT_MARSHALLERS) $(SERVER_MARSHALLERS) $(top_srcdir)/spice-protocol/spice/enums.h noinst_LTLIBRARIES = libspice-common.la libspice-common-server.la libspice-common-client.la libspice_common_la_SOURCES = \ @@ -122,6 +122,9 @@ generated_server_marshallers.c: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) generated_server_marshallers.h: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers $(STRUCTS) --server --include messages.h -H $< $@ >/dev/null +$(top_srcdir)/spice-protocol/spice/enums.h: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) + $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-enums $< $@ >/dev/null + EXTRA_DIST = \ $(CLIENT_MARSHALLERS) \ $(SERVER_MARSHALLERS) \ -- 1.7.10.1 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel