From a194ffae97848d8601c3483125c440931035741c Mon Sep 17 00:00:00 2001 From: BSBandme Date: Fri, 6 Jul 2018 12:25:52 -0700 Subject: Fix cpp benchmark dependency on mac --- benchmarks/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index 9f609228..b6521740 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -109,6 +109,7 @@ cpp_benchmark_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)/cpp -I$(top_srcdir)/thi # so a direct "make test_cpp" could fail if parallel enough. # See: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html#Recording-Dependencies-manually cpp/cpp_benchmark-cpp_benchmark.$(OBJEXT): $(benchmarks_protoc_outputs) $(benchmarks_protoc_outputs_proto2) $(benchmarks_protoc_outputs_header) $(benchmarks_protoc_outputs_proto2_header) $(top_srcdir)/src/libprotobuf.la $(top_srcdir)/third_party/benchmark/src/libbenchmark.a +cpp/benchmark-cpp_benchmark.$(OBJEXT): $(benchmarks_protoc_outputs) $(benchmarks_protoc_outputs_proto2) $(benchmarks_protoc_outputs_header) $(benchmarks_protoc_outputs_proto2_header) $(top_srcdir)/src/libprotobuf.la $(top_srcdir)/third_party/benchmark/src/libbenchmark.a nodist_cpp_benchmark_SOURCES = \ $(benchmarks_protoc_outputs) \ $(benchmarks_protoc_outputs_proto2) \ -- cgit v1.2.3 From 82b490f6fd8408eb6a2d2091dc8be1057876d06d Mon Sep 17 00:00:00 2001 From: BSBandme Date: Mon, 9 Jul 2018 11:37:39 -0700 Subject: Fix cpp_distcheck --- conformance/Makefile.am | 2 -- 1 file changed, 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 = \ -- cgit v1.2.3