Add support for cloning over http

[ps-cgit] / Makefile

diff --git a/Makefile b/Makefile
index 931c60e4d7a750f6453ecb8fde8c332a99f1047b..78aad100e74af1d035445ad7ecb2e77a20894d33 100644 (file)
--- 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.5.rc1
+GIT_VER = 1.5.6
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
@@ -56,6 +56,7 @@ OBJECTS += html.o
 OBJECTS += parsing.o
 OBJECTS += shared.o
 OBJECTS += ui-blob.o
+OBJECTS += ui-clone.o
 OBJECTS += ui-commit.o
 OBJECTS += ui-diff.o
 OBJECTS += ui-log.o
@@ -73,9 +74,9 @@ ifdef NEEDS_LIBICONV
 endif
 
 
-.PHONY: all git test install clean distclean emptycache force-version get-git
+.PHONY: all git test install uninstall clean force-version get-git
 
-all: cgit git
+all: cgit
 
 VERSION: force-version
        @./gen-version.sh "$(CGIT_VERSION)"
@@ -90,22 +91,18 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 
-cgit: $(OBJECTS)
+cgit: $(OBJECTS) git/libgit.a git/xdiff/lib.a
        $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
 
-$(OBJECTS): git/xdiff/lib.a git/libgit.a
-
 cgit.o: VERSION
 
 -include $(OBJECTS:.o=.d)
 
-git/xdiff/lib.a: | git
-
-git/libgit.a: | git
+git/libgit.a: git
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
 
-git:
+git/xdiff/lib.a: git
        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
-       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
 
 test: all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
@@ -123,14 +120,6 @@ uninstall:
 
 clean:
        rm -f cgit VERSION *.o *.d
-       cd git && $(MAKE) clean
-
-distclean: clean
-       git clean -d -x
-       cd git && git clean -d -x
-
-emptycache:
-       rm -rf $(DESTDIR)$(CACHE_ROOT)/*
 
 get-git:
        curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git