|
diff --git a/Makefile b/Makefile index 23fdd53..6a47ed2 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -1,42 +1,47 @@ |
1 | CGIT_VERSION = v0.8.3.3 |
1 | CGIT_VERSION = v0.8.3.3 |
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.7.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 |
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 |
14 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 |
15 | # implementation (slower). |
15 | # implementation (slower). |
16 | # |
16 | # |
17 | # 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). |
18 | # |
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 | # |
19 | |
24 | |
20 | #-include config.mak |
25 | #-include config.mak |
21 | |
26 | |
22 | # |
27 | # |
23 | # Platform specific tweaks |
28 | # Platform specific tweaks |
24 | # |
29 | # |
25 | |
30 | |
26 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
31 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
27 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
32 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
28 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
33 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
29 | |
34 | |
30 | ifeq ($(uname_O),Cygwin) |
35 | ifeq ($(uname_O),Cygwin) |
31 | NO_STRCASESTR = YesPlease |
36 | NO_STRCASESTR = YesPlease |
32 | NEEDS_LIBICONV = YesPlease |
37 | NEEDS_LIBICONV = YesPlease |
33 | endif |
38 | endif |
34 | |
39 | |
35 | # |
40 | # |
36 | # Let the user override the above settings. |
41 | # Let the user override the above settings. |
37 | # |
42 | # |
38 | -include cgit.conf |
43 | -include cgit.conf |
39 | |
44 | |
40 | # |
45 | # |
41 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
46 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
42 | # from git.git |
47 | # from git.git |
@@ -106,48 +111,51 @@ endif |
106 | |
111 | |
107 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
112 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
108 | doc man-doc html-doc clean-doc |
113 | doc man-doc html-doc clean-doc |
109 | |
114 | |
110 | all: cgit |
115 | all: cgit |
111 | |
116 | |
112 | VERSION: force-version |
117 | VERSION: force-version |
113 | @./gen-version.sh "$(CGIT_VERSION)" |
118 | @./gen-version.sh "$(CGIT_VERSION)" |
114 | -include VERSION |
119 | -include VERSION |
115 | |
120 | |
116 | |
121 | |
117 | CFLAGS += -g -Wall -Igit |
122 | CFLAGS += -g -Wall -Igit |
118 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
123 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
119 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
124 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
120 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
125 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
121 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
126 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
122 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
127 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
123 | |
128 | |
124 | ifdef NO_ICONV |
129 | ifdef NO_ICONV |
125 | CFLAGS += -DNO_ICONV |
130 | CFLAGS += -DNO_ICONV |
126 | endif |
131 | endif |
127 | ifdef NO_STRCASESTR |
132 | ifdef NO_STRCASESTR |
128 | CFLAGS += -DNO_STRCASESTR |
133 | CFLAGS += -DNO_STRCASESTR |
129 | endif |
134 | endif |
| |
135 | ifdef NO_C99_FORMAT |
| |
136 | CFLAGS += -DNO_C99_FORMAT |
| |
137 | endif |
130 | ifdef NO_OPENSSL |
138 | ifdef NO_OPENSSL |
131 | CFLAGS += -DNO_OPENSSL |
139 | CFLAGS += -DNO_OPENSSL |
132 | GIT_OPTIONS += NO_OPENSSL=1 |
140 | GIT_OPTIONS += NO_OPENSSL=1 |
133 | else |
141 | else |
134 | EXTLIBS += -lcrypto |
142 | EXTLIBS += -lcrypto |
135 | endif |
143 | endif |
136 | |
144 | |
137 | cgit: $(OBJECTS) libgit |
145 | cgit: $(OBJECTS) libgit |
138 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
146 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
139 | |
147 | |
140 | cgit.o: VERSION |
148 | cgit.o: VERSION |
141 | |
149 | |
142 | ifneq "$(MAKECMDGOALS)" "clean" |
150 | ifneq "$(MAKECMDGOALS)" "clean" |
143 | -include $(OBJECTS:.o=.d) |
151 | -include $(OBJECTS:.o=.d) |
144 | endif |
152 | endif |
145 | |
153 | |
146 | libgit: |
154 | libgit: |
147 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a |
155 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a |
148 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a |
156 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a |
149 | |
157 | |
150 | test: all |
158 | test: all |
151 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
159 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
152 | |
160 | |
153 | install: all |
161 | install: all |
|