diff options
| author | Jisi Liu <liujisi@google.com> | 2016-07-29 14:27:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-29 14:27:53 -0700 |
| commit | 169d0ca43c5663c1b36cf4918f08aa031f5df468 (patch) | |
| tree | 4781b8c492591d73e7eea2b2abd4c546baf1d135 /src/Makefile.am | |
| parent | 42e54876be41fdf0b22dea4e4ea7f416d5d1f3ec (diff) | |
| parent | c4790429fc454a687312a48a22e30d93c29efd4d (diff) | |
| download | protobuf-169d0ca43c5663c1b36cf4918f08aa031f5df468.tar.gz protobuf-169d0ca43c5663c1b36cf4918f08aa031f5df468.tar.bz2 protobuf-169d0ca43c5663c1b36cf4918f08aa031f5df468.zip | |
Merge pull request #1893 from google/3.0.0-GA
Merge 3.0.0-GA into master
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 524886ea..f70e9550 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,6 +33,10 @@ AM_LDFLAGS = $(PTHREAD_CFLAGS) # If I say "dist_include_DATA", automake complains that $(includedir) is not # a "legitimate" directory for DATA. Screw you, automake. protodir = $(includedir) + +# If you are adding new files here, also remember to change the build files for +# all other languages, //protoc-artifacts/build-zip.sh and run +# //update_file_list.sh for bazel. nobase_dist_proto_DATA = google/protobuf/descriptor.proto \ google/protobuf/any.proto \ google/protobuf/api.proto \ |