diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-17 18:50:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 18:50:04 -0700 |
| commit | d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e (patch) | |
| tree | 6224f98ad30e99dc2d896423853892f2142f16ed /conformance/Makefile.am | |
| parent | 22503a01722939385a7584c3b65f1c43dc5b2ef8 (diff) | |
| parent | 8356d270a54e18c21f4feac6f5e2b6f1061dc8d5 (diff) | |
| download | protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.gz protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.tar.bz2 protobuf-d85ffdce419eb3e5b8444e2fed7c9e13f3b9637e.zip | |
Merge pull request #4924 from xfxyjwf/3.6.x
Cherry-pick master build fixes and kokoro changes to 3.6.x
Diffstat (limited to 'conformance/Makefile.am')
| -rw-r--r-- | conformance/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am index 765f3588..e51ab80a 100644 --- a/conformance/Makefile.am +++ b/conformance/Makefile.am @@ -279,8 +279,6 @@ $(protoc_outputs): protoc_middleman $(other_language_protoc_outputs): protoc_middleman -BUILT_SOURCES = $(protoc_outputs) $(other_language_protoc_outputs) - CLEANFILES = $(protoc_outputs) protoc_middleman javac_middleman conformance-java javac_middleman_lite conformance-java-lite conformance-csharp conformance-php conformance-php-c $(other_language_protoc_outputs) MAINTAINERCLEANFILES = \ |