From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 24 Aug 2008 23:14:22 +0000 (-0700)
Subject: Merge branch 'jc/no-slim-shell'
X-Git-Tag: v1.6.1-rc1~307
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/837a156197e7921c256e6189d838963d2999fcb6?ds=inline;hp=-c

Merge branch 'jc/no-slim-shell'

* jc/no-slim-shell:
Build-in "git-shell"
shell: do not play duplicated definition games to shrink the executable
---

837a156197e7921c256e6189d838963d2999fcb6
diff --combined Makefile
index e5a4985a1d,7c585e866c..ff71e6acd1
--- a/Makefile
+++ b/Makefile
@@@ -124,9 -124,6 +124,9 @@@ all:
  # Define USE_STDEV below if you want git to care about the underlying device
  # change being considered an inode change from the update-index perspective.
  #
 +# Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
 +# field that counts the on-disk footprint in 512-byte blocks.
 +#
  # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
  #
  # Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72.
@@@ -336,7 -333,6 +336,6 @@@ endi
  export PERL_PATH
  
  LIB_FILE=libgit.a
- COMPAT_LIB = compat/lib.a
  XDIFF_LIB=xdiff/lib.a
  
  LIB_H += archive.h
@@@ -550,6 -546,7 +549,7 @@@ BUILTIN_OBJS += builtin-rev-parse.
  BUILTIN_OBJS += builtin-revert.o
  BUILTIN_OBJS += builtin-rm.o
  BUILTIN_OBJS += builtin-send-pack.o
+ BUILTIN_OBJS += builtin-shell.o
  BUILTIN_OBJS += builtin-shortlog.o
  BUILTIN_OBJS += builtin-show-branch.o
  BUILTIN_OBJS += builtin-show-ref.o
@@@ -578,11 -575,9 +578,11 @@@ EXTLIBS 
  
  ifeq ($(uname_S),Linux)
  	NO_STRLCPY = YesPlease
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),GNU/kFreeBSD)
  	NO_STRLCPY = YesPlease
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),UnixWare)
  	CC = cc
@@@ -680,7 -675,6 +680,7 @@@ ifeq ($(uname_S),FreeBSD
  	BASIC_CFLAGS += -I/usr/local/include
  	BASIC_LDFLAGS += -L/usr/local/lib
  	DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),OpenBSD)
  	NO_STRCASESTR = YesPlease
@@@ -688,7 -682,6 +688,7 @@@
  	NEEDS_LIBICONV = YesPlease
  	BASIC_CFLAGS += -I/usr/local/include
  	BASIC_LDFLAGS += -L/usr/local/lib
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),NetBSD)
  	ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
@@@ -697,7 -690,6 +697,7 @@@
  	BASIC_CFLAGS += -I/usr/pkg/include
  	BASIC_LDFLAGS += -L/usr/pkg/lib
  	ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),AIX)
  	NO_STRCASESTR=YesPlease
@@@ -735,7 -727,6 +735,7 @@@ ifeq ($(uname_S),HP-UX
  	NO_UNSETENV = YesPlease
  	NO_HSTRERROR = YesPlease
  	NO_SYS_SELECT_H = YesPlease
 +	SNPRINTF_RETURNS_BOGUS = YesPlease
  endif
  ifneq (,$(findstring MINGW,$(uname_S)))
  	NO_MMAP = YesPlease
@@@ -758,7 -749,6 +758,7 @@@
  	NO_SVN_TESTS = YesPlease
  	NO_PERL_MAKEMAKER = YesPlease
  	NO_POSIX_ONLY_PROGRAMS = YesPlease
 +	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
  	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat
  	COMPAT_CFLAGS += -DSNPRINTF_SIZE_CORR=1
  	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
@@@ -832,7 -822,6 +832,6 @@@ EXTLIBS += -l
  ifndef NO_POSIX_ONLY_PROGRAMS
  	PROGRAMS += git-daemon$X
  	PROGRAMS += git-imap-send$X
- 	PROGRAMS += git-shell$X
  endif
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
@@@ -873,9 -862,6 +872,9 @@@ endi
  ifdef NO_D_INO_IN_DIRENT
  	BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
  endif
 +ifdef NO_ST_BLOCKS_IN_STRUCT_STAT
 +	BASIC_CFLAGS += -DNO_ST_BLOCKS_IN_STRUCT_STAT
 +endif
  ifdef NO_C99_FORMAT
  	BASIC_CFLAGS += -DNO_C99_FORMAT
  endif
@@@ -1228,9 -1214,7 +1227,9 @@@ endi
  git-%$X: %.o $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
  
 -git-imap-send$X: imap-send.o $(LIB_FILE)
 +git-imap-send$X: imap-send.o $(GITLIBS)
 +	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
 +		$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL)
  
  http.o http-walker.o http-push.o transport.o: http.h
  
@@@ -1238,12 -1222,6 +1237,6 @@@ git-http-push$X: revision.o http.o http
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
  		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
- $(COMPAT_LIB): $(COMPAT_OBJS)
- 	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(COMPAT_OBJS)
- 
- git-shell$X: abspath.o ctype.o exec_cmd.o quote.o strbuf.o usage.o wrapper.o shell.o $(COMPAT_LIB)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(COMPAT_LIB)
- 
  $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
  $(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
  builtin-revert.o wt-status.o: wt-status.h
@@@ -1456,7 -1434,7 +1449,7 @@@ distclean: clea
  
  clean:
  	$(RM) *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
- 		$(LIB_FILE) $(XDIFF_LIB) $(COMPAT_LIB)
+ 		$(LIB_FILE) $(XDIFF_LIB)
  	$(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
  	$(RM) $(TEST_PROGRAMS)
  	$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags cscope*