|
diff --git a/Makefile b/Makefile index a988751..14b4df4 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -1,244 +1,244 @@ |
1 | CGIT_VERSION = v0.8.3.4 |
1 | CGIT_VERSION = v0.8.3.5 |
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 | prefix = /usr |
7 | prefix = /usr |
8 | libdir = $(prefix)/lib |
8 | libdir = $(prefix)/lib |
9 | filterdir = $(libdir)/cgit/filters |
9 | filterdir = $(libdir)/cgit/filters |
10 | docdir = $(prefix)/share/doc/cgit |
10 | docdir = $(prefix)/share/doc/cgit |
11 | htmldir = $(docdir) |
11 | htmldir = $(docdir) |
12 | pdfdir = $(docdir) |
12 | pdfdir = $(docdir) |
13 | mandir = $(prefix)/share/man |
13 | mandir = $(prefix)/share/man |
14 | SHA1_HEADER = <openssl/sha.h> |
14 | SHA1_HEADER = <openssl/sha.h> |
15 | GIT_VER = 1.7.4 |
15 | GIT_VER = 1.7.4 |
16 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
16 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
17 | INSTALL = install |
17 | INSTALL = install |
18 | MAN5_TXT = $(wildcard *.5.txt) |
18 | MAN5_TXT = $(wildcard *.5.txt) |
19 | MAN_TXT = $(MAN5_TXT) |
19 | MAN_TXT = $(MAN5_TXT) |
20 | DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT)) |
20 | DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT)) |
21 | DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) |
21 | DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT)) |
22 | DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT)) |
22 | DOC_PDF = $(patsubst %.txt,%.pdf,$(MAN_TXT)) |
23 | |
23 | |
24 | # Define NO_STRCASESTR if you don't have strcasestr. |
24 | # Define NO_STRCASESTR if you don't have strcasestr. |
25 | # |
25 | # |
26 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 |
26 | # Define NO_OPENSSL to disable linking with OpenSSL and use bundled SHA1 |
27 | # implementation (slower). |
27 | # implementation (slower). |
28 | # |
28 | # |
29 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
29 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
30 | # |
30 | # |
31 | # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) |
31 | # Define NO_C99_FORMAT if your formatted IO functions (printf/scanf et.al.) |
32 | # do not support the 'size specifiers' introduced by C99, namely ll, hh, |
32 | # do not support the 'size specifiers' introduced by C99, namely ll, hh, |
33 | # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). |
33 | # j, z, t. (representing long long int, char, intmax_t, size_t, ptrdiff_t). |
34 | # some C compilers supported these specifiers prior to C99 as an extension. |
34 | # some C compilers supported these specifiers prior to C99 as an extension. |
35 | # |
35 | # |
36 | |
36 | |
37 | #-include config.mak |
37 | #-include config.mak |
38 | |
38 | |
39 | # |
39 | # |
40 | # Platform specific tweaks |
40 | # Platform specific tweaks |
41 | # |
41 | # |
42 | |
42 | |
43 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
43 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
44 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
44 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
45 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
45 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
46 | |
46 | |
47 | ifeq ($(uname_O),Cygwin) |
47 | ifeq ($(uname_O),Cygwin) |
48 | NO_STRCASESTR = YesPlease |
48 | NO_STRCASESTR = YesPlease |
49 | NEEDS_LIBICONV = YesPlease |
49 | NEEDS_LIBICONV = YesPlease |
50 | endif |
50 | endif |
51 | |
51 | |
52 | # |
52 | # |
53 | # Let the user override the above settings. |
53 | # Let the user override the above settings. |
54 | # |
54 | # |
55 | -include cgit.conf |
55 | -include cgit.conf |
56 | |
56 | |
57 | # |
57 | # |
58 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
58 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
59 | # from git.git |
59 | # from git.git |
60 | # |
60 | # |
61 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
61 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
62 | QUIET_SUBDIR1 = |
62 | QUIET_SUBDIR1 = |
63 | |
63 | |
64 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
64 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
65 | PRINT_DIR = --no-print-directory |
65 | PRINT_DIR = --no-print-directory |
66 | else # "make -w" |
66 | else # "make -w" |
67 | NO_SUBDIR = : |
67 | NO_SUBDIR = : |
68 | endif |
68 | endif |
69 | |
69 | |
70 | ifndef V |
70 | ifndef V |
71 | QUIET_CC = @echo ' ' CC $@; |
71 | QUIET_CC = @echo ' ' CC $@; |
72 | QUIET_MM = @echo ' ' MM $@; |
72 | QUIET_MM = @echo ' ' MM $@; |
73 | QUIET_SUBDIR0 = +@subdir= |
73 | QUIET_SUBDIR0 = +@subdir= |
74 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
74 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
75 | $(MAKE) $(PRINT_DIR) -C $$subdir |
75 | $(MAKE) $(PRINT_DIR) -C $$subdir |
76 | endif |
76 | endif |
77 | |
77 | |
78 | # |
78 | # |
79 | # Define a pattern rule for automatic dependency building |
79 | # Define a pattern rule for automatic dependency building |
80 | # |
80 | # |
81 | %.d: %.c |
81 | %.d: %.c |
82 | $(QUIET_MM)$(CC) $(CFLAGS) -MM -MP $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
82 | $(QUIET_MM)$(CC) $(CFLAGS) -MM -MP $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
83 | |
83 | |
84 | # |
84 | # |
85 | # Define a pattern rule for silent object building |
85 | # Define a pattern rule for silent object building |
86 | # |
86 | # |
87 | %.o: %.c |
87 | %.o: %.c |
88 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
88 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
89 | |
89 | |
90 | |
90 | |
91 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
91 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
92 | OBJECTS = |
92 | OBJECTS = |
93 | OBJECTS += cache.o |
93 | OBJECTS += cache.o |
94 | OBJECTS += cgit.o |
94 | OBJECTS += cgit.o |
95 | OBJECTS += cmd.o |
95 | OBJECTS += cmd.o |
96 | OBJECTS += configfile.o |
96 | OBJECTS += configfile.o |
97 | OBJECTS += html.o |
97 | OBJECTS += html.o |
98 | OBJECTS += parsing.o |
98 | OBJECTS += parsing.o |
99 | OBJECTS += scan-tree.o |
99 | OBJECTS += scan-tree.o |
100 | OBJECTS += shared.o |
100 | OBJECTS += shared.o |
101 | OBJECTS += ui-atom.o |
101 | OBJECTS += ui-atom.o |
102 | OBJECTS += ui-blob.o |
102 | OBJECTS += ui-blob.o |
103 | OBJECTS += ui-clone.o |
103 | OBJECTS += ui-clone.o |
104 | OBJECTS += ui-commit.o |
104 | OBJECTS += ui-commit.o |
105 | OBJECTS += ui-diff.o |
105 | OBJECTS += ui-diff.o |
106 | OBJECTS += ui-log.o |
106 | OBJECTS += ui-log.o |
107 | OBJECTS += ui-patch.o |
107 | OBJECTS += ui-patch.o |
108 | OBJECTS += ui-plain.o |
108 | OBJECTS += ui-plain.o |
109 | OBJECTS += ui-refs.o |
109 | OBJECTS += ui-refs.o |
110 | OBJECTS += ui-repolist.o |
110 | OBJECTS += ui-repolist.o |
111 | OBJECTS += ui-shared.o |
111 | OBJECTS += ui-shared.o |
112 | OBJECTS += ui-snapshot.o |
112 | OBJECTS += ui-snapshot.o |
113 | OBJECTS += ui-ssdiff.o |
113 | OBJECTS += ui-ssdiff.o |
114 | OBJECTS += ui-stats.o |
114 | OBJECTS += ui-stats.o |
115 | OBJECTS += ui-summary.o |
115 | OBJECTS += ui-summary.o |
116 | OBJECTS += ui-tag.o |
116 | OBJECTS += ui-tag.o |
117 | OBJECTS += ui-tree.o |
117 | OBJECTS += ui-tree.o |
118 | OBJECTS += vector.o |
118 | OBJECTS += vector.o |
119 | |
119 | |
120 | ifdef NEEDS_LIBICONV |
120 | ifdef NEEDS_LIBICONV |
121 | EXTLIBS += -liconv |
121 | EXTLIBS += -liconv |
122 | endif |
122 | endif |
123 | |
123 | |
124 | |
124 | |
125 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
125 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
126 | doc clean-doc install-doc install-man install-html install-pdf \ |
126 | doc clean-doc install-doc install-man install-html install-pdf \ |
127 | uninstall-doc uninstall-man uninstall-html uninstall-pdf |
127 | uninstall-doc uninstall-man uninstall-html uninstall-pdf |
128 | |
128 | |
129 | all: cgit |
129 | all: cgit |
130 | |
130 | |
131 | VERSION: force-version |
131 | VERSION: force-version |
132 | @./gen-version.sh "$(CGIT_VERSION)" |
132 | @./gen-version.sh "$(CGIT_VERSION)" |
133 | -include VERSION |
133 | -include VERSION |
134 | |
134 | |
135 | |
135 | |
136 | CFLAGS += -g -Wall -Igit |
136 | CFLAGS += -g -Wall -Igit |
137 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
137 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
138 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
138 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
139 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
139 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
140 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
140 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
141 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
141 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
142 | |
142 | |
143 | GIT_OPTIONS = prefix=/usr |
143 | GIT_OPTIONS = prefix=/usr |
144 | |
144 | |
145 | ifdef NO_ICONV |
145 | ifdef NO_ICONV |
146 | CFLAGS += -DNO_ICONV |
146 | CFLAGS += -DNO_ICONV |
147 | endif |
147 | endif |
148 | ifdef NO_STRCASESTR |
148 | ifdef NO_STRCASESTR |
149 | CFLAGS += -DNO_STRCASESTR |
149 | CFLAGS += -DNO_STRCASESTR |
150 | endif |
150 | endif |
151 | ifdef NO_C99_FORMAT |
151 | ifdef NO_C99_FORMAT |
152 | CFLAGS += -DNO_C99_FORMAT |
152 | CFLAGS += -DNO_C99_FORMAT |
153 | endif |
153 | endif |
154 | ifdef NO_OPENSSL |
154 | ifdef NO_OPENSSL |
155 | CFLAGS += -DNO_OPENSSL |
155 | CFLAGS += -DNO_OPENSSL |
156 | GIT_OPTIONS += NO_OPENSSL=1 |
156 | GIT_OPTIONS += NO_OPENSSL=1 |
157 | else |
157 | else |
158 | EXTLIBS += -lcrypto |
158 | EXTLIBS += -lcrypto |
159 | endif |
159 | endif |
160 | |
160 | |
161 | cgit: $(OBJECTS) libgit |
161 | cgit: $(OBJECTS) libgit |
162 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
162 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
163 | |
163 | |
164 | cgit.o: VERSION |
164 | cgit.o: VERSION |
165 | |
165 | |
166 | ifneq "$(MAKECMDGOALS)" "clean" |
166 | ifneq "$(MAKECMDGOALS)" "clean" |
167 | -include $(OBJECTS:.o=.d) |
167 | -include $(OBJECTS:.o=.d) |
168 | endif |
168 | endif |
169 | |
169 | |
170 | libgit: |
170 | libgit: |
171 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a |
171 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a |
172 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a |
172 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a |
173 | |
173 | |
174 | test: all |
174 | test: all |
175 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
175 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
176 | |
176 | |
177 | install: all |
177 | install: all |
178 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
178 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
179 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
179 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
180 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) |
180 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) |
181 | $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css |
181 | $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css |
182 | $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png |
182 | $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png |
183 | $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir) |
183 | $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir) |
184 | $(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir) |
184 | $(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir) |
185 | |
185 | |
186 | install-doc: install-man install-html install-pdf |
186 | install-doc: install-man install-html install-pdf |
187 | |
187 | |
188 | install-man: doc-man |
188 | install-man: doc-man |
189 | $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5 |
189 | $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5 |
190 | $(INSTALL) -m 0644 $(DOC_MAN5) $(DESTDIR)$(mandir)/man5 |
190 | $(INSTALL) -m 0644 $(DOC_MAN5) $(DESTDIR)$(mandir)/man5 |
191 | |
191 | |
192 | install-html: doc-html |
192 | install-html: doc-html |
193 | $(INSTALL) -m 0755 -d $(DESTDIR)$(htmldir) |
193 | $(INSTALL) -m 0755 -d $(DESTDIR)$(htmldir) |
194 | $(INSTALL) -m 0644 $(DOC_HTML) $(DESTDIR)$(htmldir) |
194 | $(INSTALL) -m 0644 $(DOC_HTML) $(DESTDIR)$(htmldir) |
195 | |
195 | |
196 | install-pdf: doc-pdf |
196 | install-pdf: doc-pdf |
197 | $(INSTALL) -m 0755 -d $(DESTDIR)$(pdfdir) |
197 | $(INSTALL) -m 0755 -d $(DESTDIR)$(pdfdir) |
198 | $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir) |
198 | $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir) |
199 | |
199 | |
200 | uninstall: |
200 | uninstall: |
201 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
201 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
202 | rm -f $(CGIT_DATA_PATH)/cgit.css |
202 | rm -f $(CGIT_DATA_PATH)/cgit.css |
203 | rm -f $(CGIT_DATA_PATH)/cgit.png |
203 | rm -f $(CGIT_DATA_PATH)/cgit.png |
204 | |
204 | |
205 | uninstall-doc: uninstall-man uninstall-html uninstall-pdf |
205 | uninstall-doc: uninstall-man uninstall-html uninstall-pdf |
206 | |
206 | |
207 | uninstall-man: |
207 | uninstall-man: |
208 | @for i in $(DOC_MAN5); do \ |
208 | @for i in $(DOC_MAN5); do \ |
209 | rm -fv $(DESTDIR)$(mandir)/man5/$$i; \ |
209 | rm -fv $(DESTDIR)$(mandir)/man5/$$i; \ |
210 | done |
210 | done |
211 | |
211 | |
212 | uninstall-html: |
212 | uninstall-html: |
213 | @for i in $(DOC_HTML); do \ |
213 | @for i in $(DOC_HTML); do \ |
214 | rm -fv $(DESTDIR)$(htmldir)/$$i; \ |
214 | rm -fv $(DESTDIR)$(htmldir)/$$i; \ |
215 | done |
215 | done |
216 | |
216 | |
217 | uninstall-pdf: |
217 | uninstall-pdf: |
218 | @for i in $(DOC_PDF); do \ |
218 | @for i in $(DOC_PDF); do \ |
219 | rm -fv $(DESTDIR)$(pdfdir)/$$i; \ |
219 | rm -fv $(DESTDIR)$(pdfdir)/$$i; \ |
220 | done |
220 | done |
221 | |
221 | |
222 | doc: doc-man doc-html doc-pdf |
222 | doc: doc-man doc-html doc-pdf |
223 | doc-man: doc-man5 |
223 | doc-man: doc-man5 |
224 | doc-man5: $(DOC_MAN5) |
224 | doc-man5: $(DOC_MAN5) |
225 | doc-html: $(DOC_HTML) |
225 | doc-html: $(DOC_HTML) |
226 | doc-pdf: $(DOC_PDF) |
226 | doc-pdf: $(DOC_PDF) |
227 | |
227 | |
228 | %.5 : %.5.txt |
228 | %.5 : %.5.txt |
229 | a2x -f manpage $< |
229 | a2x -f manpage $< |
230 | |
230 | |
231 | $(DOC_HTML): %.html : %.txt |
231 | $(DOC_HTML): %.html : %.txt |
232 | a2x -f xhtml --stylesheet=cgit-doc.css $< |
232 | a2x -f xhtml --stylesheet=cgit-doc.css $< |
233 | |
233 | |
234 | $(DOC_PDF): %.pdf : %.txt |
234 | $(DOC_PDF): %.pdf : %.txt |
235 | a2x -f pdf cgitrc.5.txt |
235 | a2x -f pdf cgitrc.5.txt |
236 | |
236 | |
237 | clean: clean-doc |
237 | clean: clean-doc |
238 | rm -f cgit VERSION *.o *.d |
238 | rm -f cgit VERSION *.o *.d |
239 | |
239 | |
240 | clean-doc: |
240 | clean-doc: |
241 | rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo |
241 | rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo |
242 | |
242 | |
243 | get-git: |
243 | get-git: |
244 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |
244 | curl $(GIT_URL) | tar -xjf - && rm -rf git && mv git-$(GIT_VER) git |
|