[Spice-commits] common/Makefile.am

[GitLab Mirror]

 common/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bcfa711d90839c7c4c50310db67f0d5912a3824
Author: Uri Lublin <uril at redhat.com>
Date:   Mon Apr 22 16:17:29 2019 +0300

    codegen Makefile: add common/ to --include client_marshallers.h
    
    Fixes out-of-tree builds.
    
    For example spice-gtk out-of-tree build fails with:
      ../subprojects/spice-common/common/generated_client_marshallers.h:19:10:
          fatal error: client_marshallers.h: No such file or directory
       #include "client_marshallers.h"
                ^~~~~~~~~~~~~~~~~~~~~~
    
    Signed-off-by: Uri Lublin <uril at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/common/Makefile.am b/common/Makefile.am
index 2dd6d04..a904dae 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -114,7 +114,7 @@ generated_client_demarshallers.c generated_messages.h: $(top_srcdir)/spice.proto
 	--generated-declaration-file generated_messages.h $< $@ >/dev/null
 
 generated_client_marshallers.c generated_client_marshallers.h: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS)
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include client_marshallers.h --client \
+	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include common/client_marshallers.h --client \
 	--generate-header $< $@ >/dev/null
 
 generated_server_demarshallers.c: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS)