summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoshua Haberman <joshua@reverberate.org>2010-07-17 12:56:04 -0700
committerJoshua Haberman <joshua@reverberate.org>2010-07-17 12:56:04 -0700
commit87b2c69c15716b96a294f5918878fb8b7b9a0b40 (patch)
tree22dcd3ac6d958fe172fcb521f931243f576ddf44 /Makefile
parent5b5e26144ddcfcbbee8b6df843a7d169d4cf1eea (diff)
Fleshed out upb_stdio and upb_textprinter.
test_decoder now compiles and links! But it doesn't work yet.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 166ca3a..10ef96d 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ rwildcard=$(strip $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2)$(filter $
CC=gcc
CXX=g++
CFLAGS=-std=c99
-INCLUDE=-Idescriptor -Icore -Itests -I.
+INCLUDE=-Idescriptor -Icore -Itests -Istream -I.
CPPFLAGS=-Wall -Wextra -g $(INCLUDE) $(strip $(shell test -f perf-cppflags && cat perf-cppflags))
LDLIBS=-lpthread
@@ -47,7 +47,7 @@ clean:
# The core library (core/libupb.a)
SRC=core/upb.c stream/upb_decoder.c core/upb_table.c core/upb_def.c core/upb_string.c \
- core/upb_stream.c \
+ core/upb_stream.c stream/upb_stdio.c stream/upb_textprinter.c \
descriptor/descriptor.c
$(SRC): perf-cppflags
# Parts of core that are yet to be converted.
@@ -90,7 +90,8 @@ tests/test.proto.pb: tests/test.proto
TESTS=tests/test_string \
tests/test_table \
- tests/test_def
+ tests/test_def \
+ tests/test_decoder
tests: $(TESTS)
OTHER_TESTS=tests/tests \
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback