Link git-shell only to a subset of libgit.a
Commit 5b8e6f85 introduced stubs for three functions that make no sense for git-shell. But those stubs defined libgit.a functions a second time so that a linker can complain. Now git-shell is only linked to a subset of libgit.a. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stephan Beyer committed
Jul 18, 2008 at 03:04 UTC
78568448239ea09c8a78b72741863be1148c4660
1 file changed
+3
Makefile
+3
@@ -1203,6 +1203,9 @@ git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
1203
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
1204
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
1205
1206
+git-shell$X: compat/strlcpy.o abspath.o ctype.o exec_cmd.o quote.o strbuf.o usage.o wrapper.o shell.o
1207
+ $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^)
1208
+
1209
$(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
1210
$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
1211
builtin-revert.o wt-status.o: wt-status.h