build-sys: fix make distcheck

- don't try to overwrite read-only enums.h
- DIST_SUBDIRS is no longer needed
This commit is contained in:
Marc-André Lureau 2012-07-16 16:05:55 +02:00
parent 7eba850ad5
commit 735e431671
2 changed files with 4 additions and 2 deletions

View File

@ -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 \

View File

@ -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 = \