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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 6737030: third_party/protobuf: update to upstream r371 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « third_party/protobuf/python/setup.py ('k') | third_party/protobuf/src/google/protobuf/compiler/code_generator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ## Process this file with automake to produce Makefile.in 1 ## Process this file with automake to produce Makefile.in
2 2
3 if HAVE_ZLIB 3 if HAVE_ZLIB
4 GZCHECKPROGRAMS = zcgzip zcgunzip 4 GZCHECKPROGRAMS = zcgzip zcgunzip
5 GZHEADERS = google/protobuf/io/gzip_stream.h 5 GZHEADERS = google/protobuf/io/gzip_stream.h
6 GZTESTS = google/protobuf/io/gzip_stream_unittest.sh 6 GZTESTS = google/protobuf/io/gzip_stream_unittest.sh
7 else 7 else
8 GZCHECKPROGRAMS = 8 GZCHECKPROGRAMS =
9 GZHEADERS = 9 GZHEADERS =
10 GZTESTS = 10 GZTESTS =
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 google/protobuf/compiler/parser.h \ 70 google/protobuf/compiler/parser.h \
71 google/protobuf/compiler/plugin.h \ 71 google/protobuf/compiler/plugin.h \
72 google/protobuf/compiler/plugin.pb.h \ 72 google/protobuf/compiler/plugin.pb.h \
73 google/protobuf/compiler/cpp/cpp_generator.h \ 73 google/protobuf/compiler/cpp/cpp_generator.h \
74 google/protobuf/compiler/java/java_generator.h \ 74 google/protobuf/compiler/java/java_generator.h \
75 google/protobuf/compiler/python/python_generator.h 75 google/protobuf/compiler/python/python_generator.h
76 76
77 lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la 77 lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
78 78
79 libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) 79 libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
80 libprotobuf_lite_la_LDFLAGS = -version-info 6:0:0 -export-dynamic -no-undefined 80 libprotobuf_lite_la_LDFLAGS = -version-info 7:0:0 -export-dynamic -no-undefined
81 libprotobuf_lite_la_SOURCES = \ 81 libprotobuf_lite_la_SOURCES = \
82 google/protobuf/stubs/common.cc \ 82 google/protobuf/stubs/common.cc \
83 google/protobuf/stubs/once.cc \ 83 google/protobuf/stubs/once.cc \
84 google/protobuf/stubs/hash.cc \
85 google/protobuf/stubs/hash.h \ 84 google/protobuf/stubs/hash.h \
86 google/protobuf/stubs/map-util.h \ 85 google/protobuf/stubs/map-util.h \
87 google/protobuf/stubs/stl_util-inl.h \ 86 google/protobuf/stubs/stl_util-inl.h \
88 google/protobuf/extension_set.cc \ 87 google/protobuf/extension_set.cc \
89 google/protobuf/generated_message_util.cc \ 88 google/protobuf/generated_message_util.cc \
90 google/protobuf/message_lite.cc \ 89 google/protobuf/message_lite.cc \
91 google/protobuf/repeated_field.cc \ 90 google/protobuf/repeated_field.cc \
92 google/protobuf/wire_format_lite.cc \ 91 google/protobuf/wire_format_lite.cc \
93 google/protobuf/io/coded_stream.cc \ 92 google/protobuf/io/coded_stream.cc \
94 google/protobuf/io/coded_stream_inl.h \ 93 google/protobuf/io/coded_stream_inl.h \
95 google/protobuf/io/zero_copy_stream.cc \ 94 google/protobuf/io/zero_copy_stream.cc \
96 google/protobuf/io/zero_copy_stream_impl_lite.cc 95 google/protobuf/io/zero_copy_stream_impl_lite.cc
97 96
98 libprotobuf_la_LIBADD = $(PTHREAD_LIBS) 97 libprotobuf_la_LIBADD = $(PTHREAD_LIBS)
99 libprotobuf_la_LDFLAGS = -version-info 6:0:0 -export-dynamic -no-undefined 98 libprotobuf_la_LDFLAGS = -version-info 7:0:0 -export-dynamic -no-undefined
100 libprotobuf_la_SOURCES = \ 99 libprotobuf_la_SOURCES = \
101 $(libprotobuf_lite_la_SOURCES) \ 100 $(libprotobuf_lite_la_SOURCES) \
102 google/protobuf/stubs/strutil.cc \ 101 google/protobuf/stubs/strutil.cc \
103 google/protobuf/stubs/strutil.h \ 102 google/protobuf/stubs/strutil.h \
104 google/protobuf/stubs/substitute.cc \ 103 google/protobuf/stubs/substitute.cc \
105 google/protobuf/stubs/substitute.h \ 104 google/protobuf/stubs/substitute.h \
106 google/protobuf/stubs/structurally_valid.cc \ 105 google/protobuf/stubs/structurally_valid.cc \
107 google/protobuf/descriptor.cc \ 106 google/protobuf/descriptor.cc \
108 google/protobuf/descriptor.pb.cc \ 107 google/protobuf/descriptor.pb.cc \
109 google/protobuf/descriptor_database.cc \ 108 google/protobuf/descriptor_database.cc \
110 google/protobuf/dynamic_message.cc \ 109 google/protobuf/dynamic_message.cc \
111 google/protobuf/extension_set_heavy.cc \ 110 google/protobuf/extension_set_heavy.cc \
112 google/protobuf/generated_message_reflection.cc \ 111 google/protobuf/generated_message_reflection.cc \
113 google/protobuf/message.cc \ 112 google/protobuf/message.cc \
114 google/protobuf/reflection_ops.cc \ 113 google/protobuf/reflection_ops.cc \
115 google/protobuf/service.cc \ 114 google/protobuf/service.cc \
116 google/protobuf/text_format.cc \ 115 google/protobuf/text_format.cc \
117 google/protobuf/unknown_field_set.cc \ 116 google/protobuf/unknown_field_set.cc \
118 google/protobuf/wire_format.cc \ 117 google/protobuf/wire_format.cc \
119 google/protobuf/io/gzip_stream.cc \ 118 google/protobuf/io/gzip_stream.cc \
120 google/protobuf/io/printer.cc \ 119 google/protobuf/io/printer.cc \
121 google/protobuf/io/tokenizer.cc \ 120 google/protobuf/io/tokenizer.cc \
122 google/protobuf/io/zero_copy_stream_impl.cc \ 121 google/protobuf/io/zero_copy_stream_impl.cc \
123 google/protobuf/compiler/importer.cc \ 122 google/protobuf/compiler/importer.cc \
124 google/protobuf/compiler/parser.cc 123 google/protobuf/compiler/parser.cc
125 124
126 libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la 125 libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la
127 libprotoc_la_LDFLAGS = -version-info 6:0:0 -export-dynamic -no-undefined 126 libprotoc_la_LDFLAGS = -version-info 7:0:0 -export-dynamic -no-undefined
128 libprotoc_la_SOURCES = \ 127 libprotoc_la_SOURCES = \
129 google/protobuf/compiler/code_generator.cc \ 128 google/protobuf/compiler/code_generator.cc \
130 google/protobuf/compiler/command_line_interface.cc \ 129 google/protobuf/compiler/command_line_interface.cc \
131 google/protobuf/compiler/plugin.cc \ 130 google/protobuf/compiler/plugin.cc \
132 google/protobuf/compiler/plugin.pb.cc \ 131 google/protobuf/compiler/plugin.pb.cc \
133 google/protobuf/compiler/subprocess.cc \ 132 google/protobuf/compiler/subprocess.cc \
134 google/protobuf/compiler/subprocess.h \ 133 google/protobuf/compiler/subprocess.h \
135 google/protobuf/compiler/zip_writer.cc \ 134 google/protobuf/compiler/zip_writer.cc \
136 google/protobuf/compiler/zip_writer.h \ 135 google/protobuf/compiler/zip_writer.h \
137 google/protobuf/compiler/cpp/cpp_enum.cc \ 136 google/protobuf/compiler/cpp/cpp_enum.cc \
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 google/protobuf/compiler/java/java_helpers.cc \ 170 google/protobuf/compiler/java/java_helpers.cc \
172 google/protobuf/compiler/java/java_helpers.h \ 171 google/protobuf/compiler/java/java_helpers.h \
173 google/protobuf/compiler/java/java_message.cc \ 172 google/protobuf/compiler/java/java_message.cc \
174 google/protobuf/compiler/java/java_message.h \ 173 google/protobuf/compiler/java/java_message.h \
175 google/protobuf/compiler/java/java_message_field.cc \ 174 google/protobuf/compiler/java/java_message_field.cc \
176 google/protobuf/compiler/java/java_message_field.h \ 175 google/protobuf/compiler/java/java_message_field.h \
177 google/protobuf/compiler/java/java_primitive_field.cc \ 176 google/protobuf/compiler/java/java_primitive_field.cc \
178 google/protobuf/compiler/java/java_primitive_field.h \ 177 google/protobuf/compiler/java/java_primitive_field.h \
179 google/protobuf/compiler/java/java_service.cc \ 178 google/protobuf/compiler/java/java_service.cc \
180 google/protobuf/compiler/java/java_service.h \ 179 google/protobuf/compiler/java/java_service.h \
180 google/protobuf/compiler/java/java_string_field.cc \
181 google/protobuf/compiler/java/java_string_field.h \
181 google/protobuf/compiler/python/python_generator.cc 182 google/protobuf/compiler/python/python_generator.cc
182 183
183 bin_PROGRAMS = protoc 184 bin_PROGRAMS = protoc
184 protoc_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la 185 protoc_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la
185 protoc_SOURCES = google/protobuf/compiler/main.cc 186 protoc_SOURCES = google/protobuf/compiler/main.cc
186 187
187 # Tests ============================================================== 188 # Tests ==============================================================
188 189
189 protoc_inputs = \ 190 protoc_inputs = \
190 google/protobuf/unittest.proto \ 191 google/protobuf/unittest.proto \
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 if HAVE_ZLIB 354 if HAVE_ZLIB
354 zcgzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la 355 zcgzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la
355 zcgzip_SOURCES = google/protobuf/testing/zcgzip.cc 356 zcgzip_SOURCES = google/protobuf/testing/zcgzip.cc
356 357
357 zcgunzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la 358 zcgunzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la
358 zcgunzip_SOURCES = google/protobuf/testing/zcgunzip.cc 359 zcgunzip_SOURCES = google/protobuf/testing/zcgunzip.cc
359 endif 360 endif
360 361
361 TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ 362 TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
362 google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) 363 google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)
OLDNEW
« no previous file with comments | « third_party/protobuf/python/setup.py ('k') | third_party/protobuf/src/google/protobuf/compiler/code_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698