|
diff --git a/Makefile b/Makefile index faf7b98..c9be8fa 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -57,25 +57,27 @@ VERSION: force-version |
57 | |
57 | |
58 | CFLAGS += -g -Wall -Igit |
58 | CFLAGS += -g -Wall -Igit |
59 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
59 | CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)' |
60 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
60 | CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"' |
61 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
61 | CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' |
62 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
62 | CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' |
63 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
63 | CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' |
64 | |
64 | |
65 | |
65 | |
66 | cgit: $(OBJECTS) |
66 | cgit: $(OBJECTS) |
67 | $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
67 | $(CC) $(CFLAGS) -o cgit $(OBJECTS) $(EXTLIBS) |
68 | |
68 | |
69 | $(OBJECTS): git/xdiff/lib.a git/libgit.a VERSION |
69 | $(OBJECTS): git/xdiff/lib.a git/libgit.a |
| |
70 | |
| |
71 | cgit.o: VERSION |
70 | |
72 | |
71 | -include $(OBJECTS:.o=.d) |
73 | -include $(OBJECTS:.o=.d) |
72 | |
74 | |
73 | git/xdiff/lib.a: | git |
75 | git/xdiff/lib.a: | git |
74 | |
76 | |
75 | git/libgit.a: | git |
77 | git/libgit.a: | git |
76 | |
78 | |
77 | git: |
79 | git: |
78 | cd git && $(MAKE) xdiff/lib.a |
80 | cd git && $(MAKE) xdiff/lib.a |
79 | cd git && $(MAKE) libgit.a |
81 | cd git && $(MAKE) libgit.a |
80 | |
82 | |
81 | test: all |
83 | test: all |
|
|
diff --git a/cgit.c b/cgit.c index b3dd119..3943a0f 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -1,24 +1,26 @@ |
1 | /* cgit.c: cgi for the git scm |
1 | /* cgit.c: cgi for the git scm |
2 | * |
2 | * |
3 | * Copyright (C) 2006 Lars Hjemli |
3 | * Copyright (C) 2006 Lars Hjemli |
4 | * |
4 | * |
5 | * Licensed under GNU General Public License v2 |
5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) |
6 | * (see COPYING for full license text) |
7 | */ |
7 | */ |
8 | |
8 | |
9 | #include "cgit.h" |
9 | #include "cgit.h" |
10 | #include "cmd.h" |
10 | #include "cmd.h" |
11 | #include "ui-shared.h" |
11 | #include "ui-shared.h" |
12 | |
12 | |
| |
13 | const char *cgit_version = CGIT_VERSION; |
| |
14 | |
13 | void config_cb(const char *name, const char *value) |
15 | void config_cb(const char *name, const char *value) |
14 | { |
16 | { |
15 | if (!strcmp(name, "root-title")) |
17 | if (!strcmp(name, "root-title")) |
16 | ctx.cfg.root_title = xstrdup(value); |
18 | ctx.cfg.root_title = xstrdup(value); |
17 | else if (!strcmp(name, "css")) |
19 | else if (!strcmp(name, "css")) |
18 | ctx.cfg.css = xstrdup(value); |
20 | ctx.cfg.css = xstrdup(value); |
19 | else if (!strcmp(name, "logo")) |
21 | else if (!strcmp(name, "logo")) |
20 | ctx.cfg.logo = xstrdup(value); |
22 | ctx.cfg.logo = xstrdup(value); |
21 | else if (!strcmp(name, "index-header")) |
23 | else if (!strcmp(name, "index-header")) |
22 | ctx.cfg.index_header = xstrdup(value); |
24 | ctx.cfg.index_header = xstrdup(value); |
23 | else if (!strcmp(name, "index-info")) |
25 | else if (!strcmp(name, "index-info")) |
24 | ctx.cfg.index_info = xstrdup(value); |
26 | ctx.cfg.index_info = xstrdup(value); |
|
|
diff --git a/shared.c b/shared.c index cd60da5..48002ac 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -3,26 +3,24 @@ |
3 | * Copyright (C) 2006 Lars Hjemli |
3 | * Copyright (C) 2006 Lars Hjemli |
4 | * |
4 | * |
5 | * Licensed under GNU General Public License v2 |
5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) |
6 | * (see COPYING for full license text) |
7 | */ |
7 | */ |
8 | |
8 | |
9 | #include "cgit.h" |
9 | #include "cgit.h" |
10 | |
10 | |
11 | struct cgit_repolist cgit_repolist; |
11 | struct cgit_repolist cgit_repolist; |
12 | struct cgit_context ctx; |
12 | struct cgit_context ctx; |
13 | int cgit_cmd; |
13 | int cgit_cmd; |
14 | |
14 | |
15 | const char *cgit_version = CGIT_VERSION; |
| |
16 | |
| |
17 | int chk_zero(int result, char *msg) |
15 | int chk_zero(int result, char *msg) |
18 | { |
16 | { |
19 | if (result != 0) |
17 | if (result != 0) |
20 | die("%s: %s", msg, strerror(errno)); |
18 | die("%s: %s", msg, strerror(errno)); |
21 | return result; |
19 | return result; |
22 | } |
20 | } |
23 | |
21 | |
24 | int chk_positive(int result, char *msg) |
22 | int chk_positive(int result, char *msg) |
25 | { |
23 | { |
26 | if (result <= 0) |
24 | if (result <= 0) |
27 | die("%s: %s", msg, strerror(errno)); |
25 | die("%s: %s", msg, strerror(errno)); |
28 | return result; |
26 | return result; |
|