- don't try to overwrite read-only enums.h - DIST_SUBDIRS is no longer needed --- Makefile.am | 1 - common/Makefile.am | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 79f7903..30c4f37 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,6 @@ NULL = ACLOCAL_AMFLAGS = -I m4 SUBDIRS = python_modules common spice-protocol -DIST_SUBDIRS = spice-protocol $(SUBDIRS) EXTRA_DIST = \ spice_codegen.py \ diff --git a/common/Makefile.am b/common/Makefile.am index 3210fc8..5f2c6e5 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -122,7 +122,10 @@ 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) +# 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) $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-enums $< $@ >/dev/null EXTRA_DIST = \ -- 1.7.10.4 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel