diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-03-25 18:38:09 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-03-25 18:38:09 +0200 |
| commit | fb24e4e28bad0b0e2bb670deb9fb56223be49ada (patch) | |
| tree | 6a485200064dea29653ea43795c200a49f429c8e | |
| parent | c1e4e1be639d81119c7d7b35446e98f54775a353 (diff) | |
build-sys: split client marshallers in seperate lib
| -rw-r--r-- | common/Makefile.am | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index c9068a5..08c4b83 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,11 +1,11 @@ NULL = # Avoid need for python(pyparsing) by end users -MARSHALLERS = \ - $(srcdir)/generated_demarshallers.c \ - $(srcdir)/generated_demarshallers1.c \ - $(srcdir)/generated_marshallers.c \ - $(srcdir)/generated_marshallers1.c \ +CLIENT_MARSHALLERS = \ + $(srcdir)/generated_client_demarshallers.c \ + $(srcdir)/generated_client_demarshallers1.c \ + $(srcdir)/generated_client_marshallers.c \ + $(srcdir)/generated_client_marshallers1.c \ $(NULL) SERVER_MARSHALLERS = \ @@ -14,11 +14,10 @@ SERVER_MARSHALLERS = \ $(srcdir)/generated_server_marshallers.h \ $(NULL) -BUILT_SOURCES = $(MARSHALLERS) $(SERVER_MARSHALLERS) +BUILT_SOURCES = $(CLIENT_MARSHALLERS) $(SERVER_MARSHALLERS) -noinst_LTLIBRARIES = libspice-common.la libspice-common-server.la +noinst_LTLIBRARIES = libspice-common.la libspice-common-server.la libspice-common-client.la libspice_common_la_SOURCES = \ - $(MARSHALLERS) \ backtrace.c \ backtrace.h \ bitops.h \ @@ -58,6 +57,10 @@ libspice_common_la_SOURCES = \ ssl_verify.h \ $(NULL) +libspice_common_client_la_SOURCES = \ + $(CLIENT_MARSHALLERS) \ + $(NULL) + libspice_common_server_la_SOURCES = \ $(SERVER_MARSHALLERS) \ $(NULL) @@ -97,16 +100,16 @@ MARSHALLERS_DEPS = \ # Note despite being autogenerated these are not part of CLEANFILES, they are # actually a part of EXTRA_DIST, to avoid the need for pyparser by end users -generated_demarshallers.c: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) +generated_client_demarshallers.c: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include messages.h $< $@ >/dev/null -generated_demarshallers1.c: $(top_srcdir)/spice1.proto $(MARSHALLERS_DEPS) +generated_client_demarshallers1.c: $(top_srcdir)/spice1.proto $(MARSHALLERS_DEPS) $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include messages.h --prefix 1 --ptrsize 8 $< $@ >/dev/null -generated_marshallers.c: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) +generated_client_marshallers.c: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include messages.h --include client_marshallers.h --client $< $@ >/dev/null -generated_marshallers1.c: $(top_srcdir)/spice1.proto $(MARSHALLERS_DEPS) +generated_client_marshallers1.c: $(top_srcdir)/spice1.proto $(MARSHALLERS_DEPS) $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers -P --include messages.h --include client_marshallers.h --client --prefix 1 --ptrsize 8 $< $@ >/dev/null generated_server_demarshallers.c: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) @@ -120,7 +123,7 @@ generated_server_marshallers.h: $(top_srcdir)/spice.proto $(MARSHALLERS_DEPS) $(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-marshallers $(STRUCTS) --server --include messages.h -H $< $@ >/dev/null EXTRA_DIST = \ - $(MARSHALLERS) \ + $(CLIENT_MARSHALLERS) \ $(SERVER_MARSHALLERS) \ canvas_base.c \ canvas_base.h \ |