Commit ee0a2434 authored by Adam Cozzette's avatar Adam Cozzette

Updated Makefile.am to fix out-of-tree builds

parent d1e7bd98
...@@ -494,8 +494,10 @@ js_well_known_types_sources = \ ...@@ -494,8 +494,10 @@ js_well_known_types_sources = \
google/protobuf/compiler/js/well_known_types/any.js \ google/protobuf/compiler/js/well_known_types/any.js \
google/protobuf/compiler/js/well_known_types/struct.js \ google/protobuf/compiler/js/well_known_types/struct.js \
google/protobuf/compiler/js/well_known_types/timestamp.js google/protobuf/compiler/js/well_known_types/timestamp.js
# We have to cd to $(srcdir) so that out-of-tree builds work properly.
google/protobuf/compiler/js/well_known_types_embed.cc: js_embed$(EXEEXT) $(js_well_known_types_sources) google/protobuf/compiler/js/well_known_types_embed.cc: js_embed$(EXEEXT) $(js_well_known_types_sources)
./js_embed$(EXEEXT) $(js_well_known_types_sources) > $@ oldpwd=`pwd` && cd $(srcdir) && \
$$oldpwd/js_embed$(EXEEXT) $(js_well_known_types_sources) > $$oldpwd/$@
# Tests ============================================================== # Tests ==============================================================
...@@ -549,6 +551,7 @@ protoc_inputs = \ ...@@ -549,6 +551,7 @@ protoc_inputs = \
EXTRA_DIST = \ EXTRA_DIST = \
$(protoc_inputs) \ $(protoc_inputs) \
$(js_well_known_types_sources) \
solaris/libstdc++.la \ solaris/libstdc++.la \
google/protobuf/io/gzip_stream.h \ google/protobuf/io/gzip_stream.h \
google/protobuf/io/gzip_stream_unittest.sh \ google/protobuf/io/gzip_stream_unittest.sh \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment