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) (side-by-side diff)
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,45 +1,50 @@
CGIT_VERSION = v0.7
CGIT_SCRIPT_NAME = cgit.cgi
CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
CGIT_CONFIG = /etc/cgitrc
CACHE_ROOT = /var/cache/cgit
SHA1_HEADER = <openssl/sha.h>
GIT_VER = 1.5.3.5
GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
#
# Let the user override the above settings.
#
-include cgit.conf
EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o
+ifdef NEEDS_LIBICONV
+ EXTLIBS += -liconv
+endif
+
+
.PHONY: all git install clean distclean force-version get-git
all: cgit git
VERSION: force-version
@./gen-version.sh "$(CGIT_VERSION)"
-include VERSION
CFLAGS += -g -Wall -Igit
CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
cgit: cgit.c $(OBJECTS)
$(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
$(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
git/xdiff/lib.a: | git