Retire diffcore-pathspec.

[git.git] / Makefile

diff --git a/Makefile b/Makefile
index 3471177..a979205 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -197,7 +197,7 @@ LIB_H = \
        tree-walk.h
 
 DIFF_OBJS = \
-       diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
+       diff.o diffcore-break.o diffcore-order.o \
        diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
        diffcore-delta.o
 
@@ -324,10 +324,12 @@ ifndef NO_CURL
        curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
        ifeq "$(curl_check)" "070908"
                ifndef NO_EXPAT
-                       EXPAT_LIBEXPAT = -lexpat
                        PROGRAMS += git-http-push$X
                endif
        endif
+       ifndef NO_EXPAT
+               EXPAT_LIBEXPAT = -lexpat
+       endif
 endif
 
 ifndef NO_OPENSSL