Fixed deps in makefile and mkreleasehdr.sh script to really take advantage of the...

diff --git a/Makefile b/Makefile
index 38b8448da288b78e6e337d09c2cd13eb1a986048..96dddd69ec89bf1f8ce36f8bf6d13187ab64a015 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,8 +48,7 @@ redis-check-dump.o: redis-check-dump.c lzf.h
 redis-cli.o: redis-cli.c fmacros.h anet.h sds.h adlist.h zmalloc.h \
   linenoise.h
 redis.o: redis.c fmacros.h config.h redis.h ae.h sds.h anet.h dict.h \
 redis-cli.o: redis-cli.c fmacros.h anet.h sds.h adlist.h zmalloc.h \
   linenoise.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 zipmap.h ziplist.h sha1.h release.h \
-  staticsymbols.h
+  adlist.h zmalloc.h lzf.h pqsort.h zipmap.h ziplist.h sha1.h staticsymbols.h

 release.o: release.c release.h
 sds.o: sds.c sds.h zmalloc.h
 sha1.o: sha1.c sha1.h
 release.o: release.c release.h
 sds.o: sds.c sds.h zmalloc.h
 sha1.o: sha1.c sha1.h

diff --git a/mkreleasehdr.sh b/mkreleasehdr.sh
index 45f5173a4ec1d01f432b0e890385d27be343eecf..30984160e7e4669f5ca76c1513f147bc72600bad 100755 (executable)
--- a/mkreleasehdr.sh
+++ b/mkreleasehdr.sh
@@ -6,4 +6,4 @@ test -f release.h || touch release.h
 (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate
 echo "#define REDIS_GIT_SHA1 \"$GIT_SHA1\"" > release.h
 echo "#define REDIS_GIT_DIRTY \"$GIT_DIRTY\"" >> release.h
 (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate
 echo "#define REDIS_GIT_SHA1 \"$GIT_SHA1\"" > release.h
 echo "#define REDIS_GIT_DIRTY \"$GIT_DIRTY\"" >> release.h

-touch redis.c # Force recompile of redis.c
+touch release.c # Force recompile of release.c

diff --git a/redis.c b/redis.c
index 8f5e8f47f43bce8ec5502f479a6b147171b9cf69..3fe9af1c7ca45229694cdf2f95e5b28138651be6 100644 (file)
--- a/redis.c
+++ b/redis.c
@@ -77,7 +77,6 @@
 #include "zipmap.h" /* Compact dictionary-alike data structure */
 #include "ziplist.h" /* Compact list data structure */
 #include "sha1.h"   /* SHA1 is used for DEBUG DIGEST */
 #include "zipmap.h" /* Compact dictionary-alike data structure */
 #include "ziplist.h" /* Compact list data structure */
 #include "sha1.h"   /* SHA1 is used for DEBUG DIGEST */

-#include "release.h" /* Release and/or git repository information */

 
 /* Error codes */
 #define REDIS_OK                0
 
 /* Error codes */
 #define REDIS_OK                0