unstable merge conflicts resolved

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index b72faa1b18c88b8a491deca9d9ebe5e3c1a95f64..20c4f86efd7871c4336b006667aaad930c5d0fdd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,8 @@ clean:
        cd src && $(MAKE) $@
        cd deps/hiredis && $(MAKE) $@
        cd deps/linenoise && $(MAKE) $@
+       cd deps/jemalloc && $(MAKE) distclean
+       cd deps/lua && $(MAKE) $@
 
 $(TARGETS):
        cd src && $(MAKE) $@