author | Lars Hjemli <hjemli@gmail.com> | 2007-11-06 08:35:07 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-11-06 08:38:46 (UTC) |
commit | 1ae41a0d1ebf14f03dcf009aff1a79f0d26ad591 (patch) (unidiff) | |
tree | a5795678e9e86d267daa33dbb1d3f5375fd99de8 | |
parent | 55ac326ecb01161bf62865ae3350acf85db97d63 (diff) | |
download | cgit-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>
-rw-r--r-- | Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -6,32 +6,37 @@ CACHE_ROOT = /var/cache/cgit | |||
6 | SHA1_HEADER = <openssl/sha.h> | 6 | SHA1_HEADER = <openssl/sha.h> |
7 | GIT_VER = 1.5.3.5 | 7 | GIT_VER = 1.5.3.5 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 8 | GIT_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 | ||
16 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 16 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
17 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ | 17 | OBJECTS = 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 | ||
22 | ifdef NEEDS_LIBICONV | ||
23 | EXTLIBS += -liconv | ||
24 | endif | ||
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 | ||
24 | all: cgit git | 29 | all: cgit git |
25 | 30 | ||
26 | VERSION: force-version | 31 | VERSION: force-version |
27 | @./gen-version.sh "$(CGIT_VERSION)" | 32 | @./gen-version.sh "$(CGIT_VERSION)" |
28 | -include VERSION | 33 | -include VERSION |
29 | 34 | ||
30 | 35 | ||
31 | CFLAGS += -g -Wall -Igit | 36 | CFLAGS += -g -Wall -Igit |
32 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' | 37 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
33 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' | 38 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
34 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | 39 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
35 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 40 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
36 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 41 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
37 | 42 | ||