From f6ad36a3583101d1d25701e768f757065727dc2c Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Mon, 11 Jul 2011 15:30:18 +0200 Subject: Add protoc-c wrapper build script - Fixes simultaneous generation of mumble.pb-c.[ch] - Fixes out of source build (protoc-c's --c_out=. is somewhat broken since it outputs relative to the input files) --- src/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index da12479..da656a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,10 +13,11 @@ AM_CFLAGS = $(GCC_FLAGS) BUILT_SOURCES = $(nodist_cmumble_SOURCES) $(nodist_noinst_HEADERS) CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = mumble.proto messages.txt gen_messages.sed +EXTRA_DIST = mumble.proto messages.txt gen_messages.sed protoc-c.sh messages.h: $(top_srcdir)/src/messages.txt $(top_srcdir)/src/gen_messages.sed $(AM_V_GEN) $(SED) -f $(top_srcdir)/src/gen_messages.sed $< > $@ -mumble.pb-c.c mumble.pb-c.h: mumble.proto - $(AM_V_GEN) $(PROTOBUF_EXECUTABLE) --c_out=. $< +mumble.pb-c.c mumble.pb-c.h: $(top_srcdir)/src/mumble.proto + $(AM_V_GEN) PROTOC_C=$(PROTOBUF_EXECUTABLE) $(top_srcdir)/src/protoc-c.sh $< $@ + -- cgit