summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-03-24 22:10:59 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-03-24 22:27:16 (UTC)
commit92908af4558d7362c7deeb05254343a5a5f11a05 (patch) (unidiff)
tree6913a6f567375446fb680bc7e94dbabb5d8e496d
parentdf90b51bafec24336cf30339b2978ff6df22b075 (diff)
downloadcgit-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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile4
-rw-r--r--cgit.c2
-rw-r--r--shared.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index faf7b98..c9be8fa 100644
--- a/Makefile
+++ b/Makefile
@@ -65,9 +65,11 @@ CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
65 65
66cgit: $(OBJECTS) 66cgit: $(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
71cgit.o: VERSION
70 72
71-include $(OBJECTS:.o=.d) 73-include $(OBJECTS:.o=.d)
72 74
73git/xdiff/lib.a: | git 75git/xdiff/lib.a: | git
diff --git a/cgit.c b/cgit.c
index b3dd119..3943a0f 100644
--- a/cgit.c
+++ b/cgit.c
@@ -9,8 +9,10 @@
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
13const char *cgit_version = CGIT_VERSION;
14
13void config_cb(const char *name, const char *value) 15void 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);
diff --git a/shared.c b/shared.c
index cd60da5..48002ac 100644
--- a/shared.c
+++ b/shared.c
@@ -11,10 +11,8 @@
11struct cgit_repolist cgit_repolist; 11struct cgit_repolist cgit_repolist;
12struct cgit_context ctx; 12struct cgit_context ctx;
13int cgit_cmd; 13int cgit_cmd;
14 14
15const char *cgit_version = CGIT_VERSION;
16
17int chk_zero(int result, char *msg) 15int 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));