|
diff --git a/Makefile b/Makefile index 7b9ac5f..0a5055b 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -2,18 +2,21 @@ CGIT_VERSION = v0.8.3.1 |
2 | CGIT_SCRIPT_NAME = cgit.cgi |
2 | CGIT_SCRIPT_NAME = cgit.cgi |
3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit |
3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit |
4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) |
4 | 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 | |
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 |
@@ -87,12 +90,13 @@ OBJECTS += ui-log.o |
87 | OBJECTS += ui-patch.o |
90 | OBJECTS += ui-patch.o |
88 | OBJECTS += ui-plain.o |
91 | OBJECTS += ui-plain.o |
89 | OBJECTS += ui-refs.o |
92 | 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 |
96 | OBJECTS += ui-tree.o |
100 | OBJECTS += ui-tree.o |
97 | |
101 | |
98 | ifdef NEEDS_LIBICONV |
102 | ifdef NEEDS_LIBICONV |
@@ -120,23 +124,29 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
120 | ifdef NO_ICONV |
124 | ifdef NO_ICONV |
121 | CFLAGS += -DNO_ICONV |
125 | CFLAGS += -DNO_ICONV |
122 | endif |
126 | 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) |
129 | |
139 | |
130 | cgit.o: VERSION |
140 | cgit.o: VERSION |
131 | |
141 | |
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 |
140 | |
150 | |
141 | install: all |
151 | install: all |
142 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
152 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
|