key deletion on empty value fix + some refactoring

[redis.git] / Makefile

diff --git a/Makefile b/Makefile
index 2c7bd3498eac048d5f963a6e192b1ed498389ca0..df840313f13cfb335d0a1a6b8d8184e7dc218c13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,18 +14,17 @@ endif
 CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
 DEBUG?= -g -rdynamic -ggdb 
 
 CCOPT= $(CFLAGS) $(CCLINK) $(ARCH) $(PROF)
 DEBUG?= -g -rdynamic -ggdb 
 

-OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o
+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

 BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o
 CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o
 BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o
 CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o

-LOADOBJ = ae.o anet.o redis-load.o sds.o adlist.o zmalloc.o
+CHECKDUMPOBJ = redis-check-dump.o lzf_c.o lzf_d.o

 
 PRGNAME = redis-server
 BENCHPRGNAME = redis-benchmark
 CLIPRGNAME = redis-cli
 
 PRGNAME = redis-server
 BENCHPRGNAME = redis-benchmark
 CLIPRGNAME = redis-cli

-LOADPRGNAME = redis-load
+CHECKDUMPPRGNAME = redis-check-dump

 
 

-all: redis-server redis-benchmark redis-cli
-cotools: redis-load
+all: redis-server redis-benchmark redis-cli redis-check-dump

 
 # Deps (use make dep to generate this)
 adlist.o: adlist.c adlist.h zmalloc.h
 
 # Deps (use make dep to generate this)
 adlist.o: adlist.c adlist.h zmalloc.h


@@ -41,10 +40,10 @@ pqsort.o: pqsort.c
 redis-benchmark.o: redis-benchmark.c fmacros.h ae.h anet.h sds.h adlist.h \
   zmalloc.h
 redis-cli.o: redis-cli.c fmacros.h anet.h sds.h adlist.h zmalloc.h
 redis-benchmark.o: redis-benchmark.c fmacros.h ae.h anet.h sds.h adlist.h \
   zmalloc.h
 redis-cli.o: redis-cli.c fmacros.h anet.h sds.h adlist.h zmalloc.h

-redis-load.o: redis-load.c fmacros.h ae.h anet.h sds.h adlist.h zmalloc.h

 redis.o: redis.c fmacros.h config.h redis.h ae.h sds.h anet.h dict.h \
 redis.o: redis.c fmacros.h config.h redis.h ae.h sds.h anet.h dict.h \

-  adlist.h zmalloc.h lzf.h pqsort.h staticsymbols.h
+  adlist.h zmalloc.h lzf.h pqsort.h zipmap.h staticsymbols.h

 sds.o: sds.c sds.h zmalloc.h
 sds.o: sds.c sds.h zmalloc.h

+zipmap.o: zipmap.c zmalloc.h

 zmalloc.o: zmalloc.c config.h
 
 redis-server: $(OBJ)
 zmalloc.o: zmalloc.c config.h
 
 redis-server: $(OBJ)


@@ -61,14 +60,14 @@ redis-benchmark: $(BENCHOBJ)
 redis-cli: $(CLIOBJ)
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
 
 redis-cli: $(CLIOBJ)
        $(CC) -o $(CLIPRGNAME) $(CCOPT) $(DEBUG) $(CLIOBJ)
 

-redis-load: $(LOADOBJ)
-       $(CC) -o $(LOADPRGNAME) $(CCOPT) $(DEBUG) $(LOADOBJ)
+redis-check-dump: $(CHECKDUMPOBJ)
+       $(CC) -o $(CHECKDUMPPRGNAME) $(CCOPT) $(DEBUG) $(CHECKDUMPOBJ)

 
 .c.o:
        $(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
 
 clean:
 
 .c.o:
        $(CC) -c $(CFLAGS) $(DEBUG) $(COMPILE_TIME) $<
 
 clean:

-       rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(LOADPRGNAME) *.o *.gcda *.gcno *.gcov
+       rm -rf $(PRGNAME) $(BENCHPRGNAME) $(CLIPRGNAME) $(CHECKDUMPPRGNAME) *.o *.gcda *.gcno *.gcov

 
 dep:
        $(CC) -MM *.c
 
 dep:
        $(CC) -MM *.c


@@ -86,7 +85,10 @@ log:
        git log '--pretty=format:%ad %s' --date=short > Changelog
 
 32bit:
        git log '--pretty=format:%ad %s' --date=short > Changelog
 
 32bit:

-       make ARCH="-arch i386"
+       @echo ""
+       @echo "WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
+       @echo ""
+       make ARCH="-m32"

 
 gprof:
        make PROF="-pg"
 
 gprof:
        make PROF="-pg"