|
diff --git a/Makefile b/Makefile index 15c7c20..be1d796 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -1,191 +1,193 @@ |
1 | CGIT_VERSION = v0.8.3.4 |
1 | CGIT_VERSION = v0.8.3.4 |
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.) |
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, |
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). |
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. |
22 | # some C compilers supported these specifiers prior to C99 as an extension. |
23 | # |
23 | # |
24 | |
24 | |
25 | #-include config.mak |
25 | #-include config.mak |
26 | |
26 | |
27 | # |
27 | # |
28 | # Platform specific tweaks |
28 | # Platform specific tweaks |
29 | # |
29 | # |
30 | |
30 | |
31 | 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') |
32 | 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') |
33 | 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') |
34 | |
34 | |
35 | ifeq ($(uname_O),Cygwin) |
35 | ifeq ($(uname_O),Cygwin) |
36 | NO_STRCASESTR = YesPlease |
36 | NO_STRCASESTR = YesPlease |
37 | NEEDS_LIBICONV = YesPlease |
37 | NEEDS_LIBICONV = YesPlease |
38 | endif |
38 | endif |
39 | |
39 | |
40 | # |
40 | # |
41 | # Let the user override the above settings. |
41 | # Let the user override the above settings. |
42 | # |
42 | # |
43 | -include cgit.conf |
43 | -include cgit.conf |
44 | |
44 | |
45 | # |
45 | # |
46 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
46 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
47 | # from git.git |
47 | # from git.git |
48 | # |
48 | # |
49 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
49 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
50 | QUIET_SUBDIR1 = |
50 | QUIET_SUBDIR1 = |
51 | |
51 | |
52 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
52 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
53 | PRINT_DIR = --no-print-directory |
53 | PRINT_DIR = --no-print-directory |
54 | else # "make -w" |
54 | else # "make -w" |
55 | NO_SUBDIR = : |
55 | NO_SUBDIR = : |
56 | endif |
56 | endif |
57 | |
57 | |
58 | ifndef V |
58 | ifndef V |
59 | QUIET_CC = @echo ' ' CC $@; |
59 | QUIET_CC = @echo ' ' CC $@; |
60 | QUIET_MM = @echo ' ' MM $@; |
60 | QUIET_MM = @echo ' ' MM $@; |
61 | QUIET_SUBDIR0 = +@subdir= |
61 | QUIET_SUBDIR0 = +@subdir= |
62 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
62 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
63 | $(MAKE) $(PRINT_DIR) -C $$subdir |
63 | $(MAKE) $(PRINT_DIR) -C $$subdir |
64 | endif |
64 | endif |
65 | |
65 | |
66 | # |
66 | # |
67 | # Define a pattern rule for automatic dependency building |
67 | # Define a pattern rule for automatic dependency building |
68 | # |
68 | # |
69 | %.d: %.c |
69 | %.d: %.c |
70 | $(QUIET_MM)$(CC) $(CFLAGS) -MM -MP $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
70 | $(QUIET_MM)$(CC) $(CFLAGS) -MM -MP $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
71 | |
71 | |
72 | # |
72 | # |
73 | # Define a pattern rule for silent object building |
73 | # Define a pattern rule for silent object building |
74 | # |
74 | # |
75 | %.o: %.c |
75 | %.o: %.c |
76 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
76 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
77 | |
77 | |
78 | |
78 | |
79 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
79 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
80 | OBJECTS = |
80 | OBJECTS = |
81 | OBJECTS += cache.o |
81 | OBJECTS += cache.o |
82 | OBJECTS += cgit.o |
82 | OBJECTS += cgit.o |
83 | OBJECTS += cmd.o |
83 | OBJECTS += cmd.o |
84 | OBJECTS += configfile.o |
84 | OBJECTS += configfile.o |
85 | OBJECTS += html.o |
85 | OBJECTS += html.o |
86 | OBJECTS += parsing.o |
86 | OBJECTS += parsing.o |
87 | OBJECTS += scan-tree.o |
87 | OBJECTS += scan-tree.o |
88 | OBJECTS += shared.o |
88 | OBJECTS += shared.o |
89 | OBJECTS += ui-atom.o |
89 | OBJECTS += ui-atom.o |
90 | OBJECTS += ui-blob.o |
90 | OBJECTS += ui-blob.o |
91 | OBJECTS += ui-clone.o |
91 | OBJECTS += ui-clone.o |
92 | OBJECTS += ui-commit.o |
92 | OBJECTS += ui-commit.o |
93 | OBJECTS += ui-diff.o |
93 | OBJECTS += ui-diff.o |
94 | OBJECTS += ui-log.o |
94 | OBJECTS += ui-log.o |
95 | OBJECTS += ui-patch.o |
95 | OBJECTS += ui-patch.o |
96 | OBJECTS += ui-plain.o |
96 | OBJECTS += ui-plain.o |
97 | OBJECTS += ui-refs.o |
97 | OBJECTS += ui-refs.o |
98 | OBJECTS += ui-repolist.o |
98 | OBJECTS += ui-repolist.o |
99 | OBJECTS += ui-shared.o |
99 | OBJECTS += ui-shared.o |
100 | OBJECTS += ui-snapshot.o |
100 | OBJECTS += ui-snapshot.o |
101 | OBJECTS += ui-ssdiff.o |
101 | OBJECTS += ui-ssdiff.o |
102 | OBJECTS += ui-stats.o |
102 | OBJECTS += ui-stats.o |
103 | OBJECTS += ui-summary.o |
103 | OBJECTS += ui-summary.o |
104 | OBJECTS += ui-tag.o |
104 | OBJECTS += ui-tag.o |
105 | OBJECTS += ui-tree.o |
105 | OBJECTS += ui-tree.o |
106 | |
106 | |
107 | ifdef NEEDS_LIBICONV |
107 | ifdef NEEDS_LIBICONV |
108 | EXTLIBS += -liconv |
108 | EXTLIBS += -liconv |
109 | endif |
109 | endif |
110 | |
110 | |
111 | |
111 | |
112 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
112 | .PHONY: all libgit test install uninstall clean force-version get-git \ |
113 | doc man-doc html-doc clean-doc |
113 | doc man-doc html-doc clean-doc |
114 | |
114 | |
115 | all: cgit |
115 | all: cgit |
116 | |
116 | |
117 | VERSION: force-version |
117 | VERSION: force-version |
118 | @./gen-version.sh "$(CGIT_VERSION)" |
118 | @./gen-version.sh "$(CGIT_VERSION)" |
119 | -include VERSION |
119 | -include VERSION |
120 | |
120 | |
121 | |
121 | |
122 | CFLAGS += -g -Wall -Igit |
122 | CFLAGS += -g -Wall -Igit |
123 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
123 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
124 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
124 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
125 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
125 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
126 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
126 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
127 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
127 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
128 | |
128 | |
| |
129 | GIT_OPTIONS = prefix=/usr |
| |
130 | |
129 | ifdef NO_ICONV |
131 | ifdef NO_ICONV |
130 | CFLAGS += -DNO_ICONV |
132 | CFLAGS += -DNO_ICONV |
131 | endif |
133 | endif |
132 | ifdef NO_STRCASESTR |
134 | ifdef NO_STRCASESTR |
133 | CFLAGS += -DNO_STRCASESTR |
135 | CFLAGS += -DNO_STRCASESTR |
134 | endif |
136 | endif |
135 | ifdef NO_C99_FORMAT |
137 | ifdef NO_C99_FORMAT |
136 | CFLAGS += -DNO_C99_FORMAT |
138 | CFLAGS += -DNO_C99_FORMAT |
137 | endif |
139 | endif |
138 | ifdef NO_OPENSSL |
140 | ifdef NO_OPENSSL |
139 | CFLAGS += -DNO_OPENSSL |
141 | CFLAGS += -DNO_OPENSSL |
140 | GIT_OPTIONS += NO_OPENSSL=1 |
142 | GIT_OPTIONS += NO_OPENSSL=1 |
141 | else |
143 | else |
142 | EXTLIBS += -lcrypto |
144 | EXTLIBS += -lcrypto |
143 | endif |
145 | endif |
144 | |
146 | |
145 | cgit: $(OBJECTS) libgit |
147 | cgit: $(OBJECTS) libgit |
146 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
148 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
147 | |
149 | |
148 | cgit.o: VERSION |
150 | cgit.o: VERSION |
149 | |
151 | |
150 | ifneq "$(MAKECMDGOALS)" "clean" |
152 | ifneq "$(MAKECMDGOALS)" "clean" |
151 | -include $(OBJECTS:.o=.d) |
153 | -include $(OBJECTS:.o=.d) |
152 | endif |
154 | endif |
153 | |
155 | |
154 | libgit: |
156 | libgit: |
155 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a |
157 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) libgit.a |
156 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a |
158 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 $(GIT_OPTIONS) xdiff/lib.a |
157 | |
159 | |
158 | test: all |
160 | test: all |
159 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
161 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
160 | |
162 | |
161 | install: all |
163 | install: all |
162 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
164 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
163 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
165 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
164 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) |
166 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) |
165 | $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css |
167 | $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css |
166 | $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png |
168 | $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png |
167 | |
169 | |
168 | uninstall: |
170 | uninstall: |
169 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
171 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
170 | rm -f $(CGIT_DATA_PATH)/cgit.css |
172 | rm -f $(CGIT_DATA_PATH)/cgit.css |
171 | rm -f $(CGIT_DATA_PATH)/cgit.png |
173 | rm -f $(CGIT_DATA_PATH)/cgit.png |
172 | |
174 | |
173 | doc: man-doc html-doc pdf-doc |
175 | doc: man-doc html-doc pdf-doc |
174 | |
176 | |
175 | man-doc: cgitrc.5.txt |
177 | man-doc: cgitrc.5.txt |
176 | a2x -f manpage cgitrc.5.txt |
178 | a2x -f manpage cgitrc.5.txt |
177 | |
179 | |
178 | html-doc: cgitrc.5.txt |
180 | html-doc: cgitrc.5.txt |
179 | a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt |
181 | a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt |
180 | |
182 | |
181 | pdf-doc: cgitrc.5.txt |
183 | pdf-doc: cgitrc.5.txt |
182 | a2x -f pdf cgitrc.5.txt |
184 | a2x -f pdf cgitrc.5.txt |
183 | |
185 | |
184 | clean: clean-doc |
186 | clean: clean-doc |
185 | rm -f cgit VERSION *.o *.d |
187 | rm -f cgit VERSION *.o *.d |
186 | |
188 | |
187 | clean-doc: |
189 | clean-doc: |
188 | rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo |
190 | rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo |
189 | |
191 | |
190 | get-git: |
192 | get-git: |
191 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |
193 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |
|