diff options
| author |  Josh Haberman <jhaberman@gmail.com> | 2016-01-12 08:56:17 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-01-12 08:56:17 -0800 |
| commit | 7e74a02b17a5c2f6e67402455e9f32c360219ada (patch) | |
| tree | 550661378c4ca430ef07964f61e532a84fa64cd5 /conformance | |
| parent | 043ca2b84b96803afa8943a7a13c5557268d8a73 (diff) | |
Don't generate Objective C WKT for conformance tests to avoid dupliate defs.
Diffstat (limited to 'conformance')
| -rw-r--r-- | conformance/Makefile.am | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am index 288c6cbc..9703101a 100644 --- a/conformance/Makefile.am +++ b/conformance/Makefile.am @@ -1,7 +1,9 @@ ## Process this file with automake to produce Makefile.in -protoc_inputs = \ - conformance.proto \ +conformance_protoc_inputs = \ + conformance.proto + +well_known_type_protoc_inputs = \ $(top_srcdir)/src/google/protobuf/any.proto \ $(top_srcdir)/src/google/protobuf/duration.proto \ $(top_srcdir)/src/google/protobuf/field_mask.proto \ @@ -82,8 +84,10 @@ endif if USE_EXTERNAL_PROTOC -protoc_middleman: $(protoc_inputs) - $(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_out=. --objc_out=. --python_out=.$^ +# Some implementations include pre-generated versions of well-known types. +protoc_middleman: $(conformance_protoc_inputs) $(well_known_type_protoc_inputs) + $(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_out=. --objc_out=. --python_out=. $(conformance_protoc_inputs) + $(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_out=. --python_out=. $(well_known_type_protoc_inputs) touch protoc_middleman else @@ -91,8 +95,9 @@ else # We have to cd to $(srcdir) before executing protoc because $(protoc_inputs) is # relative to srcdir, which may not be the same as the current directory when # building out-of-tree. -protoc_middleman: $(top_srcdir)/src/protoc$(EXEEXT) $(protoc_inputs) - oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd --ruby_out=$$oldpwd --objc_out=$$oldpwd --python_out=$$oldpwd $(protoc_inputs) ) +protoc_middleman: $(top_srcdir)/src/protoc$(EXEEXT) $(conformance_protoc_inputs) $(well_known_type_protoc_inputs) + oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd --ruby_out=$$oldpwd --objc_out=$$oldpwd --python_out=$$oldpwd $(conformance_protoc_inputs) ) + oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd --ruby_out=$$oldpwd --python_out=$$oldpwd $(well_known_type_protoc_inputs) ) touch protoc_middleman endif |