summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-11-06 08:35:07 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-11-06 08:38:46 (UTC)
commit1ae41a0d1ebf14f03dcf009aff1a79f0d26ad591 (patch) (unidiff)
treea5795678e9e86d267daa33dbb1d3f5375fd99de8
parent55ac326ecb01161bf62865ae3350acf85db97d63 (diff)
downloadcgit-1ae41a0d1ebf14f03dcf009aff1a79f0d26ad591.zip
cgit-1ae41a0d1ebf14f03dcf009aff1a79f0d26ad591.tar.gz
cgit-1ae41a0d1ebf14f03dcf009aff1a79f0d26ad591.tar.bz2
Makefile: link with libiconv if NEEDS_LIBICONV is defined
This seems to be needed to compile on cygwin. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 6abd82a..dbc34a2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,72 +1,77 @@
1CGIT_VERSION = v0.7 1CGIT_VERSION = v0.7
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
23 EXTLIBS += -liconv
24endif
25
26
22.PHONY: all git install clean distclean force-version get-git 27.PHONY: all git install clean distclean force-version get-git
23 28
24all: cgit git 29all: cgit git
25 30
26VERSION: force-version 31VERSION: force-version
27 @./gen-version.sh "$(CGIT_VERSION)" 32 @./gen-version.sh "$(CGIT_VERSION)"
28-include VERSION 33-include VERSION
29 34
30 35
31CFLAGS += -g -Wall -Igit 36CFLAGS += -g -Wall -Igit
32CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' 37CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
33CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' 38CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
34CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' 39CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
35CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' 40CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
36CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' 41CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
37 42
38 43
39cgit: cgit.c $(OBJECTS) 44cgit: cgit.c $(OBJECTS)
40 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS) 45 $(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
41 46
42$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION 47$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
43 48
44git/xdiff/lib.a: | git 49git/xdiff/lib.a: | git
45 50
46git/libgit.a: | git 51git/libgit.a: | git
47 52
48git: 53git:
49 cd git && $(MAKE) xdiff/lib.a 54 cd git && $(MAKE) xdiff/lib.a
50 cd git && $(MAKE) libgit.a 55 cd git && $(MAKE) libgit.a
51 56
52install: all 57install: all
53 mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) 58 mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH)
54 install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 59 install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
55 install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css 60 install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css
56 rm -rf $(DESTDIR)$(CACHE_ROOT)/* 61 rm -rf $(DESTDIR)$(CACHE_ROOT)/*
57 62
58uninstall: 63uninstall:
59 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) 64 rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
60 rm -f $(CGIT_SCRIPT_PATH)/cgit.css 65 rm -f $(CGIT_SCRIPT_PATH)/cgit.css
61 rm -rf $(CACHE_ROOT) 66 rm -rf $(CACHE_ROOT)
62 67
63clean: 68clean:
64 rm -f cgit VERSION *.o 69 rm -f cgit VERSION *.o
65 cd git && $(MAKE) clean 70 cd git && $(MAKE) clean
66 71
67distclean: clean 72distclean: clean
68 git clean -d -x 73 git clean -d -x
69 cd git && git clean -d -x 74 cd git && git clean -d -x
70 75
71get-git: 76get-git:
72 curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git 77 curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git