From 32da405cbd0ad3b9964c72d07d8fe921f815fb32 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Tue, 6 Sep 2011 15:18:26 +0200 Subject: Use AC_PATH_PROG for protoc-c Also move PROTOC_C substution directly into src/protoc-c.sh.in instead of src/Makefile.am --- src/Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index fe69d24..fb88fc6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,12 +15,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 protoc-c.sh +EXTRA_DIST = mumble.proto messages.txt gen_messages.sed messages.h: $(srcdir)/messages.txt $(srcdir)/gen_messages.sed $(AM_V_GEN) LC_ALL=C $(SED) -f $(srcdir)/gen_messages.sed $< > $@ mumble.pb-c.c mumble.pb-c.h: $(srcdir)/mumble.proto - $(AM_V_GEN) PROTOC_C=$(PROTOBUF_EXECUTABLE) \ - $(srcdir)/protoc-c.sh $< $@ + $(AM_V_GEN) $(builddir)/protoc-c.sh $< $@ -- cgit