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

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

Issue 636783002: Use C++11 atomics (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 ## 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 google/protobuf/compiler/plugin.pb.h \ 85 google/protobuf/compiler/plugin.pb.h \
86 google/protobuf/compiler/cpp/cpp_generator.h \ 86 google/protobuf/compiler/cpp/cpp_generator.h \
87 google/protobuf/compiler/java/java_generator.h \ 87 google/protobuf/compiler/java/java_generator.h \
88 google/protobuf/compiler/python/python_generator.h 88 google/protobuf/compiler/python/python_generator.h
89 89
90 lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la 90 lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
91 91
92 libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) 92 libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS)
93 libprotobuf_lite_la_LDFLAGS = -version-info 8:0:0 -export-dynamic -no-undefined 93 libprotobuf_lite_la_LDFLAGS = -version-info 8:0:0 -export-dynamic -no-undefined
94 libprotobuf_lite_la_SOURCES = \ 94 libprotobuf_lite_la_SOURCES = \
95 google/protobuf/stubs/atomicops_internals_x86_gcc.cc \
96 google/protobuf/stubs/atomicops_internals_x86_msvc.cc \ 95 google/protobuf/stubs/atomicops_internals_x86_msvc.cc \
97 google/protobuf/stubs/common.cc \ 96 google/protobuf/stubs/common.cc \
98 google/protobuf/stubs/once.cc \ 97 google/protobuf/stubs/once.cc \
99 google/protobuf/stubs/hash.h \ 98 google/protobuf/stubs/hash.h \
100 google/protobuf/stubs/map-util.h \ 99 google/protobuf/stubs/map-util.h \
101 google/protobuf/stubs/stl_util.h \ 100 google/protobuf/stubs/stl_util.h \
102 google/protobuf/stubs/stringprintf.cc \ 101 google/protobuf/stubs/stringprintf.cc \
103 google/protobuf/stubs/stringprintf.h \ 102 google/protobuf/stubs/stringprintf.h \
104 google/protobuf/extension_set.cc \ 103 google/protobuf/extension_set.cc \
105 google/protobuf/generated_message_util.cc \ 104 google/protobuf/generated_message_util.cc \
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 if HAVE_ZLIB 385 if HAVE_ZLIB
387 zcgzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la 386 zcgzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la
388 zcgzip_SOURCES = google/protobuf/testing/zcgzip.cc 387 zcgzip_SOURCES = google/protobuf/testing/zcgzip.cc
389 388
390 zcgunzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la 389 zcgunzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la
391 zcgunzip_SOURCES = google/protobuf/testing/zcgunzip.cc 390 zcgunzip_SOURCES = google/protobuf/testing/zcgunzip.cc
392 endif 391 endif
393 392
394 TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ 393 TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
395 google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) 394 google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698