Retire git-log.sh

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index a979205ec589fe135d62673e2ae4a6f6cbe1dd57..52395268610cb40bbf2fbbf1ad8580ef3a2a8029 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ SCRIPT_SH = \
        git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
        git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
        git-count-objects.sh git-diff.sh git-fetch.sh \
        git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
        git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
        git-count-objects.sh git-diff.sh git-fetch.sh \

-       git-format-patch.sh git-log.sh git-ls-remote.sh \
+       git-format-patch.sh git-ls-remote.sh \

        git-merge-one-file.sh git-parse-remote.sh \
        git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
        git-repack.sh git-request-pull.sh git-reset.sh \
        git-merge-one-file.sh git-parse-remote.sh \
        git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
        git-repack.sh git-request-pull.sh git-reset.sh \


@@ -167,6 +167,8 @@ PROGRAMS = \
        git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
        git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
 
        git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
        git-describe$X git-merge-tree$X git-blame$X git-imap-send$X
 

+BUILT_INS = git-log$X
+

 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
 
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
 


@@ -448,7 +450,7 @@ LIB_OBJS += $(COMPAT_OBJS)
 export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
 ### Build rules
 
 export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
 ### Build rules
 

-all: $(ALL_PROGRAMS) git$X gitk
+all: $(ALL_PROGRAMS) git$X $(BUILT_INS) gitk

 
 all:
        $(MAKE) -C templates
 
 all:
        $(MAKE) -C templates


@@ -461,6 +463,9 @@ git$X: git.c common-cmds.h $(GITLIBS)
                $(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
                $(ALL_LDFLAGS) $(LIBS)
 
                $(ALL_CFLAGS) -o $@ $(filter %.c,$^) \
                $(ALL_LDFLAGS) $(LIBS)
 

+$(BUILT_INS): git$X
+       rm -f $@ && ln git$X $@
+

 common-cmds.h: Documentation/git-*.txt
        ./generate-cmdlist.sh > $@
 
 common-cmds.h: Documentation/git-*.txt
        ./generate-cmdlist.sh > $@
 


@@ -642,7 +647,7 @@ rpm: dist
 
 clean:
        rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
 
 clean:
        rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \

-               $(LIB_FILE) $(XDIFF_LIB)
+               $(LIB_FILE) $(XDIFF_LIB) $(BUILT_INS)

        rm -f $(ALL_PROGRAMS) git$X
        rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
        rm -rf $(GIT_TARNAME)
        rm -f $(ALL_PROGRAMS) git$X
        rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
        rm -rf $(GIT_TARNAME)