summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-05-20 11:14:36 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-20 11:41:05 (UTC)
commitd4dbfdfbaea3aa93e824ea484787de10e73eae65 (patch) (unidiff)
tree7f03e88d7dc891c917c527631aea136795fcd396
parent08cc2e5f0e24773dad81d38bd6b689e36afe9dda (diff)
downloadcgit-d4dbfdfbaea3aa93e824ea484787de10e73eae65.zip
cgit-d4dbfdfbaea3aa93e824ea484787de10e73eae65.tar.gz
cgit-d4dbfdfbaea3aa93e824ea484787de10e73eae65.tar.bz2
Use git-1.5.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile8
m---------git0
2 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 914db1c..5e16a4f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,40 +18,38 @@ OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
18 ui-snapshot.o ui-blob.o 18 ui-snapshot.o ui-blob.o
19 19
20CFLAGS += -Wall 20CFLAGS += -Wall
21 21
22ifdef DEBUG 22ifdef DEBUG
23 CFLAGS += -g 23 CFLAGS += -g
24endif 24endif
25 25
26CFLAGS += -Igit 26CFLAGS += -Igit
27CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 27CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
28CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' 28CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
29CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' 29CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
30CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' 30CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
31 31
32 32
33# 33#
34# If make is run on a nongit platform, we need to get the git sources as a tarball. 34# If make is run on a nongit platform, get the git sources as a tarball.
35# But there is currently no recent enough tarball available on kernel.org, so download
36# a zipfile from hjemli.net instead
37# 35#
38GITVER = $(shell git version 2>/dev/null || echo nogit) 36GITVER = $(shell git version 2>/dev/null || echo nogit)
39ifeq ($(GITVER),nogit) 37ifeq ($(GITVER),nogit)
40GITURL = http://hjemli.net/git/git/snapshot/?id=v1.5.2-rc2 38GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2
41INITGIT = test -e git/git.c || (curl "$(GITURL)" > tmp.zip && unzip tmp.zip) 39INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git)
42else 40else
43INITGIT = ./submodules.sh -i 41INITGIT = ./submodules.sh -i
44endif 42endif
45 43
46 44
47# 45#
48# basic build rules 46# basic build rules
49# 47#
50all: cgit 48all: cgit
51 49
52cgit: cgit.c cgit.h $(OBJECTS) 50cgit: cgit.c cgit.h $(OBJECTS)
53 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) 51 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
54 52
55$(OBJECTS): cgit.h git/libgit.a 53$(OBJECTS): cgit.h git/libgit.a
56 54
57git/libgit.a: 55git/libgit.a:
diff --git a/git b/git
Subproject 9159afbfce955db86373dab95b5f8e31fb763da Subproject aba170cdb4874b72dd619e6f7bbc13c33295f83