aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2016-04-27 18:22:22 -0700
committerJosh Haberman <jhaberman@gmail.com>2016-04-27 18:22:22 -0700
commit2e83110230b7e91b07835e9c718a1d6fbcb8b617 (patch)
tree85737c7424dab1c232d95665c584d1a69fd2f992 /Makefile.am
parentf53f911793c3024976f80211e0c976f5cc51f88d (diff)
downloadprotobuf-2e83110230b7e91b07835e9c718a1d6fbcb8b617.tar.gz
protobuf-2e83110230b7e91b07835e9c718a1d6fbcb8b617.tar.bz2
protobuf-2e83110230b7e91b07835e9c718a1d6fbcb8b617.zip
Added framework for generating/consuming benchmarking data sets.
This takes the code that was sitting in benchmarks/ already and makes it easier for language-specific benchmarks to consume. Future PRs will enhance this so that the language-specific benchmarks can report metrics back that will be tracked over time in PerfKit.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index a7a1f413..3e988816 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = . src
# Always include gmock in distributions.
-DIST_SUBDIRS = $(subdirs) src conformance
+DIST_SUBDIRS = $(subdirs) src conformance benchmarks
# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS
# because then "make check" would also build and run all of gmock's own tests,
@@ -36,6 +36,10 @@ clean-local:
echo "Making clean in conformance"; \
cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
fi; \
+ if test -e benchmarks/Makefile; then \
+ echo "Making clean in benchmarks"; \
+ cd benchmarks && $(MAKE) $(AM_MAKEFLAGS) clean; \
+ fi; \
if test -e objectivec/DevTools; then \
echo "Cleaning any ObjC pyc files"; \
rm -f objectivec/DevTools/*.pyc; \