[PATCH 1/4] Move git_version_string to help.c in preparation for diff changes
From: Zbigniew Jędrzejewski-Szmek <hidden>
Date: 2016-06-15 22:53:02
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
git_version_string is declared in builtins.h, but lived in git.c. When diff.c starts to use functions from help.c, linking against libgit.a will fail, unless git.o containing git_version_string is linked too. This variable is only used in a couple of places, help.c being one of them. git.o is biggish, so it let's move git_version_string to help.c. Signed-off-by: Zbigniew Jędrzejewski-Szmek <redacted> --- Makefile | 5 +++-- git.c | 2 -- help.c | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index a782409..264fe4f 100644
--- a/Makefile
+++ b/Makefile@@ -1851,7 +1851,7 @@ strip: $(PROGRAMS) git$X $(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X git.o: common-cmds.h -git.sp git.s git.o: EXTRA_CPPFLAGS = -DGIT_VERSION='"$(GIT_VERSION)"' \ +git.sp git.s git.o: EXTRA_CPPFLAGS = \ '-DGIT_HTML_PATH="$(htmldir_SQ)"' \ '-DGIT_MAN_PATH="$(mandir_SQ)"' \ '-DGIT_INFO_PATH="$(infodir_SQ)"'
@@ -1860,7 +1860,8 @@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ git.o \ $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS) -help.sp help.o: common-cmds.h +help.o: common-cmds.h +help.sp help.o: EXTRA_CPPFLAGS = -DGIT_VERSION='"$(GIT_VERSION)"' builtin/help.sp builtin/help.o: common-cmds.h builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
diff --git a/git.c b/git.c
index 3805616..a24a0fd 100644
--- a/git.c
+++ b/git.c@@ -256,8 +256,6 @@ static int handle_alias(int *argcp, const char ***argv) return ret; } -const char git_version_string[] = GIT_VERSION; - #define RUN_SETUP (1<<0) #define RUN_SETUP_GENTLY (1<<1) #define USE_PAGER (1<<2)
diff --git a/help.c b/help.c
index cbbe966..bc15066 100644
--- a/help.c
+++ b/help.c@@ -409,6 +409,8 @@ const char *help_unknown_cmd(const char *cmd) exit(1); } +const char git_version_string[] = GIT_VERSION; + int cmd_version(int argc, const char **argv, const char *prefix) { printf("git version %s\n", git_version_string);
--
1.7.9.rc2.127.gcb239