Add openldap submodule with a symlink for liblmdb.

[redis.git] / deps / Makefile

diff --git a/deps/Makefile b/deps/Makefile
index 7cd9c0f64451bcc0262bf606627b76f969d0ad4c..910911d72844c5b6e6202eea2ad97dc6b7fe4319 100644 (file)
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -34,6 +34,7 @@ endif
 
 distclean:
        -(cd hiredis && $(MAKE) clean) > /dev/null || true
 
 distclean:
        -(cd hiredis && $(MAKE) clean) > /dev/null || true

+       -(cd liblmdb && $(MAKE) clean) > /dev/null || true

        -(cd linenoise && $(MAKE) clean) > /dev/null || true
        -(cd lua && $(MAKE) clean) > /dev/null || true
        -(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true
        -(cd linenoise && $(MAKE) clean) > /dev/null || true
        -(cd lua && $(MAKE) clean) > /dev/null || true
        -(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true


@@ -47,6 +48,12 @@ hiredis: .make-prerequisites
 
 .PHONY: hiredis
 
 
 .PHONY: hiredis
 

+liblmdb: .make-prerequisites
+       @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+       cd liblmdb && $(MAKE) all
+
+.PHONY: liblmdb
+

 linenoise: .make-prerequisites
        @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
        cd linenoise && $(MAKE)
 linenoise: .make-prerequisites
        @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
        cd linenoise && $(MAKE)


@@ -73,6 +80,6 @@ JEMALLOC_LDFLAGS= $(LDFLAGS)
 jemalloc: .make-prerequisites
        @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
        cd jemalloc && ./configure --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
 jemalloc: .make-prerequisites
        @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
        cd jemalloc && ./configure --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"

-       cd jemalloc && $(MAKE) lib/libjemalloc.a
+       cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a

 
 .PHONY: jemalloc
 
 .PHONY: jemalloc