Include cmake files in automake dist.

c++/Makefile.am

@@ -33,6 +33,13 @@ clean-local:
 	  cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \
 	fi
 
+# When running distcheck, verify that we've included all the files needed by
+# the cmake build.
+distcheck-hook:
+	rm -rf distcheck-cmake
+	(which cmake && mkdir distcheck-cmake && cd distcheck-cmake && cmake ../$(distdir) && make -j6 check)
+	rm -rf distcheck-cmake
+
 AM_CXXFLAGS = -I$(srcdir)/src -I$(builddir)/src -DKJ_HEADER_WARNINGS -DCAPNP_HEADER_WARNINGS -DCAPNP_INCLUDE_DIR='"$(includedir)"' $(PTHREAD_CFLAGS)
 
 AM_LDFLAGS = $(PTHREAD_CFLAGS)
@@ -50,9 +57,14 @@ EXTRA_DIST =                                                                 \
   src/capnp/testdata/errors.txt                                              \
   src/capnp/testdata/segmented                                               \
   src/capnp/testdata/packed                                                  \
-  src/capnp/testdata/pretty.txt
-
-CLEANFILES = $(test_capnpc_outputs) test_capnpc_middleman
+  src/capnp/testdata/pretty.txt                                              \
+  CMakeLists.txt                                                             \
+  cmake/FindCapnProto.cmake                                                  \
+  src/CMakeLists.txt                                                         \
+  src/kj/CMakeLists.txt                                                      \
+  src/capnp/CMakeLists.txt
+
+CLEANFILES = $(test_capnpc_outputs) test_capnpc_middleman distcheck-cmake
 
 # Deletes all the files generated by autoreconf.
 MAINTAINERCLEANFILES =   \

super-test.sh

@@ -361,7 +361,7 @@ echo "========================================================================="
 echo "Testing c++ dist"
 echo "========================================================================="
 
-doit make distcheck
+doit make -j6 distcheck
 doit make distclean
 rm capnproto-*.tar.gz