diff options
| author | Adam Cozzette <acozzette@google.com> | 2017-01-06 12:01:26 -0800 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2017-01-10 13:18:47 -0800 |
| commit | 790fc9387c3f4b0d08953f740d4d561af95ce3a6 (patch) | |
| tree | ea379dae60b31bc9639dbad77c62053f09c5f9a1 | |
| parent | 531ebd9b94364f32a2df6d932a429c18752b75c7 (diff) | |
| download | protobuf-790fc9387c3f4b0d08953f740d4d561af95ce3a6.tar.gz protobuf-790fc9387c3f4b0d08953f740d4d561af95ce3a6.tar.bz2 protobuf-790fc9387c3f4b0d08953f740d4d561af95ce3a6.zip | |
Fixed "make distcheck" for the Autotools build
To make the test pass I needed to fix out-of-tree builds and update
EXTRA_DIST and CLEANFILES.
| -rw-r--r-- | src/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 1c8b4f6e..b0531069 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -57,7 +57,8 @@ clean-local: CLEANFILES = $(protoc_outputs) unittest_proto_middleman \ testzip.jar testzip.list testzip.proto testzip.zip \ no_warning_test.cc \ - google/protobuf/compiler/js/well_known_types_embed.cc + google/protobuf/compiler/js/well_known_types_embed.cc \ + js_embed$(EXEEXT) MAINTAINERCLEANFILES = \ Makefile.in @@ -493,7 +494,7 @@ protoc_SOURCES = google/protobuf/compiler/main.cc # well_known_types_embed.cc, which is generated from .js source files. We have # to build the js_embed binary using $(CXX_FOR_BUILD) so that it is executable # on the build machine in a cross-compilation setup. -js_embed$(EXEEXT): google/protobuf/compiler/js/embed.cc +js_embed$(EXEEXT): $(srcdir)/google/protobuf/compiler/js/embed.cc $(CXX_FOR_BUILD) -o $@ $< js_well_known_types_sources = \ google/protobuf/compiler/js/well_known_types/any.js \ @@ -576,6 +577,7 @@ EXTRA_DIST = \ google/protobuf/package_info.h \ google/protobuf/io/package_info.h \ google/protobuf/util/package_info.h \ + google/protobuf/compiler/js/embed.cc \ google/protobuf/compiler/ruby/ruby_generated_code.proto \ google/protobuf/compiler/ruby/ruby_generated_code_pb.rb \ google/protobuf/compiler/package_info.h \ |