|
diff --git a/Makefile b/Makefile index 14b4df4..af2879e 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -1,97 +1,97 @@ |
1 | CGIT_VERSION = v0.8.3.5 |
1 | CGIT_VERSION = v0.9 |
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 |
|