Change the API for getting the bootstrapped defs.

The symtab that contains them is now hidden, and
you can look them up by name but there is no access
to the symtab itself, so there is no risk of
mutating it (by extending it, adding other defs
to it, etc).

1 files changed, 12 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index f2bd34e..6801f63 100644
--- a/Makefile
+++ b/Makefile
@@ -179,22 +179,28 @@ tests/test.proto.pb: tests/test.proto
 	@# TODO: replace with upbc
 	protoc tests/test.proto -otests/test.proto.pb
 
-TESTS= \
+SIMPLE_TESTS= \
   tests/test_string \
-  tests/test_table \
   tests/test_def \
   tests/test_stream \
+  tests/tests
+#    tests/test_decoder \
+
+SIMPLE_CXX_TESTS= \
+  tests/test_table
+
+VARIADIC_TESTS= \
   tests/t.test_vs_proto2.googlemessage1 \
   tests/t.test_vs_proto2.googlemessage2 \
-  tests/test.proto.pb \
-  tests/tests
 
-#    tests/test_decoder \
+TESTS=$(SIMPLE_TESTS) $(SIMPLE_CXX_TESTS) $(VARIADIC_TESTS)
+
 
 tests: $(TESTS)
 $(TESTS): $(LIBUPB)
+tests/tests: tests/test.proto.pb
 
-% : %.c
+$(SIMPLE_TESTS): % : %.c
 	$(E) CC $<
 	$(Q) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
@@ -237,9 +243,6 @@ tests/test_table: tests/test_table.cc
 
 tests/tests: src/libupb.a
 
-# Tools
-tools: src/upbc
-src/upbc: $(LIBUPB)
 
 # Benchmarks. ##################################################################