author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2008-11-15 18:26:32 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-03 22:39:30 (UTC) |
commit | 97fdac1608a0b4b07aae26b144c6ee7991e6c5eb (patch) (unidiff) | |
tree | e140bc09861b1d7a08a7fd7a3ef89e89b56b939e | |
parent | c7d1402b177f4cf835e81f962e2faa3c9e28c549 (diff) | |
download | cgit-97fdac1608a0b4b07aae26b144c6ee7991e6c5eb.zip cgit-97fdac1608a0b4b07aae26b144c6ee7991e6c5eb.tar.gz cgit-97fdac1608a0b4b07aae26b144c6ee7991e6c5eb.tar.bz2 |
Extra cygwin-specific changes
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 23 | ||||
-rw-r--r-- | cgit.h | 6 |
2 files changed, 23 insertions, 6 deletions
@@ -9,12 +9,32 @@ 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 | # Define NO_STRCASESTR if you don't have strcasestr. | ||
16 | # | ||
17 | # Define NEEDS_LIBICONV if linking with libc is not enough (eg. Darwin). | ||
18 | # | ||
19 | |||
20 | #-include config.mak | ||
21 | |||
22 | # | ||
23 | # Platform specific tweaks | ||
24 | # | ||
25 | |||
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') | ||
28 | uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') | ||
29 | |||
30 | ifeq ($(uname_O),Cygwin) | ||
31 | NO_STRCASESTR = YesPlease | ||
32 | NEEDS_LIBICONV = YesPlease | ||
33 | endif | ||
34 | |||
15 | # | 35 | # |
16 | # Define a way to invoke make in subdirs quietly, shamelessly ripped | 36 | # Define a way to invoke make in subdirs quietly, shamelessly ripped |
17 | # from git.git | 37 | # from git.git |
18 | # | 38 | # |
19 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir | 39 | QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir |
20 | QUIET_SUBDIR1 = | 40 | QUIET_SUBDIR1 = |
@@ -93,12 +113,15 @@ CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' | |||
93 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' | 113 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
94 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' | 114 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
95 | 115 | ||
96 | ifdef NO_ICONV | 116 | ifdef NO_ICONV |
97 | CFLAGS += -DNO_ICONV | 117 | CFLAGS += -DNO_ICONV |
98 | endif | 118 | endif |
119 | ifdef NO_STRCASESTR | ||
120 | CFLAGS += -DNO_STRCASESTR | ||
121 | endif | ||
99 | 122 | ||
100 | cgit: $(OBJECTS) libgit | 123 | cgit: $(OBJECTS) libgit |
101 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) | 124 | $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
102 | 125 | ||
103 | cgit.o: VERSION | 126 | cgit.o: VERSION |
104 | 127 | ||
@@ -230,14 +230,8 @@ extern struct taginfo *cgit_parse_tag(struct tag *tag); | |||
230 | extern void cgit_parse_url(const char *url); | 230 | extern void cgit_parse_url(const char *url); |
231 | 231 | ||
232 | extern const char *cgit_repobasename(const char *reponame); | 232 | extern const char *cgit_repobasename(const char *reponame); |
233 | 233 | ||
234 | extern int cgit_parse_snapshots_mask(const char *str); | 234 | extern int cgit_parse_snapshots_mask(const char *str); |
235 | 235 | ||
236 | /* libgit.a either links against or compiles its own implementation of | ||
237 | * strcasestr(), and we'd like to reuse it. Simply re-declaring it | ||
238 | * seems to do the trick. | ||
239 | */ | ||
240 | extern char *strcasestr(const char *haystack, const char *needle); | ||
241 | |||
242 | 236 | ||
243 | #endif /* CGIT_H */ | 237 | #endif /* CGIT_H */ |