summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2011-08-20 00:00:18 -0700
committerJoshua Haberman <jhaberman@gmail.com>2011-08-20 00:00:18 -0700
commitd5324d1d5c177287364bac51a9fc82717829d42f (patch)
tree0d783afc9ef5d46511911381b8124313f44ab504 /Makefile
parent7935b702c5e66e99b0ad2d0b61bb7a7de44dd2ca (diff)
Some Makefile cleanup.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile37
1 files changed, 9 insertions, 28 deletions
diff --git a/Makefile b/Makefile
index 3fef33d..c7befe5 100644
--- a/Makefile
+++ b/Makefile
@@ -65,17 +65,14 @@ endif
# Unfortuantely we can't easily generate deps for benchmarks or tests because
# 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)
- $(Q) CPPFLAGS="$(CPPFLAGS)" ./gen-deps.sh $(CORE) $(STREAM)
+ALLSRC=$(shell find . -name '*.c' -print | grep -v perf-tmp)
+deps: gen-deps.sh Makefile $(ALLSRC)
+ $(Q) CPPFLAGS="$(CPPFLAGS)" ./gen-deps.sh $(ALLSRC)
$(E) Regenerating dependencies for upb/...
-$(ALLSRC): perf-cppflags
-
# Source files. ###############################################################
-# Every source file used in upb should appear here.
-
# The core library.
CORE= \
upb/upb.c \
@@ -93,26 +90,6 @@ PB= \
upb/pb/glue.c \
upb/pb/textprinter.c \
-# Parts of core that are yet to be converted.
-OTHERSRC=upb/pb/encoder.c
-
-BENCHMARKS_SRC= \
- benchmarks/main.c \
- benchmarks/parsestream.upb.c \
- benchmarks/parsetostruct.upb.c
-
-TESTS_SRC= \
- tests/test_decoder.c \
- tests/test_def.c \
- tests/tests.c \
- tests/tests_varint.c \
-
- #tests/test_vs_proto2.cc
-
- #tests/test_stream.c \
-
-ALLSRC=$(CORE) $(STREAM) $(BENCHMARKS_SRC) $(TESTS_SRC)
-
# Rules. #######################################################################
@@ -188,8 +165,6 @@ endif
# Function to expand a wildcard pattern recursively.
rwildcard=$(strip $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2)$(filter $(subst *,%,$2),$d)))
-
-
# Regenerating the auto-generated files in upb/.
upb/descriptor.pb: upb/descriptor.proto
@# TODO: replace with upbc
@@ -316,6 +291,12 @@ benchmarks/google_messages.proto.pb: benchmarks/google_messages.proto
benchmarks/google_messages.pb.cc: benchmarks/google_messages.proto
protoc benchmarks/google_messages.proto --cpp_out=.
+# This basic idea is useful (varying the benchmarks' setup by recompiling
+# several times with different #defines) but the implementation in this
+# Makefile is verbose and error-prone. Open to better ideas here. I don't
+# want to make these command-line parameters -- it makes it more annoying to
+# debug or profile them.
+
benchmarks/b.parsetostruct_googlemessage1.upb_table_byval \
benchmarks/b.parsetostruct_googlemessage2.upb_table_byval: \
benchmarks/parsetostruct.upb.c $(LIBUPB) benchmarks/google_messages.proto.pb
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback