diff options
| author | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-25 20:17:53 +0000 |
|---|---|---|
| committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-25 20:17:53 +0000 |
| commit | 1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3 (patch) | |
| tree | b2a894794db1f6147214e356c20f754e270f4e7f /src/Makefile.am | |
| parent | 786379af4766fa7ec22b51862ba6e84156b1f9cb (diff) | |
| download | protobuf-1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3.tar.gz protobuf-1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3.tar.bz2 protobuf-1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3.zip | |
merge tags/2.6.0 into trunk
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9592f6f6..b32635da 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,6 +43,7 @@ nobase_include_HEADERS = \ google/protobuf/stubs/atomicops_internals_arm64_gcc.h \ google/protobuf/stubs/atomicops_internals_arm_qnx.h \ google/protobuf/stubs/atomicops_internals_atomicword_compat.h \ + google/protobuf/stubs/atomicops_internals_generic_gcc.h \ google/protobuf/stubs/atomicops_internals_macosx.h \ google/protobuf/stubs/atomicops_internals_mips_gcc.h \ google/protobuf/stubs/atomicops_internals_pnacl.h \ @@ -52,6 +53,7 @@ nobase_include_HEADERS = \ google/protobuf/stubs/common.h \ google/protobuf/stubs/platform_macros.h \ google/protobuf/stubs/once.h \ + google/protobuf/stubs/stl_util.h \ google/protobuf/stubs/template_util.h \ google/protobuf/stubs/type_traits.h \ google/protobuf/descriptor.h \ @@ -102,7 +104,6 @@ libprotobuf_lite_la_SOURCES = \ google/protobuf/stubs/hash.h \ google/protobuf/stubs/map_util.h \ google/protobuf/stubs/shared_ptr.h \ - google/protobuf/stubs/stl_util.h \ google/protobuf/stubs/stringprintf.cc \ google/protobuf/stubs/stringprintf.h \ google/protobuf/extension_set.cc \ |