|
diff --git a/Makefile b/Makefile index 1dc44d5..3a4d974 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -5,12 +5,15 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) |
5 | CGIT_CONFIG = /etc/cgitrc |
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.0 |
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 |
11 | |
11 | |
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 | # |
16 | |
19 | |
@@ -68,7 +71,7 @@ endif |
68 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
71 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
69 | |
72 | |
70 | |
73 | |
71 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
74 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz |
72 | OBJECTS = |
75 | OBJECTS = |
73 | OBJECTS += cache.o |
76 | OBJECTS += cache.o |
74 | OBJECTS += cgit.o |
77 | OBJECTS += cgit.o |
@@ -90,6 +93,7 @@ OBJECTS += ui-refs.o |
90 | OBJECTS += ui-repolist.o |
93 | OBJECTS += ui-repolist.o |
91 | OBJECTS += ui-shared.o |
94 | OBJECTS += ui-shared.o |
92 | OBJECTS += ui-snapshot.o |
95 | OBJECTS += ui-snapshot.o |
| |
96 | OBJECTS += ui-ssdiff.o |
93 | OBJECTS += ui-stats.o |
97 | OBJECTS += ui-stats.o |
94 | OBJECTS += ui-summary.o |
98 | OBJECTS += ui-summary.o |
95 | OBJECTS += ui-tag.o |
99 | OBJECTS += ui-tag.o |
@@ -123,6 +127,12 @@ endif |
123 | ifdef NO_STRCASESTR |
127 | ifdef NO_STRCASESTR |
124 | CFLAGS += -DNO_STRCASESTR |
128 | CFLAGS += -DNO_STRCASESTR |
125 | endif |
129 | endif |
| |
130 | ifdef NO_OPENSSL |
| |
131 | CFLAGS += -DNO_OPENSSL |
| |
132 | GIT_OPTIONS += NO_OPENSSL=1 |
| |
133 | else |
| |
134 | EXTLIBS += -lcrypto |
| |
135 | endif |
126 | |
136 | |
127 | cgit: $(OBJECTS) libgit |
137 | cgit: $(OBJECTS) libgit |
128 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
138 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
@@ -132,8 +142,8 @@ cgit.o: VERSION |
132 | -include $(OBJECTS:.o=.d) |
142 | -include $(OBJECTS:.o=.d) |
133 | |
143 | |
134 | libgit: |
144 | libgit: |
135 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a |
145 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a |
136 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a |
146 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a |
137 | |
147 | |
138 | test: all |
148 | test: all |
139 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
149 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
|