diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2015-07-17 11:36:29 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-07-17 11:36:29 -0700 |
| commit | 4dde2a87a99a79fb2b7f9c42a6de68d0b0f44954 (patch) | |
| tree | e49a90594084c56925dd5eafa2ed933dd2adf862 /src/Makefile.am | |
| parent | 7b216119eeb6761596cfe506863ff010b7f05da8 (diff) | |
| parent | 2f4fb642a36560e6b586f55cabf0d9caf7b55afe (diff) | |
Merge branch 'master' of github.com:google/protobuf into splitheader
Change-Id: I5f6cbc2430200e3751ad754cc7ae604338db6f91
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 3a07bbb3..3553f974 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -72,6 +72,7 @@ nobase_include_HEADERS = \ google/protobuf/stubs/atomicops_internals_x86_gcc.h \ google/protobuf/stubs/atomicops_internals_x86_msvc.h \ google/protobuf/stubs/callback.h \ + google/protobuf/stubs/bytestream.h \ google/protobuf/stubs/casts.h \ google/protobuf/stubs/common.h \ google/protobuf/stubs/fastmem.h \ @@ -85,7 +86,9 @@ nobase_include_HEADERS = \ google/protobuf/stubs/scoped_ptr.h \ google/protobuf/stubs/shared_ptr.h \ google/protobuf/stubs/singleton.h \ + google/protobuf/stubs/status.h \ google/protobuf/stubs/stl_util.h \ + google/protobuf/stubs/stringpiece.h \ google/protobuf/stubs/template_util.h \ google/protobuf/stubs/type_traits.h \ google/protobuf/any.pb.h \ |