author | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 22:10:59 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 22:27:16 (UTC) |
commit | 92908af4558d7362c7deeb05254343a5a5f11a05 (patch) (unidiff) | |
tree | 6913a6f567375446fb680bc7e94dbabb5d8e496d | |
parent | df90b51bafec24336cf30339b2978ff6df22b075 (diff) | |
download | cgit-92908af4558d7362c7deeb05254343a5a5f11a05.zip cgit-92908af4558d7362c7deeb05254343a5a5f11a05.tar.gz cgit-92908af4558d7362c7deeb05254343a5a5f11a05.tar.bz2 |
Move cgit_version from shared.c to cgit.c
With the matching Makefile change, this makes sure that only cgit.o and cgit
proper needs to be rebuildt when VERSION has been modified.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | shared.c | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -63,13 +63,15 @@ 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 |
@@ -7,12 +7,14 @@ | |||
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); |
@@ -9,14 +9,12 @@ | |||
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 | } |