Merge branch 'lt/diffgen' into next

* lt/diffgen:
  add clean and ignore rules for xdiff/
  Remove dependency on a file named "-lz"

diff --combined Makefile
index 663a803,02d290d..4edb383
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -191,7 -191,7 +191,7 @@@ LIB_FILE=libgit.
  XDIFF_LIB=xdiff/lib.a
  
  LIB_H = \
 -      blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
 +      blob.h cache.h commit.h csum-file.h delta.h \
        diff.h object.h pack.h pkt-line.h quote.h refs.h \
        run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h
  
@@@ -201,7 -201,7 +201,7 @@@ DIFF_OBJS = 
        diffcore-delta.o
  
  LIB_OBJS = \
 -      blob.o commit.o connect.o count-delta.o csum-file.o \
 +      blob.o commit.o connect.o csum-file.o \
        date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
        object.o pack-check.o patch-delta.o path.o pkt-line.o \
        quote.o read-cache.o refs.o run-command.o \
@@@ -210,8 -210,8 +210,8 @@@
        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 +545,7 @@@ init-db.o: init-db.
                -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 +629,8 @@@ rpm: dis
  ### 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)