Oops, add missing file from imports change and update Makefile.am.

c++/Makefile.am

@@ -84,11 +84,14 @@ libcapnproto_a_SOURCES=                                        \
 # Tests ==============================================================
 
 capnpc_inputs =                                                \
-  src/capnproto/test.capnp
+  src/capnproto/test.capnp                                     \
+  src/capnproto/test-import.capnp
 
 capnpc_outputs =                                               \
   src/capnproto/test.capnp.c++                                 \
-  src/capnproto/test.capnp.h
+  src/capnproto/test.capnp.h                                   \
+  src/capnproto/test-import.capnp.c++                          \
+  src/capnproto/test-import.capnp.h
 
 # This should depend on $(capnpc_inputs), but then make mysteriously complains
 # about a cyclic dependency.  I don't know where it is coming from.  I rummaged

c++/src/capnproto/test-import.capnp

+# Copyright (c) 2013, Kenton Varda <temporal@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this
+#    list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using Test = import "test.capnp";
+
+struct TestImport {
+  field @0 :Test.TestAllTypes;
+}