summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-11-09 12:52:48 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-11-09 12:52:48 (UTC)
commitab21082c21867e035cd925a06d6d55fb3143d883 (patch) (unidiff)
tree326d3fd608f7aa6e738794d0c1528ae9253ce850
parent86d6dfa9b7bd3e1b38618992061cc43ab89993ae (diff)
parent2919b91d20c80f92bf63bf19daace44ff2d2e9c9 (diff)
downloadcgit-ab21082c21867e035cd925a06d6d55fb3143d883.zip
cgit-ab21082c21867e035cd925a06d6d55fb3143d883.tar.gz
cgit-ab21082c21867e035cd925a06d6d55fb3143d883.tar.bz2
Merge branch 'stable'
* stable: CGIT 0.7.1 Makefile install: include cgit.png, do not empty cache Conflicts: Makefile
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index dbc34a2..685e662 100644
--- a/Makefile
+++ b/Makefile
@@ -1,77 +1,80 @@
1CGIT_VERSION = v0.7 1CGIT_VERSION = v0.7.1
2CGIT_SCRIPT_NAME = cgit.cgi 2CGIT_SCRIPT_NAME = cgit.cgi
3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit 3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_CONFIG = /etc/cgitrc 4CGIT_CONFIG = /etc/cgitrc
5CACHE_ROOT = /var/cache/cgit 5CACHE_ROOT = /var/cache/cgit
6SHA1_HEADER = <openssl/sha.h> 6SHA1_HEADER = <openssl/sha.h>
7GIT_VER = 1.5.3.5 7GIT_VER = 1.5.3.5
8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
9 9
10# 10#
11# Let the user override the above settings. 11# Let the user override the above settings.
12# 12#
13-include cgit.conf 13-include cgit.conf
14 14
15 15
16EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 16EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
17OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ 17OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
18 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ 18 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
19 ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o 19 ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o
20 20
21 21
22ifdef NEEDS_LIBICONV 22ifdef NEEDS_LIBICONV
23 EXTLIBS += -liconv 23 EXTLIBS += -liconv
24endif 24endif
25 25
26 26
27.PHONY: all git install clean distclean force-version get-git 27.PHONY: all git install clean distclean emptycache force-version get-git
28 28
29all: cgit git 29all: cgit git
30 30
31VERSION: force-version 31VERSION: force-version
32 @./gen-version.sh "$(CGIT_VERSION)" 32 @./gen-version.sh "$(CGIT_VERSION)"
33-include VERSION 33-include VERSION
34 34
35 35
36CFLAGS += -g -Wall -Igit 36CFLAGS += -g -Wall -Igit
37CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 37CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
38CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' 38CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
39CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' 39CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
40CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' 40CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
41CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' 41CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
42 42
43 43
44cgit: cgit.c $(OBJECTS) 44cgit: cgit.c $(OBJECTS)
45 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) 45 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
46 46
47$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION 47$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
48 48
49git/xdiff/lib.a: | git 49git/xdiff/lib.a: | git
50 50
51git/libgit.a: | git 51git/libgit.a: | git
52 52
53git: 53git:
54 cd git && $(MAKE) xdiff/lib.a 54 cd git && $(MAKE) xdiff/lib.a
55 cd git && $(MAKE) libgit.a 55 cd git && $(MAKE) libgit.a
56 56
57install: all 57install: all
58 mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) 58 mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
59 install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 59 install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
60 install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css 60 install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
61 rm -rf $(DESTDIR)$(CACHE_ROOT)/* 61 install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png
62 62
63uninstall: 63uninstall:
64 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 64 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
65 rm -f $(CGIT_SCRIPT_PATH)/cgit.css 65 rm -f $(CGIT_SCRIPT_PATH)/cgit.css
66 rm -rf $(CACHE_ROOT) 66 rm -f $(CGIT_SCRIPT_PATH)/cgit.png
67 67
68clean: 68clean:
69 rm -f cgit VERSION *.o 69 rm -f cgit VERSION *.o
70 cd git && $(MAKE) clean 70 cd git && $(MAKE) clean
71 71
72distclean: clean 72distclean: clean
73 git clean -d -x 73 git clean -d -x
74 cd git && git clean -d -x 74 cd git && git clean -d -x
75 75
76emptycache:
77 rm -rf $(DESTDIR)$(CACHE_ROOT)/*
78
76get-git: 79get-git:
77 curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git 80 curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git