summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlas Kirazci <ulas@google.com>2013-07-09 17:14:58 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-07-09 17:14:59 +0000
commiteda87c5cad8cf84768bcb31d4762c6ec35a6b87d (patch)
tree29a67674c5ae715e08b54a00f0ad73a306d8176b
parent728a8b78917ded5ea0f3f9c331810aedcb5353f9 (diff)
parent37168637d1b1ad9aa0c11c0c254c4de9bfa16b1d (diff)
downloadexternal_protobuf-eda87c5cad8cf84768bcb31d4762c6ec35a6b87d.zip
external_protobuf-eda87c5cad8cf84768bcb31d4762c6ec35a6b87d.tar.gz
external_protobuf-eda87c5cad8cf84768bcb31d4762c6ec35a6b87d.tar.bz2
Merge "Fix vanilla make build."
-rw-r--r--src/Makefile.am1
-rw-r--r--src/Makefile.in1
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 \