aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--benchtests/Makefile5
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e16c5577b4..f26f8f8f1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2016-04-20 Siddhesh Poyarekar <sid@reserved-bit.com>
+ * benchtests/Makefile (bench-clean): Clean up extra-objs.
+
* benchtests/README: Update README to include instructions on
using bench-build.
diff --git a/benchtests/Makefile b/benchtests/Makefile
index a05974ec85..779eb395d5 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -112,7 +112,9 @@ cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \
lib := nonlib
include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
-extra-objs += json-lib.o
+bench-extra-objs = json-lib.o
+
+extra-objs += $(bench-extra-objs)
bench-deps := bench-skeleton.c bench-timing.h Makefile
@@ -127,6 +129,7 @@ bench-clean:
rm -f $(binaries-benchset) $(addsuffix .o,$(binaries-benchset))
rm -f $(binaries-bench-malloc) $(addsuffix .o,$(binaries-bench-malloc))
rm -f $(timing-type) $(addsuffix .o,$(timing-type))
+ rm -f $(addprefix $(objpfx),$(bench-extra-objs))
bench: $(timing-type) $(gen-locales) bench-build bench-set bench-func \
bench-malloc