| Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame] | 1 | From 81bc5928cdc1b432656eb6590967306d8cf3ac9d Mon Sep 17 00:00:00 2001 |
| 2 | From: Jianchuan Wang <jianchuan.wang@windriver.com> |
| 3 | Date: Tue, 4 Aug 2015 10:22:21 +0800 |
| 4 | Subject: [PATCH] protobuf-c: Remove the rules which depend on the native |
| 5 | command |
| 6 | |
| 7 | Those rules are not for cross-compile since the command protoc-c/cxx-generate-packed-data |
| 8 | need be executed to generate some local files in the compiling processing. |
| 9 | |
| 10 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> |
| 11 | --- |
| 12 | Makefile.am | 13 +++++++------ |
| 13 | 1 file changed, 7 insertions(+), 6 deletions(-) |
| 14 | |
| 15 | diff --git a/Makefile.am b/Makefile.am |
| 16 | index 310aa09..0602e96 100644 |
| 17 | --- a/Makefile.am |
| 18 | +++ b/Makefile.am |
| 19 | @@ -148,17 +148,18 @@ t_generated_code2_cxx_generate_packed_data_CXXFLAGS = \ |
| 20 | t_generated_code2_cxx_generate_packed_data_LDADD = \ |
| 21 | $(protobuf_LIBS) |
| 22 | |
| 23 | -t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-c$(EXEEXT) $(top_srcdir)/t/test.proto |
| 24 | - $(AM_V_GEN)$(top_builddir)/protoc-c/protoc-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto |
| 25 | +t/test.pb-c.c t/test.pb-c.h: $(top_srcdir)/t/test.proto |
| 26 | + $(AM_V_GEN)protoc-c -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto |
| 27 | |
| 28 | -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 |
| 29 | - $(AM_V_GEN)$(top_builddir)/protoc-c/protoc-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto |
| 30 | +t/test-full.pb-c.c t/test-full.pb-c.h: $(top_srcdir)/t/test-full.proto |
| 31 | + $(AM_V_GEN)protoc-c -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto |
| 32 | |
| 33 | t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto |
| 34 | $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto |
| 35 | |
| 36 | -t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT) |
| 37 | - $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc |
| 38 | +t/generated-code2/test-full-cxx-output.inc: |
| 39 | + mkdir -p $(top_builddir)/t/generated-code2 |
| 40 | + $(AM_V_GEN)cxx-generate-packed-data > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc |
| 41 | |
| 42 | BUILT_SOURCES += \ |
| 43 | t/test.pb-c.c t/test.pb-c.h \ |
| 44 | -- |
| 45 | 1.9.1 |
| 46 | |