From 9035e23d81d54a2bc7e44de68bb2f0f292c2cb24 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Sat, 22 Dec 2012 22:32:57 +0000 Subject: [PATCH] Add openldap submodule with a symlink for liblmdb. --- .gitmodules | 3 +++ deps/Makefile | 7 +++++++ deps/liblmdb | 1 + openldap | 1 + src/Makefile | 2 +- 5 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 120000 deps/liblmdb create mode 160000 openldap diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..6a39abff --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "openldap"] + path = openldap + url = git://git.openldap.org/openldap.git diff --git a/deps/Makefile b/deps/Makefile index d58ee568..910911d7 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -34,6 +34,7 @@ endif 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 @@ -47,6 +48,12 @@ hiredis: .make-prerequisites .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) diff --git a/deps/liblmdb b/deps/liblmdb new file mode 120000 index 00000000..160a5bb6 --- /dev/null +++ b/deps/liblmdb @@ -0,0 +1 @@ +../openldap/libraries/liblmdb \ No newline at end of file diff --git a/openldap b/openldap new file mode 160000 index 00000000..057e0686 --- /dev/null +++ b/openldap @@ -0,0 +1 @@ +Subproject commit 057e0686303444d56f29a7bee0536e261fdf0b6a diff --git a/src/Makefile b/src/Makefile index 204a2714..4049442b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,7 +15,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') OPTIMIZATION?=-O2 -DEPENDENCY_TARGETS=hiredis linenoise lua +DEPENDENCY_TARGETS=hiredis liblmdb linenoise lua # Default settings STD= -std=c99 -pedantic -- 2.45.2