Switch Redis to use lua from ports instead of the one that comes

bundled with it.

OK jasper@
This commit is contained in:
dcoppa 2013-01-16 13:13:03 +00:00
parent ab67366c05
commit fb1458826d
9 changed files with 274 additions and 39 deletions

View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.47 2013/01/14 08:52:24 dcoppa Exp $
# $OpenBSD: Makefile,v 1.48 2013/01/16 13:13:03 dcoppa Exp $
COMMENT = persistent key-value database
DISTNAME = redis-2.6.8
REVISION = 0
CATEGORIES = databases
HOMEPAGE = http://redis.io/
@ -13,17 +14,14 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB += c m pthread
WANTLIB += c ${MODLUA_WANTLIB} m pthread
MASTER_SITES = http://redis.googlecode.com/files/
# XXX: Should use lang/lua, with new dependencies on
# lua-cmsgpack, lua-cjson, and lua-struct
MODULES = lang/tcl
MODULES = lang/lua \
lang/tcl
MAKE_FLAGS = CC=${CC} \
DEBUG="" \
OPTIMIZATION="" \
V=1
FAKE_FLAGS = INSTALL="${INSTALL_PROGRAM}" \
@ -42,7 +40,10 @@ DBDIR = /var/redis
SUBST_VARS += DBDIR
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/redis.c
cp ${WRKSRC}/deps/lua/src/strbuf.* ${WRKSRC}/src/
cp ${WRKSRC}/deps/lua/src/lua_*.c ${WRKSRC}/src/
${SUBST_CMD} ${WRKSRC}/src/Makefile \
${WRKSRC}/src/redis.c
post-install:
${INSTALL_PROGRAM} ${WRKBUILD}/src/redis-sentinel ${PREFIX}/bin/

View File

@ -1,7 +1,14 @@
$OpenBSD: patch-deps_Makefile,v 1.3 2012/11/23 08:29:42 dcoppa Exp $
--- deps/Makefile.orig Thu Nov 22 17:03:27 2012
+++ deps/Makefile Fri Nov 23 08:59:25 2012
@@ -42,13 +42,11 @@ distclean:
$OpenBSD: patch-deps_Makefile,v 1.4 2013/01/16 13:13:03 dcoppa Exp $
--- deps/Makefile.orig Thu Jan 10 17:15:16 2013
+++ deps/Makefile Mon Jan 14 16:46:33 2013
@@ -35,43 +35,25 @@ endif
distclean:
-(cd hiredis && $(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
-(rm -f .make-*)
.PHONY: distclean
hiredis: .make-prerequisites
@ -15,20 +22,22 @@ $OpenBSD: patch-deps_Makefile,v 1.3 2012/11/23 08:29:42 dcoppa Exp $
cd linenoise && $(MAKE)
.PHONY: linenoise
@@ -58,11 +56,10 @@ ifeq ($(uname_S),SunOS)
LUA_CFLAGS= -D__C99FEATURES__=1
endif
-ifeq ($(uname_S),SunOS)
- # Make isinf() available
- LUA_CFLAGS= -D__C99FEATURES__=1
-endif
-
-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS)
+LUA_CFLAGS+= -Wall -DLUA_ANSI $(CFLAGS)
LUA_LDFLAGS+= $(LDFLAGS)
lua: .make-prerequisites
-LUA_LDFLAGS+= $(LDFLAGS)
-
-lua: .make-prerequisites
- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)"
.PHONY: lua
@@ -71,7 +68,6 @@ JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funro
- cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)"
-
-.PHONY: lua
-
JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
JEMALLOC_LDFLAGS= $(LDFLAGS)
jemalloc: .make-prerequisites

View File

@ -1,14 +1,15 @@
$OpenBSD: patch-deps_hiredis_Makefile,v 1.3 2012/11/23 08:29:42 dcoppa Exp $
--- deps/hiredis/Makefile.orig Thu Nov 22 17:03:27 2012
+++ deps/hiredis/Makefile Fri Nov 23 09:19:06 2012
$OpenBSD: patch-deps_hiredis_Makefile,v 1.4 2013/01/16 13:13:03 dcoppa Exp $
--- deps/hiredis/Makefile.orig Thu Jan 10 17:15:16 2013
+++ deps/hiredis/Makefile Wed Jan 16 13:12:52 2013
@@ -12,9 +12,9 @@ HIREDIS_MINOR=10
# Fallback to gcc when $CC is not in $PATH.
CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
-OPTIMIZATION?=-O3
+# OPTIMIZATION?=-O3
WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
-WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
-DEBUG?= -g -ggdb
+# OPTIMIZATION?=-O3
+WARNINGS=-Wstrict-prototypes -Wwrite-strings
+# DEBUG?= -g -ggdb
REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
REAL_LDFLAGS=$(LDFLAGS) $(ARCH)

View File

@ -1,16 +1,17 @@
$OpenBSD: patch-deps_linenoise_Makefile,v 1.4 2012/11/23 08:29:42 dcoppa Exp $
--- deps/linenoise/Makefile.orig Thu Nov 22 17:03:27 2012
+++ deps/linenoise/Makefile Fri Nov 23 09:19:38 2012
$OpenBSD: patch-deps_linenoise_Makefile,v 1.5 2013/01/16 13:13:03 dcoppa Exp $
--- deps/linenoise/Makefile.orig Thu Jan 10 17:15:16 2013
+++ deps/linenoise/Makefile Wed Jan 16 13:13:27 2013
@@ -1,10 +1,10 @@
STD=
WARN= -Wall
-WARN= -Wall
-OPT= -Os
+OPT=
+# WARN= -Wall
+# OPT= -Os
R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
R_LDFLAGS= $(LDFLAGS)
-DEBUG= -g
+DEBUG?= -g
+# DEBUG= -g
R_CC=$(CC) $(R_CFLAGS)
R_LD=$(CC) $(R_LDFLAGS)

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-deps_lua_src_lua_cjson_c,v 1.1 2013/01/16 13:13:03 dcoppa Exp $
--- deps/lua/src/lua_cjson.c.orig Tue Jan 15 15:08:47 2013
+++ deps/lua/src/lua_cjson.c Tue Jan 15 15:09:31 2013
@@ -41,8 +41,8 @@
#include <assert.h>
#include <string.h>
#include <math.h>
-#include "lua.h"
-#include "lauxlib.h"
+#include <lua.h>
+#include <lauxlib.h>
#include "strbuf.h"

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-deps_lua_src_lua_cmsgpack_c,v 1.1 2013/01/16 13:13:03 dcoppa Exp $
--- deps/lua/src/lua_cmsgpack.c.orig Tue Jan 15 15:08:53 2013
+++ deps/lua/src/lua_cmsgpack.c Tue Jan 15 15:10:11 2013
@@ -4,8 +4,8 @@
#include <string.h>
#include <assert.h>
-#include "lua.h"
-#include "lauxlib.h"
+#include <lua.h>
+#include <lauxlib.h>
#define LUACMSGPACK_VERSION "lua-cmsgpack 0.3.0"
#define LUACMSGPACK_COPYRIGHT "Copyright (C) 2012, Salvatore Sanfilippo"

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-deps_lua_src_lua_struct_c,v 1.1 2013/01/16 13:13:03 dcoppa Exp $
--- deps/lua/src/lua_struct.c.orig Tue Jan 15 15:08:57 2013
+++ deps/lua/src/lua_struct.c Tue Jan 15 15:09:52 2013
@@ -5,8 +5,8 @@
#include <string.h>
-#include "lua.h"
-#include "lauxlib.h"
+#include <lua.h>
+#include <lauxlib.h>
/*

View File

@ -1,7 +1,23 @@
$OpenBSD: patch-src_Makefile,v 1.11 2012/10/23 10:41:23 dcoppa Exp $
--- src/Makefile.orig Mon Oct 22 23:27:18 2012
+++ src/Makefile Tue Oct 23 11:08:06 2012
@@ -52,9 +52,9 @@ ifeq ($(uname_S),SunOS)
$OpenBSD: patch-src_Makefile,v 1.12 2013/01/16 13:13:03 dcoppa Exp $
--- src/Makefile.orig Thu Jan 10 17:15:16 2013
+++ src/Makefile Wed Jan 16 13:20:46 2013
@@ -14,12 +14,12 @@
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
+# OPTIMIZATION?=-O2
+DEPENDENCY_TARGETS=hiredis linenoise
# Default settings
STD= -std=c99 -pedantic
-WARN= -Wall
+# WARN= -Wall
OPT= $(OPTIMIZATION)
# Default allocator
@@ -52,13 +52,13 @@ ifeq ($(uname_S),SunOS)
DEBUG= -g -ggdb
else
FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
@ -9,10 +25,15 @@ $OpenBSD: patch-src_Makefile,v 1.11 2012/10/23 10:41:23 dcoppa Exp $
+ FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS)
FINAL_LIBS= -lm -pthread
- DEBUG= -g -rdynamic -ggdb
+ DEBUG?= -g -rdynamic -ggdb
+# DEBUG= -g -rdynamic -ggdb
endif
# Include paths to dependencies
-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I${MODLUA_INCL_DIR}
ifeq ($(MALLOC),tcmalloc)
FINAL_CFLAGS+= -DUSE_TCMALLOC
@@ -84,6 +84,10 @@ PREFIX?=/usr/local
INSTALL_BIN= $(PREFIX)/bin
INSTALL= cp -pf
@ -24,6 +45,24 @@ $OpenBSD: patch-src_Makefile,v 1.11 2012/10/23 10:41:23 dcoppa Exp $
CCCOLOR="\033[34m"
LINKCOLOR="\033[34;1m"
SRCCOLOR="\033[33m"
@@ -99,7 +103,7 @@ endif
REDIS_SERVER_NAME= redis-server
REDIS_SENTINEL_NAME= redis-sentinel
-REDIS_SERVER_OBJ= adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o
+REDIS_SERVER_OBJ= adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o strbuf.o lua_cjson.o lua_struct.o lua_cmsgpack.o
REDIS_CLI_NAME= redis-cli
REDIS_CLI_OBJ= anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o
REDIS_BENCHMARK_NAME= redis-benchmark
@@ -154,7 +158,7 @@ endif
# redis-server
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) -L${LOCALBASE}/lib ${MODLUA_LIB}
# redis-sentinel
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
@@ -194,7 +198,7 @@ distclean: clean
.PHONY: distclean

View File

@ -0,0 +1,142 @@
$OpenBSD: patch-src_Makefile_dep,v 1.1 2013/01/16 13:13:03 dcoppa Exp $
--- src/Makefile.dep.orig Fri Jan 11 14:26:11 2013
+++ src/Makefile.dep Fri Jan 11 14:28:15 2013
@@ -4,21 +4,21 @@ ae_epoll.o: ae_epoll.c
ae_kqueue.o: ae_kqueue.c
ae_select.o: ae_select.c
anet.o: anet.c fmacros.h anet.h
-aof.o: aof.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+aof.o: aof.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h bio.h
-bio.o: bio.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+bio.o: bio.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h bio.h
-config.o: config.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+config.o: config.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h
crc64.o: crc64.c
-db.o: db.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+db.o: db.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h
-debug.o: debug.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+debug.o: debug.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h sha1.h
dict.o: dict.c fmacros.h dict.h zmalloc.h
endianconv.o: endianconv.c
@@ -26,26 +26,26 @@ intset.o: intset.c intset.h zmalloc.h endianconv.h
lzf_c.o: lzf_c.c lzfP.h
lzf_d.o: lzf_d.c lzfP.h
memtest.o: memtest.c
-migrate.o: migrate.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+migrate.o: migrate.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h endianconv.h
-multi.o: multi.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+multi.o: multi.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h
networking.o: networking.c redis.h fmacros.h config.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h rdb.h \
rio.h
-object.o: object.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+object.o: object.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h
pqsort.o: pqsort.c
-pubsub.o: pubsub.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+pubsub.o: pubsub.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h
rand.o: rand.c
-rdb.o: rdb.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+rdb.o: rdb.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h lzf.h zipmap.h \
endianconv.h
redis-benchmark.o: redis-benchmark.c fmacros.h ae.h \
@@ -54,46 +54,44 @@ redis-check-aof.o: redis-check-aof.c fmacros.h config.
redis-check-dump.o: redis-check-dump.c lzf.h
redis-cli.o: redis-cli.c fmacros.h version.h ../deps/hiredis/hiredis.h \
sds.h zmalloc.h ../deps/linenoise/linenoise.h help.h
-redis.o: redis.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+redis.o: redis.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h slowlog.h bio.h \
asciilogo.h
release.o: release.c release.h
replication.o: replication.c redis.h fmacros.h config.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h rdb.h \
rio.h
rio.o: rio.c fmacros.h rio.h sds.h util.h
-scripting.o: scripting.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
- ziplist.h intset.h version.h util.h rdb.h rio.h sha1.h rand.h \
- ../deps/lua/src/lauxlib.h ../deps/lua/src/lua.h \
- ../deps/lua/src/lualib.h
+scripting.o: scripting.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+ ziplist.h intset.h version.h util.h rdb.h rio.h sha1.h rand.h
sds.o: sds.c sds.h zmalloc.h
sha1.o: sha1.c sha1.h config.h
-slowlog.o: slowlog.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+slowlog.o: slowlog.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h slowlog.h
-sort.o: sort.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+sort.o: sort.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h pqsort.h
-syncio.o: syncio.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+syncio.o: syncio.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h
-t_hash.o: t_hash.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+t_hash.o: t_hash.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h
-t_list.o: t_list.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+t_list.o: t_list.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h
-t_set.o: t_set.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+t_set.o: t_set.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h
-t_string.o: t_string.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+t_string.o: t_string.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h
-t_zset.o: t_zset.c redis.h fmacros.h config.h ../deps/lua/src/lua.h \
- ../deps/lua/src/luaconf.h ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
+t_zset.o: t_zset.c redis.h fmacros.h config.h \
+ ae.h sds.h dict.h adlist.h zmalloc.h anet.h \
ziplist.h intset.h version.h util.h rdb.h rio.h
util.o: util.c fmacros.h util.h
ziplist.o: ziplist.c zmalloc.h util.h ziplist.h endianconv.h