|
diff --git a/Makefile b/Makefile index 9457940..21d6cc8 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -1,51 +1,52 @@ |
1 | CGIT_VERSION = v0.8.1 |
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_DATA_PATH = $(CGIT_SCRIPT_PATH) |
4 | CGIT_CONFIG = /etc/cgitrc |
5 | CGIT_CONFIG = /etc/cgitrc |
5 | CACHE_ROOT = /var/cache/cgit |
6 | CACHE_ROOT = /var/cache/cgit |
6 | SHA1_HEADER = <openssl/sha.h> |
7 | SHA1_HEADER = <openssl/sha.h> |
7 | GIT_VER = 1.6.0.3 |
8 | GIT_VER = 1.6.0.3 |
8 | 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 |
9 | INSTALL = install |
10 | INSTALL = install |
10 | |
11 | |
11 | # Define NO_STRCASESTR if you don't have strcasestr. |
12 | # Define NO_STRCASESTR if you don't have strcasestr. |
12 | # |
13 | # |
13 | # 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). |
14 | # |
15 | # |
15 | |
16 | |
16 | #-include config.mak |
17 | #-include config.mak |
17 | |
18 | |
18 | # |
19 | # |
19 | # Platform specific tweaks |
20 | # Platform specific tweaks |
20 | # |
21 | # |
21 | |
22 | |
22 | 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') |
23 | 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') |
24 | 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') |
25 | |
26 | |
26 | ifeq ($(uname_O),Cygwin) |
27 | ifeq ($(uname_O),Cygwin) |
27 | NO_STRCASESTR = YesPlease |
28 | NO_STRCASESTR = YesPlease |
28 | NEEDS_LIBICONV = YesPlease |
29 | NEEDS_LIBICONV = YesPlease |
29 | endif |
30 | endif |
30 | |
31 | |
31 | # |
32 | # |
32 | # Let the user override the above settings. |
33 | # Let the user override the above settings. |
33 | # |
34 | # |
34 | -include cgit.conf |
35 | -include cgit.conf |
35 | |
36 | |
36 | # |
37 | # |
37 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
38 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
38 | # from git.git |
39 | # from git.git |
39 | # |
40 | # |
40 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
41 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
41 | QUIET_SUBDIR1 = |
42 | QUIET_SUBDIR1 = |
42 | |
43 | |
43 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
44 | ifneq ($(findstring $(MAKEFLAGS),w),w) |
44 | PRINT_DIR = --no-print-directory |
45 | PRINT_DIR = --no-print-directory |
45 | else # "make -w" |
46 | else # "make -w" |
46 | NO_SUBDIR = : |
47 | NO_SUBDIR = : |
47 | endif |
48 | endif |
48 | |
49 | |
49 | ifndef V |
50 | ifndef V |
50 | QUIET_CC = @echo ' ' CC $@; |
51 | QUIET_CC = @echo ' ' CC $@; |
51 | QUIET_MM = @echo ' ' MM $@; |
52 | QUIET_MM = @echo ' ' MM $@; |
@@ -93,61 +94,62 @@ OBJECTS += ui-summary.o |
93 | OBJECTS += ui-tag.o |
94 | OBJECTS += ui-tag.o |
94 | OBJECTS += ui-tree.o |
95 | OBJECTS += ui-tree.o |
95 | |
96 | |
96 | ifdef NEEDS_LIBICONV |
97 | ifdef NEEDS_LIBICONV |
97 | EXTLIBS += -liconv |
98 | EXTLIBS += -liconv |
98 | endif |
99 | endif |
99 | |
100 | |
100 | |
101 | |
101 | .PHONY: all libgit test install uninstall clean force-version get-git |
102 | .PHONY: all libgit test install uninstall clean force-version get-git |
102 | |
103 | |
103 | all: cgit |
104 | all: cgit |
104 | |
105 | |
105 | VERSION: force-version |
106 | VERSION: force-version |
106 | @./gen-version.sh "$(CGIT_VERSION)" |
107 | @./gen-version.sh "$(CGIT_VERSION)" |
107 | -include VERSION |
108 | -include VERSION |
108 | |
109 | |
109 | |
110 | |
110 | CFLAGS += -g -Wall -Igit |
111 | CFLAGS += -g -Wall -Igit |
111 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
112 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
112 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
113 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
113 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
114 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
114 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
115 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
115 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
116 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
116 | |
117 | |
117 | ifdef NO_ICONV |
118 | ifdef NO_ICONV |
118 | CFLAGS += -DNO_ICONV |
119 | CFLAGS += -DNO_ICONV |
119 | endif |
120 | endif |
120 | ifdef NO_STRCASESTR |
121 | ifdef NO_STRCASESTR |
121 | CFLAGS += -DNO_STRCASESTR |
122 | CFLAGS += -DNO_STRCASESTR |
122 | endif |
123 | endif |
123 | |
124 | |
124 | cgit: $(OBJECTS) libgit |
125 | cgit: $(OBJECTS) libgit |
125 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
126 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
126 | |
127 | |
127 | cgit.o: VERSION |
128 | cgit.o: VERSION |
128 | |
129 | |
129 | -include $(OBJECTS:.o=.d) |
130 | -include $(OBJECTS:.o=.d) |
130 | |
131 | |
131 | libgit: |
132 | libgit: |
132 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a |
133 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a |
133 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a |
134 | $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a |
134 | |
135 | |
135 | test: all |
136 | test: all |
136 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
137 | $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all |
137 | |
138 | |
138 | install: all |
139 | install: all |
139 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
140 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) |
140 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
141 | $(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
141 | $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css |
142 | $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH) |
142 | $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png |
143 | $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css |
| |
144 | $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png |
143 | |
145 | |
144 | uninstall: |
146 | uninstall: |
145 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
147 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
146 | rm -f $(CGIT_SCRIPT_PATH)/cgit.css |
148 | rm -f $(CGIT_DATA_PATH)/cgit.css |
147 | rm -f $(CGIT_SCRIPT_PATH)/cgit.png |
149 | rm -f $(CGIT_DATA_PATH)/cgit.png |
148 | |
150 | |
149 | clean: |
151 | clean: |
150 | rm -f cgit VERSION *.o *.d |
152 | rm -f cgit VERSION *.o *.d |
151 | |
153 | |
152 | get-git: |
154 | get-git: |
153 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |
155 | curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git |
|