From 5c05a24ba14b1942309a703866aac76772f5f201 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Tue, 22 Jun 2010 10:35:03 +0200
Subject: Convert client to use indirect calls for message marshalling

This is required to support multiple versions
---
 client/Makefile.am | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'client/Makefile.am')

diff --git a/client/Makefile.am b/client/Makefile.am
index fb69ce64..5c0ec8d2 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -3,17 +3,13 @@ NULL =
 SUBDIRS = . $(red_target)
 DIST_SUBDIRS = x11 #windows
 
-spice_built_sources = generated_demarshallers.cpp generated_marshallers.cpp generated_marshallers.h
+spice_built_sources = generated_demarshallers.cpp generated_marshallers.cpp
 
 generated_demarshallers.cpp: $(top_srcdir)/spice.proto
 	$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include common.h --include messages.h $(top_srcdir)/spice.proto generated_demarshallers.cpp
 
-STRUCTS=
 generated_marshallers.cpp: $(top_srcdir)/spice.proto
-	$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers $(STRUCTS) --include messages.h --client $(top_srcdir)/spice.proto generated_marshallers.cpp
-
-generated_marshallers.h: $(top_srcdir)/spice.proto
-	$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers $(STRUCTS) --client -H $(top_srcdir)/spice.proto generated_marshallers.h
+	$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include messages.h --include marshallers.h --client $(top_srcdir)/spice.proto generated_marshallers.cpp
 
 if SUPPORT_GL
 GL_SRCS =				\
@@ -46,10 +42,10 @@ RED_COMMON_SRCS =			\
 	cmd_line_parser.h		\
 	common.h			\
 	demarshallers.h			\
+	marshallers.h			\
 	generated_demarshallers.cpp	\
 	marshaller.cpp			\
 	generated_marshallers.cpp	\
-	generated_marshallers.h		\
 	cursor_channel.cpp		\
 	cursor_channel.h		\
 	cursor.cpp			\
-- 
cgit