| From 81bc5928cdc1b432656eb6590967306d8cf3ac9d Mon Sep 17 00:00:00 2001 |
| From: Jianchuan Wang <jianchuan.wang@windriver.com> |
| Date: Tue, 4 Aug 2015 10:22:21 +0800 |
| Subject: [PATCH] protobuf-c: Remove the rules which depend on the native |
| command |
| |
| Those rules are not for cross-compile since the command protoc-c/cxx-generate-packed-data |
| need be executed to generate some local files in the compiling processing. |
| |
| Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> |
| --- |
| Makefile.am | 13 +++++++------ |
| 1 file changed, 7 insertions(+), 6 deletions(-) |
| |
| diff --git a/Makefile.am b/Makefile.am |
| index 310aa09..0602e96 100644 |
| --- a/Makefile.am |
| +++ b/Makefile.am |
| @@ -148,17 +148,18 @@ t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \ |
| t_generated_code2_cxx_generate_packed_data_LDADD = \ |
| $(protobuf_LIBS) |
| |
| -t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-c$(EXEEXT) $(top_srcdir)/t/test.proto |
| - $(AM_V_GEN)$(top_builddir)/protoc-c/protoc-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto |
| +t/test.pb-c.c t/test.pb-c.h: $(top_srcdir)/t/test.proto |
| + $(AM_V_GEN)protoc-c -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto |
| |
| -t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-c$(EXEEXT) $(top_srcdir)/t/test-full.proto |
| - $(AM_V_GEN)$(top_builddir)/protoc-c/protoc-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto |
| +t/test-full.pb-c.c t/test-full.pb-c.h: $(top_srcdir)/t/test-full.proto |
| + $(AM_V_GEN)protoc-c -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto |
| |
| t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto |
| $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto |
| |
| -t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT) |
| - $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc |
| +t/generated-code2/test-full-cxx-output.inc: |
| + mkdir -p $(top_builddir)/t/generated-code2 |
| + $(AM_V_GEN)cxx-generate-packed-data > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc |
| |
| BUILT_SOURCES += \ |
| t/test.pb-c.c t/test.pb-c.h \ |
| -- |
| 1.9.1 |
| |