|
diff --git a/Makefile b/Makefile index 60d8c58..4e101d3 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -8,12 +8,15 @@ SHA1_HEADER = <openssl/sha.h> |
8 | GIT_VER = 1.6.4.3 |
8 | GIT_VER = 1.6.4.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 |
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 | |
17 | #-include config.mak |
20 | #-include config.mak |
18 | |
21 | |
19 | # |
22 | # |
@@ -65,13 +68,13 @@ endif |
65 | # Define a pattern rule for silent object building |
68 | # Define a pattern rule for silent object building |
66 | # |
69 | # |
67 | %.o: %.c |
70 | %.o: %.c |
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 |
75 | OBJECTS += cmd.o |
78 | OBJECTS += cmd.o |
76 | OBJECTS += configfile.o |
79 | OBJECTS += configfile.o |
77 | OBJECTS += html.o |
80 | OBJECTS += html.o |
@@ -120,23 +123,29 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
120 | ifdef NO_ICONV |
123 | ifdef NO_ICONV |
121 | CFLAGS += -DNO_ICONV |
124 | CFLAGS += -DNO_ICONV |
122 | endif |
125 | endif |
123 | ifdef NO_STRCASESTR |
126 | ifdef NO_STRCASESTR |
124 | CFLAGS += -DNO_STRCASESTR |
127 | CFLAGS += -DNO_STRCASESTR |
125 | endif |
128 | endif |
| |
129 | ifdef NO_OPENSSL |
| |
130 | CFLAGS += -DNO_OPENSSL |
| |
131 | GIT_OPTIONS += NO_OPENSSL=1 |
| |
132 | else |
| |
133 | EXTLIBS += -lcrypto |
| |
134 | endif |
126 | |
135 | |
127 | cgit: $(OBJECTS) libgit |
136 | cgit: $(OBJECTS) libgit |
128 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
137 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
129 | |
138 | |
130 | cgit.o: VERSION |
139 | cgit.o: VERSION |
131 | |
140 | |
132 | -include $(OBJECTS:.o=.d) |
141 | -include $(OBJECTS:.o=.d) |
133 | |
142 | |
134 | libgit: |
143 | libgit: |
135 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a |
144 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a |
136 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a |
145 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a |
137 | |
146 | |
138 | test: all |
147 | test: all |
139 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
148 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
140 | |
149 | |
141 | install: all |
150 | install: all |
142 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
151 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
|