summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar A Large Angry SCM <gitzilla@gmail.com>2006-04-16 20:17:38 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-16 20:42:37 -0700
commite6bfaf3e33beba9431490a4f5c7a9753986554c4 (patch)
tree556c55e548686918212a0d4a008782e375ef6ae1
parentMerge git://git.kernel.org/pub/scm/gitk/gitk (diff)
downloadtgif-e6bfaf3e33beba9431490a4f5c7a9753986554c4.tar.xz
Makefile fixups.
Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile2
-rw-r--r--t/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1130af4f38..8371f7f522 100644
--- a/Makefile
+++ b/Makefile
@@ -653,7 +653,7 @@ rpm: dist
clean:
rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
$(LIB_FILE) $(XDIFF_LIB)
- rm -f $(ALL_PROGRAMS) git$X
+ rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
rm -rf $(GIT_TARNAME)
rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
diff --git a/t/Makefile b/t/Makefile
index fe65f53c5f..549598575b 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -25,5 +25,5 @@ clean:
rm -fr trash
.PHONY: $(T) clean
-.NOPARALLEL:
+.NOTPARALLEL: