|
diff --git a/Makefile b/Makefile index 5162020..3e5a38d 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -7,3 +7,3 @@ 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 |
@@ -13,2 +13,5 @@ INSTALL = install |
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). |
@@ -70,3 +73,3 @@ endif |
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 = |
@@ -92,2 +95,3 @@ 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 |
@@ -125,2 +129,8 @@ ifdef NO_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 | |
@@ -131,7 +141,9 @@ cgit.o: VERSION |
131 | |
141 | |
132 | -include $(OBJECTS:.o=.d) |
142 | ifneq "$(MAKECMDGOALS)" "clean" |
| |
143 | -include $(OBJECTS:.o=.d) |
| |
144 | endif |
133 | |
145 | |
134 | libgit: |
146 | libgit: |
135 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a |
147 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a |
136 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a |
148 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a |
137 | |
149 | |
|