aboutsummaryrefslogtreecommitdiffhomepage
path: root/conformance/Makefile.am
diff options
context:
space:
mode:
authorGravatar Feng Xiao <xfxyjwf@gmail.com>2015-12-22 14:36:04 -0800
committerGravatar Feng Xiao <xfxyjwf@gmail.com>2015-12-28 14:18:49 -0800
commitb7610f129df84d7f823f64d5dce9bfa1578cf49e (patch)
tree0da8267d920a3c6c5b20ae983d09c8d8967ee0cd /conformance/Makefile.am
parent7f82325998a1812c119eb8894bc3bee21dd99628 (diff)
Add missing files to EXTRA_DIST.
Also delete some unused files.
Diffstat (limited to 'conformance/Makefile.am')
-rw-r--r--conformance/Makefile.am21
1 files changed, 20 insertions, 1 deletions
diff --git a/conformance/Makefile.am b/conformance/Makefile.am
index c3551a45..89d87d3e 100644
--- a/conformance/Makefile.am
+++ b/conformance/Makefile.am
@@ -16,8 +16,27 @@ other_language_protoc_outputs = \
bin_PROGRAMS = conformance-test-runner conformance-cpp
+# All source files excepet C++/Objective-C ones should be explicitly listed
+# here because the autoconf tools don't include files of other languages
+# automatically.
+EXTRA_DIST = \
+ ConformanceJava.java \
+ README.md \
+ conformance.proto \
+ conformance_python.py \
+ conformance_ruby.rb \
+ failure_list_cpp.txt \
+ failure_list_csharp.txt \
+ failure_list_java.txt \
+ failure_list_objc.txt \
+ failure_list_python.txt \
+ failure_list_python_cpp.txt \
+ failure_list_ruby.txt
+
conformance_test_runner_LDADD = $(top_srcdir)/src/libprotobuf.la
-conformance_test_runner_SOURCES = conformance_test.cc conformance_test_runner.cc \
+conformance_test_runner_SOURCES = conformance_test.h conformance_test.cc \
+ conformance_test_runner.cc \
+ third_party/jsoncpp/json.h \
third_party/jsoncpp/jsoncpp.cpp
nodist_conformance_test_runner_SOURCES = conformance.pb.cc
conformance_test_runner_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)