瀏覽代碼

Merge pull request #263 from tamird/gitignore

Clean up generated files
Feng Xiao 10 年之前
父節點
當前提交
a56d1309e4
共有 3 個文件被更改,包括 4 次插入3 次删除
  1. 1 0
      .gitignore
  2. 3 3
      src/Makefile.am
  3. 0 0
      src/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto

+ 1 - 0
.gitignore

@@ -27,6 +27,7 @@ src/Makefile
 /config.h
 config.log
 config.status
+pbconfig.h
 
 libtool
 protobuf-lite.pc

+ 3 - 3
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
 

+ 0 - 0
src/google/protobuf/compiler/cpp/test_large_enum_value.proto → src/google/protobuf/compiler/cpp/cpp_test_large_enum_value.proto