summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-27 07:41:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-27 07:41:22 (GMT)
commit3467fec516e0549cfe7ae3ed8bd981a7e5f528f4 (patch)
tree90e681d7c7b03f9687deb6eeee869d1e2587b96f
parent54c261f90fb8aa9a0f12431cce2c2631a119d667 (diff)
downloadgit-3467fec516e0549cfe7ae3ed8bd981a7e5f528f4.zip
git-3467fec516e0549cfe7ae3ed8bd981a7e5f528f4.tar.gz
git-3467fec516e0549cfe7ae3ed8bd981a7e5f528f4.tar.bz2
add clean and ignore rules for xdiff/
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--.gitignore3
-rw-r--r--Makefile3
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index b4355b9..75891c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,8 +128,7 @@ common-cmds.h
*.deb
git-core.spec
*.exe
-libgit.a
-*.o
+*.[ao]
*.py[co]
config.mak
git-blame
diff --git a/Makefile b/Makefile
index f5e2fc8..02d290d 100644
--- a/Makefile
+++ b/Makefile
@@ -629,7 +629,8 @@ rpm: dist
### Cleaning rules
clean:
- rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o $(LIB_FILE)
+ 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 *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
rm -rf $(GIT_TARNAME)