summaryrefslogtreecommitdiffabout
path: root/Makefile
authorLars Hjemli <hjemli@gmail.com>2007-05-13 20:25:14 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-13 20:31:11 (UTC)
commit8a3685bcf2612206fc24a2421acb53dd83aeab85 (patch) (unidiff)
tree4628d87e55e87ead2e097cdacf8b4160cd0fc118 /Makefile
parentc6cf3a424a0860d69b290254d9b19d35527b2d27 (diff)
downloadcgit-8a3685bcf2612206fc24a2421acb53dd83aeab85.zip
cgit-8a3685bcf2612206fc24a2421acb53dd83aeab85.tar.gz
cgit-8a3685bcf2612206fc24a2421acb53dd83aeab85.tar.bz2
Add graphical diffstat to commit view
The diffstat is calculated against the leftmost parent of the commit. This gives nice information for "normal" merges while octopus merges are less than optimal, so the diffstat isn't calculated for those merges. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'Makefile') (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ccc7582..ea4d818 100644
--- a/Makefile
+++ b/Makefile
@@ -1,79 +1,80 @@
1CGIT_VERSION = 0.3 1CGIT_VERSION = 0.3
2 2
3prefix = /var/www/htdocs/cgit 3prefix = /var/www/htdocs/cgit
4 4
5SHA1_HEADER = <openssl/sha.h> 5SHA1_HEADER = <openssl/sha.h>
6 6
7CACHE_ROOT = /var/cache/cgit 7CACHE_ROOT = /var/cache/cgit
8EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 8EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
9OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ 9OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
10 ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \ 10 ui-summary.o ui-log.o ui-view.o ui-tree.o ui-commit.o ui-diff.o \
11 ui-snapshot.o ui-blob.o 11 ui-snapshot.o ui-blob.o
12 12
13CFLAGS += -Wall 13CFLAGS += -Wall
14 14
15ifdef DEBUG 15ifdef DEBUG
16 CFLAGS += -g 16 CFLAGS += -g
17endif 17endif
18 18
19CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)' 19CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)'
20 20
21 21
22# 22#
23# If make is run on a nongit platform, we need to get the git sources as a tarball. 23# If make is run on a nongit platform, we need to get the git sources as a tarball.
24# But there is currently no recent enough tarball available on kernel.org, so download 24# But there is currently no recent enough tarball available on kernel.org, so download
25# a zipfile from hjemli.net instead 25# a zipfile from hjemli.net instead
26# 26#
27GITVER = $(shell git version 2>/dev/null || echo nogit) 27GITVER = $(shell git version 2>/dev/null || echo nogit)
28ifeq ($(GITVER),nogit) 28ifeq ($(GITVER),nogit)
29GITURL = http://hjemli.net/git/git/snapshot/?id=v1.5.2-rc2 29GITURL = http://hjemli.net/git/git/snapshot/?id=v1.5.2-rc2
30INITGIT = test -e git/git.c || (curl "$(GITURL)" > tmp.zip && unzip tmp.zip) 30INITGIT = test -e git/git.c || (curl "$(GITURL)" > tmp.zip && unzip tmp.zip)
31else 31else
32INITGIT = ./submodules.sh -i 32INITGIT = ./submodules.sh -i
33endif 33endif
34 34
35 35
36# 36#
37# basic build rules 37# basic build rules
38# 38#
39all: cgit 39all: cgit
40 40
41cgit: cgit.c cgit.h $(OBJECTS) 41cgit: cgit.c cgit.h $(OBJECTS)
42 $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \ 42 $(CC) $(CFLAGS) -DCGIT_VERSION='"$(CGIT_VERSION)"' cgit.c -o cgit \
43 $(OBJECTS) $(EXTLIBS) 43 $(OBJECTS) $(EXTLIBS)
44 44
45$(OBJECTS): cgit.h git/libgit.a 45$(OBJECTS): cgit.h git/libgit.a
46 46
47git/libgit.a: 47git/libgit.a:
48 $(INITGIT) 48 $(INITGIT)
49 $(MAKE) -C git 49 $(MAKE) -C git
50 50
51# 51#
52# phony targets 52# phony targets
53# 53#
54install: all clean-cache 54install: all clean-cache
55 mkdir -p $(prefix) 55 mkdir -p $(prefix)
56 install cgit $(prefix)/cgit.cgi 56 install cgit $(prefix)/cgit.cgi
57 install cgit.css $(prefix)/cgit.css 57 install cgit.css $(prefix)/cgit.css
58 install add.png del.png $(prefix)/
58 59
59clean-cgit: 60clean-cgit:
60 rm -f cgit *.o 61 rm -f cgit *.o
61 62
62distclean-cgit: clean-cgit 63distclean-cgit: clean-cgit
63 git clean -d -x 64 git clean -d -x
64 65
65clean-sub: 66clean-sub:
66 $(MAKE) -C git clean 67 $(MAKE) -C git clean
67 68
68distclean-sub: clean-sub 69distclean-sub: clean-sub
69 $(shell cd git && git clean -d -x) 70 $(shell cd git && git clean -d -x)
70 71
71clean-cache: 72clean-cache:
72 rm -rf $(CACHE_ROOT)/* 73 rm -rf $(CACHE_ROOT)/*
73 74
74clean: clean-cgit clean-sub 75clean: clean-cgit clean-sub
75 76
76distclean: distclean-cgit distclean-sub 77distclean: distclean-cgit distclean-sub
77 78
78.PHONY: all install clean clean-cgit clean-sub clean-cache \ 79.PHONY: all install clean clean-cgit clean-sub clean-cache \
79 distclean distclean-cgit distclean-sub 80 distclean distclean-cgit distclean-sub