summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-27 07:44:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-27 07:44:28 (GMT)
commitac93bfc3b64a8a3756263ecdadad3e7a117be597 (patch)
tree83ee665768a654e556684fcf1d8a25b09819aaec
parentd93067d9c7fb210766c7282d662289f54d53f93a (diff)
parent3467fec516e0549cfe7ae3ed8bd981a7e5f528f4 (diff)
downloadgit-ac93bfc3b64a8a3756263ecdadad3e7a117be597.zip
git-ac93bfc3b64a8a3756263ecdadad3e7a117be597.tar.gz
git-ac93bfc3b64a8a3756263ecdadad3e7a117be597.tar.bz2
Merge branch 'lt/diffgen' into next
* lt/diffgen: add clean and ignore rules for xdiff/ Remove dependency on a file named "-lz"
-rw-r--r--.gitignore3
-rw-r--r--Makefile9
2 files changed, 6 insertions, 6 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 663a803..4edb383 100644
--- a/Makefile
+++ b/Makefile
@@ -210,8 +210,8 @@ LIB_OBJS = \
fetch-clone.o revision.o pager.o \
$(DIFF_OBJS)
-LIBS = $(LIB_FILE) $(XDIFF_LIB)
-LIBS += -lz
+GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
+LIBS = $(GITLIBS) -lz
#
# Platform specific tweaks
@@ -545,7 +545,7 @@ init-db.o: init-db.c
-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir_SQ)"' $*.c
$(LIB_OBJS): $(LIB_H)
-$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIBS)
+$(patsubst git-%$X,%.o,$(PROGRAMS)): $(GITLIBS)
$(DIFF_OBJS): diffcore.h
$(LIB_FILE): $(LIB_OBJS)
@@ -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)