summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2011-06-25 12:29:24 +0200
committerantirez <antirez@gmail.com>2011-06-25 12:29:24 +0200
commit994ed2bc552f4114b1f0c8dd3fd8aefaec6beeae (patch)
tree16c7f8d3c7f050a5cda04488d48109ee7f02b6fb /Makefile
parent45ec3243f8205ff8d356a5175026052070211d91 (diff)
parentd5b36c5114659e979fc2e102954ded1e30aacacf (diff)
downloadredis-994ed2bc552f4114b1f0c8dd3fd8aefaec6beeae.tar.gz
unstable merge conflicts resolved
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 335f83213..20c4f86ef 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ clean:
cd src && $(MAKE) $@
cd deps/hiredis && $(MAKE) $@
cd deps/linenoise && $(MAKE) $@
+ cd deps/jemalloc && $(MAKE) distclean
cd deps/lua && $(MAKE) $@
$(TARGETS):