author | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 20:25:14 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 20:31:11 (UTC) |
commit | 8a3685bcf2612206fc24a2421acb53dd83aeab85 (patch) (unidiff) | |
tree | 4628d87e55e87ead2e097cdacf8b4160cd0fc118 /Makefile | |
parent | c6cf3a424a0860d69b290254d9b19d35527b2d27 (diff) | |
download | cgit-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>
-rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,79 +1,80 @@ | |||
1 | CGIT_VERSION = 0.3 | 1 | CGIT_VERSION = 0.3 |
2 | 2 | ||
3 | prefix = /var/www/htdocs/cgit | 3 | prefix = /var/www/htdocs/cgit |
4 | 4 | ||
5 | SHA1_HEADER = <openssl/sha.h> | 5 | SHA1_HEADER = <openssl/sha.h> |
6 | 6 | ||
7 | CACHE_ROOT = /var/cache/cgit | 7 | CACHE_ROOT = /var/cache/cgit |
8 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 8 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
9 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ | 9 | OBJECTS = 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 | ||
13 | CFLAGS += -Wall | 13 | CFLAGS += -Wall |
14 | 14 | ||
15 | ifdef DEBUG | 15 | ifdef DEBUG |
16 | CFLAGS += -g | 16 | CFLAGS += -g |
17 | endif | 17 | endif |
18 | 18 | ||
19 | CFLAGS += -Igit -DSHA1_HEADER='$(SHA1_HEADER)' | 19 | CFLAGS += -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 | # |
27 | GITVER = $(shell git version 2>/dev/null || echo nogit) | 27 | GITVER = $(shell git version 2>/dev/null || echo nogit) |
28 | ifeq ($(GITVER),nogit) | 28 | ifeq ($(GITVER),nogit) |
29 | GITURL = http://hjemli.net/git/git/snapshot/?id=v1.5.2-rc2 | 29 | GITURL = http://hjemli.net/git/git/snapshot/?id=v1.5.2-rc2 |
30 | INITGIT = test -e git/git.c || (curl "$(GITURL)" > tmp.zip && unzip tmp.zip) | 30 | INITGIT = test -e git/git.c || (curl "$(GITURL)" > tmp.zip && unzip tmp.zip) |
31 | else | 31 | else |
32 | INITGIT = ./submodules.sh -i | 32 | INITGIT = ./submodules.sh -i |
33 | endif | 33 | endif |
34 | 34 | ||
35 | 35 | ||
36 | # | 36 | # |
37 | # basic build rules | 37 | # basic build rules |
38 | # | 38 | # |
39 | all: cgit | 39 | all: cgit |
40 | 40 | ||
41 | cgit: cgit.c cgit.h $(OBJECTS) | 41 | cgit: 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 | ||
47 | git/libgit.a: | 47 | git/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 | # |
54 | install: all clean-cache | 54 | install: 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 | ||
59 | clean-cgit: | 60 | clean-cgit: |
60 | rm -f cgit *.o | 61 | rm -f cgit *.o |
61 | 62 | ||
62 | distclean-cgit: clean-cgit | 63 | distclean-cgit: clean-cgit |
63 | git clean -d -x | 64 | git clean -d -x |
64 | 65 | ||
65 | clean-sub: | 66 | clean-sub: |
66 | $(MAKE) -C git clean | 67 | $(MAKE) -C git clean |
67 | 68 | ||
68 | distclean-sub: clean-sub | 69 | distclean-sub: clean-sub |
69 | $(shell cd git && git clean -d -x) | 70 | $(shell cd git && git clean -d -x) |
70 | 71 | ||
71 | clean-cache: | 72 | clean-cache: |
72 | rm -rf $(CACHE_ROOT)/* | 73 | rm -rf $(CACHE_ROOT)/* |
73 | 74 | ||
74 | clean: clean-cgit clean-sub | 75 | clean: clean-cgit clean-sub |
75 | 76 | ||
76 | distclean: distclean-cgit distclean-sub | 77 | distclean: 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 |