|
diff --git a/Makefile b/Makefile index 3e5a38d..2a15469 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -1,40 +1,40 @@ |
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.0 |
8 | GIT_VER = 1.7.2.2 |
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 | |
19 | |
20 | #-include config.mak |
20 | #-include config.mak |
21 | |
21 | |
22 | # |
22 | # |
23 | # Platform specific tweaks |
23 | # Platform specific tweaks |
24 | # |
24 | # |
25 | |
25 | |
26 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
26 | 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') |
27 | 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') |
28 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
29 | |
29 | |
30 | ifeq ($(uname_O),Cygwin) |
30 | ifeq ($(uname_O),Cygwin) |
31 | NO_STRCASESTR = YesPlease |
31 | NO_STRCASESTR = YesPlease |
32 | NEEDS_LIBICONV = YesPlease |
32 | NEEDS_LIBICONV = YesPlease |
33 | endif |
33 | endif |
34 | |
34 | |
35 | # |
35 | # |
36 | # Let the user override the above settings. |
36 | # Let the user override the above settings. |
37 | # |
37 | # |
38 | -include cgit.conf |
38 | -include cgit.conf |
39 | |
39 | |
40 | # |
40 | # |
@@ -42,65 +42,65 @@ endif |
42 | # from git.git |
42 | # from git.git |
43 | # |
43 | # |
44 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
44 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
45 | QUIET_SUBDIR1 = |
45 | QUIET_SUBDIR1 = |
46 | |
46 | |
47 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
47 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
48 | PRINT_DIR = --no-print-directory |
48 | PRINT_DIR = --no-print-directory |
49 | else # "make -w" |
49 | else # "make -w" |
50 | NO_SUBDIR = : |
50 | NO_SUBDIR = : |
51 | endif |
51 | endif |
52 | |
52 | |
53 | ifndef V |
53 | ifndef V |
54 | QUIET_CC = @echo ' ' CC $@; |
54 | QUIET_CC = @echo ' ' CC $@; |
55 | QUIET_MM = @echo ' ' MM $@; |
55 | QUIET_MM = @echo ' ' MM $@; |
56 | QUIET_SUBDIR0 = +@subdir= |
56 | QUIET_SUBDIR0 = +@subdir= |
57 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
57 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
58 | $(MAKE) $(PRINT_DIR) -C $$subdir |
58 | $(MAKE) $(PRINT_DIR) -C $$subdir |
59 | endif |
59 | endif |
60 | |
60 | |
61 | # |
61 | # |
62 | # Define a pattern rule for automatic dependency building |
62 | # Define a pattern rule for automatic dependency building |
63 | # |
63 | # |
64 | %.d: %.c |
64 | %.d: %.c |
65 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
65 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
66 | |
66 | |
67 | # |
67 | # |
68 | # Define a pattern rule for silent object building |
68 | # Define a pattern rule for silent object building |
69 | # |
69 | # |
70 | %.o: %.c |
70 | %.o: %.c |
71 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
71 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
72 | |
72 | |
73 | |
73 | |
74 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz |
74 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lpthread |
75 | OBJECTS = |
75 | OBJECTS = |
76 | OBJECTS += cache.o |
76 | OBJECTS += cache.o |
77 | OBJECTS += cgit.o |
77 | OBJECTS += cgit.o |
78 | OBJECTS += cmd.o |
78 | OBJECTS += cmd.o |
79 | OBJECTS += configfile.o |
79 | OBJECTS += configfile.o |
80 | OBJECTS += html.o |
80 | OBJECTS += html.o |
81 | OBJECTS += parsing.o |
81 | OBJECTS += parsing.o |
82 | OBJECTS += scan-tree.o |
82 | OBJECTS += scan-tree.o |
83 | OBJECTS += shared.o |
83 | OBJECTS += shared.o |
84 | OBJECTS += ui-atom.o |
84 | OBJECTS += ui-atom.o |
85 | OBJECTS += ui-blob.o |
85 | OBJECTS += ui-blob.o |
86 | OBJECTS += ui-clone.o |
86 | OBJECTS += ui-clone.o |
87 | OBJECTS += ui-commit.o |
87 | OBJECTS += ui-commit.o |
88 | OBJECTS += ui-diff.o |
88 | OBJECTS += ui-diff.o |
89 | OBJECTS += ui-log.o |
89 | OBJECTS += ui-log.o |
90 | OBJECTS += ui-patch.o |
90 | OBJECTS += ui-patch.o |
91 | OBJECTS += ui-plain.o |
91 | OBJECTS += ui-plain.o |
92 | OBJECTS += ui-refs.o |
92 | OBJECTS += ui-refs.o |
93 | OBJECTS += ui-repolist.o |
93 | OBJECTS += ui-repolist.o |
94 | OBJECTS += ui-shared.o |
94 | OBJECTS += ui-shared.o |
95 | OBJECTS += ui-snapshot.o |
95 | OBJECTS += ui-snapshot.o |
96 | OBJECTS += ui-ssdiff.o |
96 | OBJECTS += ui-ssdiff.o |
97 | OBJECTS += ui-stats.o |
97 | OBJECTS += ui-stats.o |
98 | OBJECTS += ui-summary.o |
98 | OBJECTS += ui-summary.o |
99 | OBJECTS += ui-tag.o |
99 | OBJECTS += ui-tag.o |
100 | OBJECTS += ui-tree.o |
100 | OBJECTS += ui-tree.o |
101 | |
101 | |
102 | ifdef NEEDS_LIBICONV |
102 | ifdef NEEDS_LIBICONV |
103 | EXTLIBS += -liconv |
103 | EXTLIBS += -liconv |
104 | endif |
104 | endif |
105 | |
105 | |
106 | |
106 | |
|