From: Junio C Hamano Date: Tue, 11 Apr 2006 00:37:58 +0000 (-0700) Subject: Retire git-log.sh (take#2) X-Git-Tag: v1.3.0-rc4~17^2~4 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=944e3a88fe9fa767a9e0100661026992755ab917;p=git.git Retire git-log.sh (take#2) ... and install a replacement properly. Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index 52395268..c0409f35 100644 --- a/Makefile +++ b/Makefile @@ -170,7 +170,7 @@ PROGRAMS = \ 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 @@ -450,7 +450,7 @@ LIB_OBJS += $(COMPAT_OBJS) 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 @@ -647,7 +647,7 @@ rpm: dist 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)