Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Side by Side Diff: third_party/protobuf/benchmarks/Makefile.am

Issue 2600753002: Reverts third_party/protobuf: Update to HEAD (f52e188fe4) (Closed)
Patch Set: Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 1
2 benchmarks_protoc_inputs = \ 2 benchmarks_protoc_inputs = \
3 benchmarks.proto \ 3 benchmarks.proto \
4 benchmark_messages_proto3.proto 4 benchmark_messages_proto3.proto
5 5
6 benchmarks_protoc_inputs_proto2 = \ 6 benchmarks_protoc_inputs_proto2 = \
7 benchmark_messages_proto2.proto 7 benchmark_messages_proto2.proto
8 8
9 benchmarks_protoc_outputs = \ 9 benchmarks_protoc_outputs = \
10 benchmarks.pb.cc \ 10 benchmarks.pb.cc \
11 benchmarks.pb.h \ 11 benchmarks.pb.h \
12 benchmark_messages_proto3.pb.cc \ 12 benchmark_messages_proto3.pb.cc \
13 benchmark_messages_proto3.pb.h 13 benchmark_messages_proto3.pb.h
14 14
15 benchmarks_protoc_outputs_proto2 = \ 15 benchmarks_protoc_outputs_proto2 = \
16 benchmark_messages_proto2.pb.cc \ 16 benchmark_messages_proto2.pb.cc \
17 benchmark_messages_proto2.pb.h 17 benchmark_messages_proto2.pb.h
18 18
19 AM_CXXFLAGS = $(NO_OPT_CXXFLAGS) $(PROTOBUF_OPT_FLAG) -Wall -Wwrite-strings -Wov erloaded-virtual -Wno-sign-compare 19 bin_PROGRAMS = generate-datasets
20
21 bin_PROGRAMS = generate-datasets cpp-benchmark
22 20
23 generate_datasets_LDADD = $(top_srcdir)/src/libprotobuf.la 21 generate_datasets_LDADD = $(top_srcdir)/src/libprotobuf.la
24 generate_datasets_SOURCES = generate_datasets.cc 22 generate_datasets_SOURCES = generate_datasets.cc
25 generate_datasets_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir) 23 generate_datasets_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)
26 nodist_generate_datasets_SOURCES = \ 24 nodist_generate_datasets_SOURCES = \
27 $(benchmarks_protoc_outputs) \ 25 $(benchmarks_protoc_outputs) \
28 $(benchmarks_protoc_outputs_proto2) 26 $(benchmarks_protoc_outputs_proto2)
29 27
30 # Explicit deps because BUILT_SOURCES are only done before a "make all/check" 28 # Explicit deps because BUILT_SOURCES are only done before a "make all/check"
31 # so a direct "make test_cpp" could fail if parallel enough. 29 # so a direct "make test_cpp" could fail if parallel enough.
32 # See: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Exam ple.html#Recording-Dependencies-manually 30 # See: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Exam ple.html#Recording-Dependencies-manually
33 generate_datasets-generate_datasets.$(OBJEXT): benchmarks.pb.h 31 generate_datasets-generate_datasets.$(OBJEXT): benchmarks.pb.h
34 32
35 cpp_benchmark_LDADD = $(top_srcdir)/src/libprotobuf.la $(top_srcdir)/third_party /benchmark/src/libbenchmark.a
36 cpp_benchmark_SOURCES = cpp_benchmark.cc
37 cpp_benchmark_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir) -I$(top_srcdir)/third_p arty/benchmark/include
38 nodist_cpp_benchmark_SOURCES = \
39 $(benchmarks_protoc_outputs) \
40 $(benchmarks_protoc_outputs_proto2)
41
42 $(benchmarks_protoc_outputs): protoc_middleman 33 $(benchmarks_protoc_outputs): protoc_middleman
43 $(benchmarks_protoc_outputs_proto2): protoc_middleman2 34 $(benchmarks_protoc_outputs_proto2): protoc_middleman2
44 35
45 CLEANFILES = \ 36 CLEANFILES = \
46 $(benchmarks_protoc_outputs) \ 37 $(benchmarks_protoc_outputs) \
47 $(benchmarks_protoc_outputs_proto2) \ 38 $(benchmarks_protoc_outputs_proto2) \
48 protoc_middleman \ 39 protoc_middleman \
49 protoc_middleman2 \ 40 protoc_middleman2 \
50 dataset.* 41 dataset.*
51 42
(...skipping 17 matching lines...) Expand all
69 # building out-of-tree. 60 # building out-of-tree.
70 protoc_middleman: $(top_srcdir)/src/protoc$(EXEEXT) $(benchmarks_protoc_inputs) $(well_known_type_protoc_inputs) 61 protoc_middleman: $(top_srcdir)/src/protoc$(EXEEXT) $(benchmarks_protoc_inputs) $(well_known_type_protoc_inputs)
71 oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I $(top_srcdir)/src --cpp_out=$$oldpwd $(benchmarks_protoc_inputs) ) 62 oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I $(top_srcdir)/src --cpp_out=$$oldpwd $(benchmarks_protoc_inputs) )
72 touch protoc_middleman 63 touch protoc_middleman
73 64
74 protoc_middleman2: $(top_srcdir)/src/protoc$(EXEEXT) $(benchmarks_protoc_inputs_ proto2) $(well_known_type_protoc_inputs) 65 protoc_middleman2: $(top_srcdir)/src/protoc$(EXEEXT) $(benchmarks_protoc_inputs_ proto2) $(well_known_type_protoc_inputs)
75 oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I $(top_srcdir)/src --cpp_out=$$oldpwd $(benchmarks_protoc_inputs_proto2) ) 66 oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I $(top_srcdir)/src --cpp_out=$$oldpwd $(benchmarks_protoc_inputs_proto2) )
76 touch protoc_middleman 67 touch protoc_middleman
77 68
78 endif 69 endif
OLDNEW
« no previous file with comments | « third_party/protobuf/autogen.sh ('k') | third_party/protobuf/benchmarks/benchmark_messages_proto2.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698