| -rw-r--r-- | Makefile | 2 | ||||
| m--------- | git | 0 |
2 files changed, 1 insertions, 1 deletions
@@ -1,55 +1,55 @@ CGIT_VERSION = v0.7.2 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.4.1 +GIT_VER = 1.5.4.4 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 # # Let the user override the above settings. # -include cgit.conf EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o ifdef NEEDS_LIBICONV EXTLIBS += -liconv endif .PHONY: all git test install clean distclean emptycache force-version get-git all: cgit git VERSION: force-version @./gen-version.sh "$(CGIT_VERSION)" -include VERSION CFLAGS += -g -Wall -Igit CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' cgit: cgit.c $(OBJECTS) $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) $(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION git/xdiff/lib.a: | git git/libgit.a: | git git: cd git && $(MAKE) xdiff/lib.a cd git && $(MAKE) libgit.a diff --git a/git b/git -Subproject 527270689c364bea9b0630df9bae5e09c2071c1 +Subproject 56d5fe285583b5177ffc65dbe7df636ed5b8cc6 |