third_party/protobuf/src/Makefile.am - Issue 10793026: Roll Protobuf r415:r423.

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

Issue 10793026: Roll Protobuf r415:r423. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 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/protobuf.gyp ('k') | third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.cc » ('j') | no next file with comments »

OLD	NEW
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 22 matching lines...) Expand all Loading...
33	33

34 CLEANFILES = $(protoc_outputs) unittest_proto_middleman \	34 CLEANFILES = $(protoc_outputs) unittest_proto_middleman \

35 testzip.jar testzip.list testzip.proto testzip.zip	35 testzip.jar testzip.list testzip.proto testzip.zip

36	36

37 MAINTAINERCLEANFILES = \	37 MAINTAINERCLEANFILES = \

38 Makefile.in	38 Makefile.in

39	39

40 nobase_include_HEADERS = \	40 nobase_include_HEADERS = \

41 google/protobuf/stubs/atomicops.h \	41 google/protobuf/stubs/atomicops.h \

42 google/protobuf/stubs/atomicops_internals_arm_gcc.h \	42 google/protobuf/stubs/atomicops_internals_arm_gcc.h \

	43 google/protobuf/stubs/atomicops_internals_macosx.h \

43 google/protobuf/stubs/atomicops_internals_mips_gcc.h \	44 google/protobuf/stubs/atomicops_internals_mips_gcc.h \

44 google/protobuf/stubs/atomicops_internals_x86_gcc.h \	45 google/protobuf/stubs/atomicops_internals_x86_gcc.h \

45 google/protobuf/stubs/atomicops_internals_x86_macosx.h \

46 google/protobuf/stubs/atomicops_internals_x86_msvc.h \	46 google/protobuf/stubs/atomicops_internals_x86_msvc.h \

47 google/protobuf/stubs/common.h \	47 google/protobuf/stubs/common.h \

48 google/protobuf/stubs/platform_macros.h \	48 google/protobuf/stubs/platform_macros.h \

49 google/protobuf/stubs/once.h \	49 google/protobuf/stubs/once.h \

50 google/protobuf/descriptor.h \	50 google/protobuf/descriptor.h \

51 google/protobuf/descriptor.pb.h \	51 google/protobuf/descriptor.pb.h \

52 google/protobuf/descriptor_database.h \	52 google/protobuf/descriptor_database.h \

53 google/protobuf/dynamic_message.h \	53 google/protobuf/dynamic_message.h \

54 google/protobuf/extension_set.h \	54 google/protobuf/extension_set.h \

55 google/protobuf/generated_message_util.h \	55 google/protobuf/generated_message_util.h \

(...skipping 306 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
362 if HAVE_ZLIB	362 if HAVE_ZLIB

363 zcgzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la	363 zcgzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la

364 zcgzip_SOURCES = google/protobuf/testing/zcgzip.cc	364 zcgzip_SOURCES = google/protobuf/testing/zcgzip.cc

365	365

366 zcgunzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la	366 zcgunzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la

367 zcgunzip_SOURCES = google/protobuf/testing/zcgunzip.cc	367 zcgunzip_SOURCES = google/protobuf/testing/zcgunzip.cc

368 endif	368 endif

369	369

370 TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \	370 TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \

371 google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)	371 google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)

OLD	NEW