diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2015-03-31 10:44:05 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-03-31 10:44:05 -0700 |
| commit | a56d1309e44c9516c8f9d482472a75bc6ffb7f50 (patch) | |
| tree | 1754bc96fef52a15e160b9b3c5da55fcea3e1d5e | |
| parent | 86d93063c6d662e7cae91ff8a2adf39b4d93fe53 (diff) | |
| parent | b63d432add765a9938dbd76f93cbfb9e1150ec47 (diff) | |
Merge pull request #263 from tamird/gitignore
Clean up generated files
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto (renamed from src/google/protobuf/compiler/cpp/test_large_enum_value.proto) | 0 |
3 files changed, 4 insertions, 3 deletions
@@ -27,6 +27,7 @@ src/Makefile /config.h config.log config.status +pbconfig.h libtool protobuf-lite.pc diff --git a/src/Makefile.am b/src/Makefile.am index 8a27b823..7811b0ae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -322,7 +322,7 @@ protoc_inputs = \ google/protobuf/unittest_preserve_unknown_enum2.proto \ google/protobuf/unittest_proto3_arena.proto \ google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto \ - google/protobuf/compiler/cpp/test_large_enum_value.proto + google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto EXTRA_DIST = \ $(protoc_inputs) \ @@ -398,8 +398,8 @@ protoc_outputs = \ google/protobuf/unittest_preserve_unknown_enum2.pb.h \ google/protobuf/unittest_proto3_arena.pb.cc \ google/protobuf/unittest_proto3_arena.pb.h \ - google/protobuf/compiler/cpp/test_large_enum_value.pb.cc \ - google/protobuf/compiler/cpp/test_large_enum_value.pb.h \ + google/protobuf/compiler/cpp/cpp_test_large_enum_value.pb.cc \ + google/protobuf/compiler/cpp/cpp_test_large_enum_value.pb.h \ google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.cc \ google/protobuf/compiler/cpp/cpp_test_bad_identifiers.pb.h diff --git a/src/google/protobuf/compiler/cpp/test_large_enum_value.proto b/src/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto index cb6ca1b1..cb6ca1b1 100644 --- a/src/google/protobuf/compiler/cpp/test_large_enum_value.proto +++ b/src/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto |