From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 1 Dec 2007 21:58:57 +0000 (-0800)
Subject: Merge branch 'jc/move-gitk'
X-Git-Tag: v1.5.4-rc0~118
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d6e09883f20f13c7e2da75225f4563ea9587e20b?ds=inline;hp=-c

Merge branch 'jc/move-gitk'

* jc/move-gitk:
Move gitk to its own subdirectory
---

d6e09883f20f13c7e2da75225f4563ea9587e20b
diff --combined Makefile
index e869b85b95,251244ecd1..a7e44a3d75
--- a/Makefile
+++ b/Makefile
@@@ -111,7 -111,7 +111,7 @@@ all:
  # times (my ext3 doesn't).
  #
  # Define USE_STDEV below if you want git to care about the underlying device
 -# change being considered an inode change from the update-cache perspective.
 +# change being considered an inode change from the update-index perspective.
  #
  # Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
  #
@@@ -213,14 -213,15 +213,14 @@@ BASIC_LDFLAGS 
  
  SCRIPT_SH = \
  	git-bisect.sh git-checkout.sh \
 -	git-clean.sh git-clone.sh git-commit.sh \
 -	git-ls-remote.sh \
 +	git-clone.sh git-commit.sh \
  	git-merge-one-file.sh git-mergetool.sh git-parse-remote.sh \
  	git-pull.sh git-rebase.sh git-rebase--interactive.sh \
  	git-repack.sh git-request-pull.sh \
  	git-sh-setup.sh \
  	git-am.sh \
  	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
 -	git-merge-resolve.sh git-merge-ours.sh \
 +	git-merge-resolve.sh \
  	git-lost-found.sh git-quiltimport.sh git-submodule.sh \
  	git-filter-branch.sh \
  	git-stash.sh
@@@ -242,7 -243,7 +242,7 @@@ PROGRAMS = 
  	git-fast-import$X \
  	git-daemon$X \
  	git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
 -	git-peek-remote$X git-receive-pack$X \
 +	git-receive-pack$X \
  	git-send-pack$X git-shell$X \
  	git-show-index$X \
  	git-unpack-file$X \
@@@ -269,9 -270,6 +269,6 @@@ ALL_PROGRAMS += git-merge-subtree$
  
  # what 'all' will build but not install in gitexecdir
  OTHER_PROGRAMS = git$X gitweb/gitweb.cgi
- ifndef NO_TCLTK
- OTHER_PROGRAMS += gitk-wish
- endif
  
  # Set paths to tools early so that they can be used for version tests.
  ifndef SHELL_PATH
@@@ -329,7 -327,6 +326,7 @@@ BUILTIN_OBJS = 
  	builtin-check-attr.o \
  	builtin-checkout-index.o \
  	builtin-check-ref-format.o \
 +	builtin-clean.o \
  	builtin-commit-tree.o \
  	builtin-count-objects.o \
  	builtin-describe.o \
@@@ -349,12 -346,10 +346,12 @@@
  	builtin-log.o \
  	builtin-ls-files.o \
  	builtin-ls-tree.o \
 +	builtin-ls-remote.o \
  	builtin-mailinfo.o \
  	builtin-mailsplit.o \
  	builtin-merge-base.o \
  	builtin-merge-file.o \
 +	builtin-merge-ours.o \
  	builtin-mv.o \
  	builtin-name-rev.o \
  	builtin-pack-objects.o \
@@@ -363,7 -358,6 +360,7 @@@
  	builtin-push.o \
  	builtin-read-tree.o \
  	builtin-reflog.o \
 +	builtin-send-pack.o \
  	builtin-config.o \
  	builtin-rerere.o \
  	builtin-reset.o \
@@@ -756,7 -750,7 +753,7 @@@ TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_
  LIBS = $(GITLIBS) $(EXTLIBS)
  
  BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' \
 -	-DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $(COMPAT_CFLAGS)
 +	$(COMPAT_CFLAGS)
  LIB_OBJS += $(COMPAT_OBJS)
  
  ALL_CFLAGS += $(BASIC_CFLAGS)
@@@ -775,6 -769,7 +772,7 @@@ endi
  all::
  ifndef NO_TCLTK
  	$(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) all
+ 	$(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all
  endif
  	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
  	$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1)
@@@ -782,12 -777,6 +780,6 @@@
  strip: $(PROGRAMS) git$X
  	$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
  
- gitk-wish: gitk GIT-GUI-VARS
- 	$(QUIET_GEN)$(RM) $@ $@+ && \
- 	sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
- 	chmod +x $@+ && \
- 	mv -f $@+ $@
- 
  git.o: git.c common-cmds.h GIT-CFLAGS
  	$(QUIET_CC)$(CC) -DGIT_VERSION='"$(GIT_VERSION)"' \
  		$(ALL_CFLAGS) -c $(filter %.c,$^)
@@@ -905,9 -894,6 +897,9 @@@ exec_cmd.o: exec_cmd.c GIT-CFLAG
  builtin-init-db.o: builtin-init-db.c GIT-CFLAGS
  	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $<
  
 +config.o: config.c GIT-CFLAGS
 +	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"' $<
 +
  http.o: http.c GIT-CFLAGS
  	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) -DGIT_USER_AGENT='"git/$(GIT_VERSION)"' $<
  
@@@ -1031,7 -1017,7 +1023,7 @@@ install: al
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
  	$(MAKE) -C perl prefix='$(prefix_SQ)' install
  ifndef NO_TCLTK
- 	$(INSTALL) gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
+ 	$(MAKE) -C gitk-git install
  	$(MAKE) -C git-gui install
  endif
  	if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
@@@ -1124,7 -1110,7 +1116,7 @@@ clean
  	$(MAKE) -C templates/ clean
  	$(MAKE) -C t/ clean
  ifndef NO_TCLTK
- 	$(RM) gitk-wish
+ 	$(MAKE) -C gitk-git clean
  	$(MAKE) -C git-gui clean
  endif
  	$(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS