1 files changed, 5 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index a305894..e4265f7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.5.6
+GIT_VER = 1.6.0.rc1
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
@@ -55,6 +55,7 @@ OBJECTS += configfile.o
 OBJECTS += html.o
 OBJECTS += parsing.o
 OBJECTS += shared.o
+OBJECTS += ui-atom.o
 OBJECTS += ui-blob.o
 OBJECTS += ui-clone.o
 OBJECTS += ui-commit.o
@@ -75,7 +76,7 @@ ifdef NEEDS_LIBICONV
 endif
 
 
-.PHONY: all git test install uninstall clean force-version get-git
+.PHONY: all libgit test install uninstall clean force-version get-git
 
 all: cgit
 
@@ -92,17 +93,15 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 
-cgit: $(OBJECTS) git/libgit.a git/xdiff/lib.a
+cgit: $(OBJECTS) libgit
         $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
 
 cgit.o: VERSION
 
 -include $(OBJECTS:.o=.d)
 
-git/libgit.a: git
+libgit:
         $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
-
-git/xdiff/lib.a: git
         $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
 
 test: all