diff options
| author | Ulas Kirazci <ulas@google.com> | 2013-07-11 08:08:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-11 08:08:16 -0700 |
| commit | 898da1a0236f67b9344527d6befe17a0062bf6f2 (patch) | |
| tree | 368caac086ae291e96ce9ae99551ff173cce97d7 | |
| parent | ed60c0dc59d20f788f9bcc4cf40ba5a8fe2ee616 (diff) | |
| parent | 7bb086c897ce5ba7d5053d6b112f7b9d37e3ae72 (diff) | |
| download | external_protobuf-898da1a0236f67b9344527d6befe17a0062bf6f2.zip external_protobuf-898da1a0236f67b9344527d6befe17a0062bf6f2.tar.gz external_protobuf-898da1a0236f67b9344527d6befe17a0062bf6f2.tar.bz2 | |
am 7bb086c8: am eda87c5c: Merge "Fix vanilla make build."
* commit '7bb086c897ce5ba7d5053d6b112f7b9d37e3ae72':
Fix vanilla make build.
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/Makefile.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 37c1565..4f82baf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -202,6 +202,7 @@ libprotoc_la_SOURCES = \ google/protobuf/compiler/javanano/javanano_enum_field.cc \ google/protobuf/compiler/javanano/javanano_enum_field.h \ google/protobuf/compiler/javanano/javanano_extension.cc \ + google/protobuf/compiler/javanano/javanano_extension.h \ google/protobuf/compiler/javanano/javanano_field.cc \ google/protobuf/compiler/javanano/javanano_field.h \ google/protobuf/compiler/javanano/javanano_file.cc \ diff --git a/src/Makefile.in b/src/Makefile.in index b0fbace..3896427 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -655,6 +655,7 @@ libprotoc_la_SOURCES = \ google/protobuf/compiler/javanano/javanano_enum_field.cc \ google/protobuf/compiler/javanano/javanano_enum_field.h \ google/protobuf/compiler/javanano/javanano_extension.cc \ + google/protobuf/compiler/javanano/javanano_extension.h \ google/protobuf/compiler/javanano/javanano_field.cc \ google/protobuf/compiler/javanano/javanano_field.h \ google/protobuf/compiler/javanano/javanano_file.cc \ |