|
diff --git a/Makefile b/Makefile index 5162020..6a47ed2 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -6,5 +6,5 @@ CGIT_CONFIG = /etc/cgitrc |
6 | CACHE_ROOT = /var/cache/cgit |
6 | CACHE_ROOT = /var/cache/cgit |
7 | SHA1_HEADER = <openssl/sha.h> |
7 | SHA1_HEADER = <openssl/sha.h> |
8 | GIT_VER = 1.6.4.3 |
8 | GIT_VER = 1.7.3 |
9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
10 | INSTALL = install |
10 | INSTALL = install |
@@ -12,6 +12,14 @@ INSTALL = install |
12 | # Define NO_STRCASESTR if you don't have strcasestr. |
12 | # Define NO_STRCASESTR if you don't have strcasestr. |
13 | # |
13 | # |
| |
14 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 |
| |
15 | # implementation (slower). |
| |
16 | # |
14 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
17 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
15 | # |
18 | # |
| |
19 | # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) |
| |
20 | # do not support the 'size specifiers' introduced by C99, namely ll, hh, |
| |
21 | # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). |
| |
22 | # some C compilers supported these specifiers prior to C99 as an extension. |
| |
23 | # |
16 | |
24 | |
17 | #-include config.mak |
25 | #-include config.mak |
@@ -69,5 +77,5 @@ endif |
69 | |
77 | |
70 | |
78 | |
71 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
79 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
72 | OBJECTS = |
80 | OBJECTS = |
73 | OBJECTS += cache.o |
81 | OBJECTS += cache.o |
@@ -91,4 +99,5 @@ OBJECTS += ui-repolist.o |
91 | OBJECTS += ui-shared.o |
99 | OBJECTS += ui-shared.o |
92 | OBJECTS += ui-snapshot.o |
100 | OBJECTS += ui-snapshot.o |
| |
101 | OBJECTS += ui-ssdiff.o |
93 | OBJECTS += ui-stats.o |
102 | OBJECTS += ui-stats.o |
94 | OBJECTS += ui-summary.o |
103 | OBJECTS += ui-summary.o |
@@ -124,4 +133,13 @@ ifdef NO_STRCASESTR |
124 | CFLAGS += -DNO_STRCASESTR |
133 | CFLAGS += -DNO_STRCASESTR |
125 | endif |
134 | endif |
| |
135 | ifdef NO_C99_FORMAT |
| |
136 | CFLAGS += -DNO_C99_FORMAT |
| |
137 | endif |
| |
138 | ifdef NO_OPENSSL |
| |
139 | CFLAGS += -DNO_OPENSSL |
| |
140 | GIT_OPTIONS += NO_OPENSSL=1 |
| |
141 | else |
| |
142 | EXTLIBS += -lcrypto |
| |
143 | endif |
126 | |
144 | |
127 | cgit: $(OBJECTS) libgit |
145 | cgit: $(OBJECTS) libgit |
@@ -130,9 +148,11 @@ cgit: $(OBJECTS) libgit |
130 | cgit.o: VERSION |
148 | cgit.o: VERSION |
131 | |
149 | |
| |
150 | ifneq "$(MAKECMDGOALS)" "clean" |
132 | -include $(OBJECTS:.o=.d) |
151 | -include $(OBJECTS:.o=.d) |
| |
152 | endif |
133 | |
153 | |
134 | libgit: |
154 | libgit: |
135 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a |
155 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a |
136 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a |
156 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a |
137 | |
157 | |
138 | test: all |
158 | test: all |
|