summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 92f1cd8..13cd4c2 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ LDLIBS=-lpthread src/libupb.a
# of the scheme we use that compiles the same source file multiple times with
# different -D options, which can include different header files.
deps: gen-deps.sh Makefile $(CORE) $(STREAM)
- @CPPFLAGS="$(CPPFLAGS)" ./gen-deps.sh $(CORE) $(STREAM)
+ @CPPFLAGS="$(CPPFLAGS)" ./gen-deps.sh $(CORE) $(STREAM) $(TOOLS)
@echo Regenerating dependencies for src/...
$(ALLSRC): perf-cppflags
@@ -68,6 +68,9 @@ STREAM= \
src/upb_msg.c \
src/upb_glue.c \
+TOOLS= \
+ src/upbc.c
+
# Parts of core that are yet to be converted.
OTHERSRC=src/upb_encoder.c src/upb_text.c
@@ -222,13 +225,13 @@ tests/t.test_vs_proto2.googlemessage2: \
tests/test_table: tests/test_table.cc
@# Includes <hash_set> which is a deprecated header.
@echo CXX $<
- $(CXX) $(CXXFLAGS) $(CPPFLAGS) -Wno-deprecated -o $@ $< $(LIBUPB)
+ @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -Wno-deprecated -o $@ $< $(LIBUPB)
tests/tests: src/libupb.a
# Tools
tools: src/upbc
-tools/upbc: $(LIBUPB)
+src/upbc: $(LIBUPB)
# Benchmarks. ##################################################################
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback