|
diff --git a/Makefile b/Makefile index 3c27422..561af76 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -1,97 +1,97 @@ |
1 | CGIT_VERSION = v0.8 |
1 | CGIT_VERSION = v0.8.1 |
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_CONFIG = /etc/cgitrc |
4 | CGIT_CONFIG = /etc/cgitrc |
5 | CACHE_ROOT = /var/cache/cgit |
5 | CACHE_ROOT = /var/cache/cgit |
6 | SHA1_HEADER = <openssl/sha.h> |
6 | SHA1_HEADER = <openssl/sha.h> |
7 | GIT_VER = 1.6.0.2 |
7 | GIT_VER = 1.6.0.2 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
9 | |
9 | |
10 | # |
10 | # |
11 | # Let the user override the above settings. |
11 | # Let the user override the above settings. |
12 | # |
12 | # |
13 | -include cgit.conf |
13 | -include cgit.conf |
14 | |
14 | |
15 | # |
15 | # |
16 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
16 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
17 | # from git.git |
17 | # from git.git |
18 | # |
18 | # |
19 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
19 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
20 | QUIET_SUBDIR1 = |
20 | QUIET_SUBDIR1 = |
21 | |
21 | |
22 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
22 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
23 | PRINT_DIR = --no-print-directory |
23 | PRINT_DIR = --no-print-directory |
24 | else # "make -w" |
24 | else # "make -w" |
25 | NO_SUBDIR = : |
25 | NO_SUBDIR = : |
26 | endif |
26 | endif |
27 | |
27 | |
28 | ifndef V |
28 | ifndef V |
29 | QUIET_CC = @echo ' ' CC $@; |
29 | QUIET_CC = @echo ' ' CC $@; |
30 | QUIET_MM = @echo ' ' MM $@; |
30 | QUIET_MM = @echo ' ' MM $@; |
31 | QUIET_SUBDIR0 = +@subdir= |
31 | QUIET_SUBDIR0 = +@subdir= |
32 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
32 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
33 | $(MAKE) $(PRINT_DIR) -C $$subdir |
33 | $(MAKE) $(PRINT_DIR) -C $$subdir |
34 | endif |
34 | endif |
35 | |
35 | |
36 | # |
36 | # |
37 | # Define a pattern rule for automatic dependency building |
37 | # Define a pattern rule for automatic dependency building |
38 | # |
38 | # |
39 | %.d: %.c |
39 | %.d: %.c |
40 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
40 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
41 | |
41 | |
42 | # |
42 | # |
43 | # Define a pattern rule for silent object building |
43 | # Define a pattern rule for silent object building |
44 | # |
44 | # |
45 | %.o: %.c |
45 | %.o: %.c |
46 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
46 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
47 | |
47 | |
48 | |
48 | |
49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
49 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
50 | OBJECTS = |
50 | OBJECTS = |
51 | OBJECTS += cache.o |
51 | OBJECTS += cache.o |
52 | OBJECTS += cgit.o |
52 | OBJECTS += cgit.o |
53 | OBJECTS += cmd.o |
53 | OBJECTS += cmd.o |
54 | OBJECTS += configfile.o |
54 | OBJECTS += configfile.o |
55 | OBJECTS += html.o |
55 | OBJECTS += html.o |
56 | OBJECTS += parsing.o |
56 | OBJECTS += parsing.o |
57 | OBJECTS += scan-tree.o |
57 | OBJECTS += scan-tree.o |
58 | OBJECTS += shared.o |
58 | OBJECTS += shared.o |
59 | OBJECTS += ui-atom.o |
59 | OBJECTS += ui-atom.o |
60 | OBJECTS += ui-blob.o |
60 | OBJECTS += ui-blob.o |
61 | OBJECTS += ui-clone.o |
61 | OBJECTS += ui-clone.o |
62 | OBJECTS += ui-commit.o |
62 | OBJECTS += ui-commit.o |
63 | OBJECTS += ui-diff.o |
63 | OBJECTS += ui-diff.o |
64 | OBJECTS += ui-log.o |
64 | OBJECTS += ui-log.o |
65 | OBJECTS += ui-patch.o |
65 | OBJECTS += ui-patch.o |
66 | OBJECTS += ui-plain.o |
66 | OBJECTS += ui-plain.o |
67 | OBJECTS += ui-refs.o |
67 | OBJECTS += ui-refs.o |
68 | OBJECTS += ui-repolist.o |
68 | OBJECTS += ui-repolist.o |
69 | OBJECTS += ui-shared.o |
69 | OBJECTS += ui-shared.o |
70 | OBJECTS += ui-snapshot.o |
70 | OBJECTS += ui-snapshot.o |
71 | OBJECTS += ui-summary.o |
71 | OBJECTS += ui-summary.o |
72 | OBJECTS += ui-tag.o |
72 | OBJECTS += ui-tag.o |
73 | OBJECTS += ui-tree.o |
73 | OBJECTS += ui-tree.o |
74 | |
74 | |
75 | ifdef NEEDS_LIBICONV |
75 | ifdef NEEDS_LIBICONV |
76 | EXTLIBS += -liconv |
76 | EXTLIBS += -liconv |
77 | endif |
77 | endif |
78 | |
78 | |
79 | |
79 | |
80 | .PHONY: all libgit test install uninstall clean force-version get-git |
80 | .PHONY: all libgit test install uninstall clean force-version get-git |
81 | |
81 | |
82 | all: cgit |
82 | all: cgit |
83 | |
83 | |
84 | VERSION: force-version |
84 | VERSION: force-version |
85 | @./gen-version.sh "$(CGIT_VERSION)" |
85 | @./gen-version.sh "$(CGIT_VERSION)" |
86 | -include VERSION |
86 | -include VERSION |
87 | |
87 | |
88 | |
88 | |
89 | CFLAGS += -g -Wall -Igit |
89 | CFLAGS += -g -Wall -Igit |
90 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
90 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
91 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
91 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
92 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
92 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
93 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
93 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
94 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
94 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
95 | |
95 | |
96 | ifdef NO_ICONV |
96 | ifdef NO_ICONV |
97 | CFLAGS += -DNO_ICONV |
97 | CFLAGS += -DNO_ICONV |
|