summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-11 00:37:58 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-11 02:40:59 (GMT)
commit944e3a88fe9fa767a9e0100661026992755ab917 (patch)
tree6c46cc63a83c41cee2350670b071b8e9a98a3953
parent91730800e975e208364261a691cbf28c5afe3bce (diff)
downloadgit-944e3a88fe9fa767a9e0100661026992755ab917.zip
git-944e3a88fe9fa767a9e0100661026992755ab917.tar.gz
git-944e3a88fe9fa767a9e0100661026992755ab917.tar.bz2
Retire git-log.sh (take#2)
... and install a replacement properly. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 5239526..c0409f3 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)