CGIT 0.8.1

[cgit.git] / Makefile

diff --git a/Makefile b/Makefile
index 931c60e4d7a750f6453ecb8fde8c332a99f1047b..561af76f31ff038d31fa56d30c77956673625b17 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
-CGIT_VERSION = v0.7.2
+CGIT_VERSION = v0.8.1
 CGIT_SCRIPT_NAME = cgit.cgi
 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.6.0.2
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
@@ -54,12 +54,16 @@ OBJECTS += cmd.o
 OBJECTS += configfile.o
 OBJECTS += html.o
 OBJECTS += parsing.o
+OBJECTS += scan-tree.o
 OBJECTS += shared.o
+OBJECTS += ui-atom.o
 OBJECTS += ui-blob.o
+OBJECTS += ui-clone.o
 OBJECTS += ui-commit.o
 OBJECTS += ui-diff.o
 OBJECTS += ui-log.o
 OBJECTS += ui-patch.o
+OBJECTS += ui-plain.o
 OBJECTS += ui-refs.o
 OBJECTS += ui-repolist.o
 OBJECTS += ui-shared.o
@@ -73,9 +77,9 @@ ifdef NEEDS_LIBICONV
 endif
 
 
-.PHONY: all git test install clean distclean emptycache force-version get-git
+.PHONY: all libgit test install uninstall clean force-version get-git
 
-all: cgit git
+all: cgit
 
 VERSION: force-version
        @./gen-version.sh "$(CGIT_VERSION)"
@@ -89,23 +93,20 @@ CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
+ifdef NO_ICONV
+       CFLAGS += -DNO_ICONV
+endif
 
-cgit: $(OBJECTS)
-       $(QUIET_CC)$(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
-
-$(OBJECTS): git/xdiff/lib.a git/libgit.a
+cgit: $(OBJECTS) libgit
+       $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
 
 cgit.o: VERSION
 
 -include $(OBJECTS:.o=.d)
 
-git/xdiff/lib.a: | git
-
-git/libgit.a: | git
-
-git:
-       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
+libgit:
        $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
+       $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
 
 test: all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all
@@ -123,14 +124,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