diff options
| author | Matt Stancliff <matt@genges.com> | 2014-05-12 14:38:17 -0400 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2015-06-22 09:07:13 +0200 |
| commit | 7f4ac3d19c28e0a7a608fe94411e92bc59097e11 (patch) | |
| tree | 03da237a4b47c189462d79ca915fa828a11bf680 /deps/Makefile | |
| parent | 821a986643717018cad8af9f35cba49818e60294 (diff) | |
| download | redis-7f4ac3d19c28e0a7a608fe94411e92bc59097e11.tar.gz | |
[In-Progress] Add Geo Commands
Current todo:
- replace functions in zset.{c,h} with a new unified Redis
zset access API.
Once we get the zset interface fixed, we can squash
relevant commits in this branch and have one nice commit
to merge into unstable.
This commit adds:
- Geo commands
- Tests; runnable with: ./runtest --single unit/geo
- Geo helpers in deps/geohash-int/
- src/geo.{c,h} and src/geojson.{c,h} implementing geo commands
- Updated build configurations to get everything working
- TEMPORARY: src/zset.{c,h} implementing zset score and zset
range reading without writing to client output buffers.
- Modified linkage of one t_zset.c function for use in zset.c
Conflicts:
src/Makefile
src/redis.c
Diffstat (limited to 'deps/Makefile')
| -rw-r--r-- | deps/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/deps/Makefile b/deps/Makefile index 71f6d3a2c..10ae6e790 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -36,6 +36,7 @@ distclean: -(cd hiredis && $(MAKE) clean) > /dev/null || true -(cd linenoise && $(MAKE) clean) > /dev/null || true -(cd lua && $(MAKE) clean) > /dev/null || true + -(cd geohash-int && $(MAKE) clean) > /dev/null || true -(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true -(rm -f .make-*) @@ -81,3 +82,9 @@ jemalloc: .make-prerequisites cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a .PHONY: jemalloc + +geohash-int: .make-prerequisites + @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) + cd geohash-int && $(MAKE) + +.PHONY: geohash-int |