|
diff --git a/Makefile b/Makefile index 2cf8b80..0f0089a 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -1,156 +1,156 @@ |
1 | CGIT_VERSION = v0.8.1.1 |
1 | CGIT_VERSION = v0.8.2 |
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.6.1.1 |
8 | GIT_VER = 1.6.1.1 |
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 NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
14 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). |
15 | # |
15 | # |
16 | |
16 | |
17 | #-include config.mak |
17 | #-include config.mak |
18 | |
18 | |
19 | # |
19 | # |
20 | # Platform specific tweaks |
20 | # Platform specific tweaks |
21 | # |
21 | # |
22 | |
22 | |
23 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
23 | uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') |
24 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
24 | uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') |
25 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
25 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') |
26 | |
26 | |
27 | ifeq ($(uname_O),Cygwin) |
27 | ifeq ($(uname_O),Cygwin) |
28 | NO_STRCASESTR = YesPlease |
28 | NO_STRCASESTR = YesPlease |
29 | NEEDS_LIBICONV = YesPlease |
29 | NEEDS_LIBICONV = YesPlease |
30 | endif |
30 | endif |
31 | |
31 | |
32 | # |
32 | # |
33 | # Let the user override the above settings. |
33 | # Let the user override the above settings. |
34 | # |
34 | # |
35 | -include cgit.conf |
35 | -include cgit.conf |
36 | |
36 | |
37 | # |
37 | # |
38 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
38 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
39 | # from git.git |
39 | # from git.git |
40 | # |
40 | # |
41 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
41 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
42 | QUIET_SUBDIR1 = |
42 | QUIET_SUBDIR1 = |
43 | |
43 | |
44 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
44 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
45 | PRINT_DIR = --no-print-directory |
45 | PRINT_DIR = --no-print-directory |
46 | else # "make -w" |
46 | else # "make -w" |
47 | NO_SUBDIR = : |
47 | NO_SUBDIR = : |
48 | endif |
48 | endif |
49 | |
49 | |
50 | ifndef V |
50 | ifndef V |
51 | QUIET_CC = @echo ' ' CC $@; |
51 | QUIET_CC = @echo ' ' CC $@; |
52 | QUIET_MM = @echo ' ' MM $@; |
52 | QUIET_MM = @echo ' ' MM $@; |
53 | QUIET_SUBDIR0 = +@subdir= |
53 | QUIET_SUBDIR0 = +@subdir= |
54 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
54 | QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \ |
55 | $(MAKE) $(PRINT_DIR) -C $$subdir |
55 | $(MAKE) $(PRINT_DIR) -C $$subdir |
56 | endif |
56 | endif |
57 | |
57 | |
58 | # |
58 | # |
59 | # Define a pattern rule for automatic dependency building |
59 | # Define a pattern rule for automatic dependency building |
60 | # |
60 | # |
61 | %.d: %.c |
61 | %.d: %.c |
62 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
62 | $(QUIET_MM)$(CC) $(CFLAGS) -MM $< | sed -e 's/\($*\)\.o:/\1.o $@:/g' >$@ |
63 | |
63 | |
64 | # |
64 | # |
65 | # Define a pattern rule for silent object building |
65 | # Define a pattern rule for silent object building |
66 | # |
66 | # |
67 | %.o: %.c |
67 | %.o: %.c |
68 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
68 | $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $< |
69 | |
69 | |
70 | |
70 | |
71 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
71 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
72 | OBJECTS = |
72 | OBJECTS = |
73 | OBJECTS += cache.o |
73 | OBJECTS += cache.o |
74 | OBJECTS += cgit.o |
74 | OBJECTS += cgit.o |
75 | OBJECTS += cmd.o |
75 | OBJECTS += cmd.o |
76 | OBJECTS += configfile.o |
76 | OBJECTS += configfile.o |
77 | OBJECTS += html.o |
77 | OBJECTS += html.o |
78 | OBJECTS += parsing.o |
78 | OBJECTS += parsing.o |
79 | OBJECTS += scan-tree.o |
79 | OBJECTS += scan-tree.o |
80 | OBJECTS += shared.o |
80 | OBJECTS += shared.o |
81 | OBJECTS += ui-atom.o |
81 | OBJECTS += ui-atom.o |
82 | OBJECTS += ui-blob.o |
82 | OBJECTS += ui-blob.o |
83 | OBJECTS += ui-clone.o |
83 | OBJECTS += ui-clone.o |
84 | OBJECTS += ui-commit.o |
84 | OBJECTS += ui-commit.o |
85 | OBJECTS += ui-diff.o |
85 | OBJECTS += ui-diff.o |
86 | OBJECTS += ui-log.o |
86 | OBJECTS += ui-log.o |
87 | OBJECTS += ui-patch.o |
87 | OBJECTS += ui-patch.o |
88 | OBJECTS += ui-plain.o |
88 | OBJECTS += ui-plain.o |
89 | OBJECTS += ui-refs.o |
89 | OBJECTS += ui-refs.o |
90 | OBJECTS += ui-repolist.o |
90 | OBJECTS += ui-repolist.o |
91 | OBJECTS += ui-shared.o |
91 | OBJECTS += ui-shared.o |
92 | OBJECTS += ui-snapshot.o |
92 | OBJECTS += ui-snapshot.o |
93 | OBJECTS += ui-stats.o |
93 | OBJECTS += ui-stats.o |
94 | OBJECTS += ui-summary.o |
94 | OBJECTS += ui-summary.o |
95 | OBJECTS += ui-tag.o |
95 | OBJECTS += ui-tag.o |
96 | OBJECTS += ui-tree.o |
96 | OBJECTS += ui-tree.o |
97 | |
97 | |
98 | ifdef NEEDS_LIBICONV |
98 | ifdef NEEDS_LIBICONV |
99 | EXTLIBS += -liconv |
99 | EXTLIBS += -liconv |
100 | endif |
100 | endif |
101 | |
101 | |
102 | |
102 | |
103 | .PHONY: all libgit test install uninstall clean force-version get-git |
103 | .PHONY: all libgit test install uninstall clean force-version get-git |
104 | |
104 | |
105 | all: cgit |
105 | all: cgit |
106 | |
106 | |
107 | VERSION: force-version |
107 | VERSION: force-version |
108 | @./gen-version.sh "$(CGIT_VERSION)" |
108 | @./gen-version.sh "$(CGIT_VERSION)" |
109 | -include VERSION |
109 | -include VERSION |
110 | |
110 | |
111 | |
111 | |
112 | CFLAGS += -g -Wall -Igit |
112 | CFLAGS += -g -Wall -Igit |
113 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
113 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
114 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
114 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
115 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
115 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
116 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
116 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
117 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
117 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
118 | |
118 | |
119 | ifdef NO_ICONV |
119 | ifdef NO_ICONV |
120 | CFLAGS += -DNO_ICONV |
120 | CFLAGS += -DNO_ICONV |
121 | endif |
121 | endif |
122 | ifdef NO_STRCASESTR |
122 | ifdef NO_STRCASESTR |
123 | CFLAGS += -DNO_STRCASESTR |
123 | CFLAGS += -DNO_STRCASESTR |
124 | endif |
124 | endif |
125 | |
125 | |
126 | cgit: $(OBJECTS) libgit |
126 | cgit: $(OBJECTS) libgit |
127 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
127 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
128 | |
128 | |
129 | cgit.o: VERSION |
129 | cgit.o: VERSION |
130 | |
130 | |
131 | -include $(OBJECTS:.o=.d) |
131 | -include $(OBJECTS:.o=.d) |
132 | |
132 | |
133 | libgit: |
133 | libgit: |
134 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a |
134 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a |
135 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a |
135 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a |
136 | |
136 | |
137 | test: all |
137 | test: all |
138 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
138 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
139 | |
139 | |
140 | install: all |
140 | install: all |
141 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
141 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
142 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
142 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
143 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) |
143 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) |
144 | $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css |
144 | $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css |
145 | $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png |
145 | $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png |
146 | |
146 | |
147 | uninstall: |
147 | uninstall: |
148 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
148 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
149 | rm -f $(CGIT_DATA_PATH)/cgit.css |
149 | rm -f $(CGIT_DATA_PATH)/cgit.css |
150 | rm -f $(CGIT_DATA_PATH)/cgit.png |
150 | rm -f $(CGIT_DATA_PATH)/cgit.png |
151 | |
151 | |
152 | clean: |
152 | clean: |
153 | rm -f cgit VERSION *.o *.d |
153 | rm -f cgit VERSION *.o *.d |
154 | |
154 | |
155 | get-git: |
155 | get-git: |
156 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |
156 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |
|