diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2014-03-19 15:41:07 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2014-04-16 16:47:55 +0200 |
| commit | ef14521ac5218ca876e29173470fdb41a0cc821c (patch) | |
| tree | 7970a3260d60b2f85adfc87fafbad18e98126a83 | |
| parent | 6e5ea8d802ac8b2b92cb6f483a308ee196efe29a (diff) | |
Use #include "common/..." in (de)marshallers
Now that they are created in $builddir, their includes will need to refer
to files in $srcdir, which can be different. It's cleaner to add
-I $(top_srcdir)/spice-common/ to modules using spice-common rather than
having -I $(top_srcdir)/spice-common/common which would could create header
collisions.
| -rw-r--r-- | python_modules/demarshal.py | 2 | ||||
| -rw-r--r-- | python_modules/marshal.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/python_modules/demarshal.py b/python_modules/demarshal.py index cf48d74..794cd25 100644 --- a/python_modules/demarshal.py +++ b/python_modules/demarshal.py @@ -1250,7 +1250,7 @@ def write_includes(writer): writer.writeln("#include <stdio.h>") writer.writeln("#include <spice/protocol.h>") writer.writeln("#include <spice/macros.h>") - writer.writeln('#include "mem.h"') + writer.writeln('#include "common/mem.h"') writer.newline() writer.writeln("#ifdef _MSC_VER") writer.writeln("#pragma warning(disable:4101)") diff --git a/python_modules/marshal.py b/python_modules/marshal.py index 4020799..ae5fe31 100644 --- a/python_modules/marshal.py +++ b/python_modules/marshal.py @@ -4,7 +4,7 @@ import codegen def write_includes(writer): writer.header.writeln("#include <spice/protocol.h>") - writer.header.writeln('#include "marshaller.h"') + writer.header.writeln('#include "common/marshaller.h"') writer.header.newline() writer.header.writeln("#ifndef _GENERATED_HEADERS_H") writer.header.writeln("#define _GENERATED_HEADERS_H") @@ -15,7 +15,7 @@ def write_includes(writer): writer.writeln("#include <stdio.h>") writer.writeln("#include <spice/protocol.h>") writer.writeln("#include <spice/macros.h>") - writer.writeln('#include "marshaller.h"') + writer.writeln('#include "common/marshaller.h"') writer.newline() writer.writeln("#ifdef _MSC_VER") writer.writeln("#pragma warning(disable:4101)") |