diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2015-11-24 02:05:55 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2015-11-25 14:05:42 +0100 |
| commit | 56a0cf2dad7d2dc4b75b379fdd5d0da63a827a1a (patch) | |
| tree | ed4a965a886beca42922e0d3d08588d0ddb3728d | |
| parent | 401801b5ba38ccfdc6a0873a2ae4af273c22b4f3 (diff) | |
| download | spice-common-56a0cf2dad7d2dc4b75b379fdd5d0da63a827a1a.tar.gz spice-common-56a0cf2dad7d2dc4b75b379fdd5d0da63a827a1a.tar.xz spice-common-56a0cf2dad7d2dc4b75b379fdd5d0da63a827a1a.zip | |
Fix make distcheck
Fix make distcheck both with standalone spice-common and with spice
server.
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/test-marshallers.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 4b138fe..4d9cf59 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ NULL = ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = common +SUBDIRS = common tests MAINTAINERCLEANFILES = \ $(srcdir)/INSTALL \ diff --git a/tests/Makefile.am b/tests/Makefile.am index cde46e4..518e63f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -9,7 +9,7 @@ test_marshallers_SOURCES = \ test-marshallers.h \ $(NULL) test_marshallers_CFLAGS = \ - -I$(top_srcdir)/common \ + -I$(top_srcdir) \ $(GLIB2_CFLAGS) \ $(PROTOCOL_CFLAGS) \ $(NULL) @@ -45,6 +45,7 @@ generated_test_marshallers.h: $(srcdir)/test-marshallers.proto $(MARSHALLERS_DEP EXTRA_DIST = \ $(TEST_MARSHALLERS) \ + test-marshallers.proto \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/tests/test-marshallers.c b/tests/test-marshallers.c index e3e4d09..d2c80e5 100644 --- a/tests/test-marshallers.c +++ b/tests/test-marshallers.c @@ -1,8 +1,8 @@ #include <glib.h> #include <string.h> -#include <marshaller.h> -#include <generated_test_marshallers.h> +#include "common/marshaller.h" +#include "generated_test_marshallers.h" static uint8_t expected_data[] = { 0x02, 0x00, 0x00, 0x00, /* data_size */ 0x08, 0x00, 0x00, 0x00, /* data offset */ |