Retire git-log.sh (take#2)

... and install a replacement properly.

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

diff --git a/Makefile b/Makefile
index 52395268610cb40bbf2fbbf1ad8580ef3a2a8029..c0409f35e38baf7fdac13338001f37ef7ea2e258 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -170,7 +170,7 @@ PROGRAMS = \
 BUILT_INS = git-log$X
 
 # what 'all' will build and 'install' will install, in gitexecdir
 BUILT_INS = git-log$X
 
 # what 'all' will build and 'install' will install, in gitexecdir

-ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
+ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(BUILT_INS) $(SCRIPTS)

 
 # Backward compatibility -- to be removed after 1.0
 PROGRAMS += git-ssh-pull$X git-ssh-push$X
 
 # Backward compatibility -- to be removed after 1.0
 PROGRAMS += git-ssh-pull$X git-ssh-push$X


@@ -450,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 $(BUILT_INS) gitk
+all: $(ALL_PROGRAMS) git$X gitk

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


@@ -647,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) $(BUILT_INS)
+               $(LIB_FILE) $(XDIFF_LIB)

        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)