From 1cd26b87c10870ea9bfb65b4640d2e318b45aafb Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Thu, 10 Mar 2016 15:18:06 +0100 Subject: Revert "Remove files moved to spice-protocol" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7665dcf1bb2fa0b16b3d0015b28d7f5912664c3f. Also revert the related build-sys changes to fix the build. codegen generated code depends on spice-common code (marshaller, messages etc), it makes more sense to keep the generator along this. Otherwise a newer protocol release will fail to build older projects. *.proto files are required as well, since it generates code that parent modules depend on unconditionnaly. Signed-off-by: Marc-André Lureau --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index fde03e7..2ff985d 100644 --- a/configure.ac +++ b/configure.ac @@ -29,8 +29,6 @@ SPICE_CHECK_SYSDEPS # Checks for libraries PKG_CHECK_MODULES([PROTOCOL], [spice-protocol >= 0.12.10]) -CODE_GENERATOR_BASEDIR=`${PKG_CONFIG} --variable=codegendir spice-protocol` -AC_SUBST([CODE_GENERATOR_BASEDIR]) SPICE_CHECK_PYTHON_MODULES() @@ -50,6 +48,7 @@ AC_SUBST(SPICE_COMMON_LIBS) AC_CONFIG_FILES([ Makefile common/Makefile + python_modules/Makefile tests/Makefile ]) -- cgit