Fix up Makefile.am.

c++/Makefile.am

@@ -12,9 +12,10 @@ EXTRA_DIST =                                                                 \
   COPYING.txt                                                                \
   CONTRIBUTORS.txt                                                           \
   CHANGES.txt                                                                \
-  $(capnpc_inputs)
+  $(capnpc_inputs)                                                           \
+  $(test_capnpc_inputs)
 
-CLEANFILES = $(capnpc_outputs) test_capnpc_middleman
+CLEANFILES = $(capnpc_outputs) $(test_capnpc_outputs) capnpc_middleman test_capnpc_middleman
 
 # Deletes all the files generated by autoreconf.
 MAINTAINERCLEANFILES =   \
@@ -39,6 +40,26 @@ MAINTAINERCLEANFILES =   \
 maintainer-clean-local:
 	-rm -rf build-aux
 
+capnpc_inputs =                                                \
+  src/capnproto/c++.capnp                                      \
+  src/capnproto/schema.capnp
+
+capnpc_outputs =                                               \
+  src/capnproto/c++.capnp.c++                                  \
+  src/capnproto/c++.capnp.h                                    \
+  src/capnproto/schema.capnp.c++                               \
+  src/capnproto/schema.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
+# around in the generated Makefile a bit but couldn't figure it out.  I give
+# up.  Automake is terrible.
+capnpc_middleman:
+	$(CAPNPC) -oc++ $(capnpc_inputs)
+	touch capnpc_middleman
+
+$(capnpc_outputs): capnpc_middleman
+
 includecapnpdir = $(includedir)/capnproto
 
 includecapnp_HEADERS =                                         \
@@ -55,6 +76,8 @@ includecapnp_HEADERS =                                         \
   src/capnproto/serialize.h                                    \
   src/capnproto/serialize-packed.h                             \
   src/capnproto/generated-header-support.h
+nodist_includecapnp_HEADERS =                                  \
+  src/capnproto/schema.capnp.h
 
 # No dynamic library for now since C++ binary compatibility is hard.
 # It may make more sense to have every module statically link Cap'n Proto
@@ -80,6 +103,8 @@ libcapnproto_a_SOURCES=                                        \
   src/capnproto/io.c++                                         \
   src/capnproto/serialize.c++                                  \
   src/capnproto/serialize-packed.c++
+nodist_libcapnproto_a_SOURCES =                                \
+  src/capnproto/schema.capnp.c++
 
 # Source files intentionally not included in the dist at this time:
 #  src/capnproto/serialize-snappy*
@@ -87,30 +112,27 @@ libcapnproto_a_SOURCES=                                        \
 
 # Tests ==============================================================
 
-capnpc_inputs =                                                \
-  src/capnproto/c++.capnp                                      \
+test_capnpc_inputs =                                           \
   src/capnproto/test.capnp                                     \
   src/capnproto/test-import.capnp
 
-capnpc_outputs =                                               \
-  src/capnproto/c++.capnp.c++                                  \
-  src/capnproto/c++.capnp.h                                    \
+test_capnpc_outputs =                                          \
   src/capnproto/test.capnp.c++                                 \
   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
+# This should depend on $(test_capnpc_inputs), but then make mysteriously complains
 # about a cyclic dependency.  I don't know where it is coming from.  I rummaged
 # around in the generated Makefile a bit but couldn't figure it out.  I give
 # up.  Automake is terrible.
 test_capnpc_middleman:
-	$(CAPNPC) -oc++ $(capnpc_inputs)
+	$(CAPNPC) -oc++ $(test_capnpc_inputs)
 	touch test_capnpc_middleman
 
-$(capnpc_outputs): test_capnpc_middleman
+$(test_capnpc_outputs): test_capnpc_middleman
 
-BUILT_SOURCES = $(capnpc_outputs)
+BUILT_SOURCES = $(test_capnpc_outputs) $(capnpc_outputs)
 
 check_PROGRAMS = capnproto-test
 capnproto_test_LDADD = -lgtest -lgtest_main libcapnproto.a
@@ -128,6 +150,6 @@ capnproto_test_SOURCES =                                       \
   src/capnproto/serialize-packed-test.c++                      \
   src/capnproto/test-util.c++                                  \
   src/capnproto/test-util.h
-nodist_capnproto_test_SOURCES = $(capnpc_outputs)
+nodist_capnproto_test_SOURCES = $(test_capnpc_outputs)
 
 TESTS = capnproto-test