X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Makefile;h=1c555daa43a199a79223fbb8b44ee33627f86aae;hb=f067a13745fbeae1aa357876348a00e5edd0a629;hp=bd156d24fd72bffe56acae986b1bc0eab0b924f2;hpb=765ac8ec469f110e88376e4fac05d0ed475bcb28;p=git.git

diff --git a/Makefile b/Makefile
index bd156d24..1c555daa 100644
--- a/Makefile
+++ b/Makefile
@@ -165,7 +165,7 @@ PROGRAMS = \
 	git-upload-pack$X git-verify-pack$X git-write-tree$X \
 	git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
 	git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
-	git-describe$X git-merge-tree$X
+	git-describe$X git-merge-tree$X git-blame$X
 
 # what 'all' will build and 'install' will install, in gitexecdir
 ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)
@@ -196,7 +196,8 @@ LIB_H = \
 
 DIFF_OBJS = \
 	diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
-	diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o
+	diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
+	diffcore-delta.o
 
 LIB_OBJS = \
 	blob.o commit.o connect.o count-delta.o csum-file.o \
@@ -223,11 +224,15 @@ ifeq ($(uname_S),Darwin)
 	NEEDS_SSL_WITH_CRYPTO = YesPlease
 	NEEDS_LIBICONV = YesPlease
 	## fink
-	ALL_CFLAGS += -I/sw/include
-	ALL_LDFLAGS += -L/sw/lib
+	ifeq ($(shell test -d /sw/lib && echo y),y)
+		ALL_CFLAGS += -I/sw/include
+		ALL_LDFLAGS += -L/sw/lib
+	endif
 	## darwinports
-	ALL_CFLAGS += -I/opt/local/include
-	ALL_LDFLAGS += -L/opt/local/lib
+	ifeq ($(shell test -d /opt/local/lib && echo y),y)
+		ALL_CFLAGS += -I/opt/local/include
+		ALL_LDFLAGS += -L/opt/local/lib
+	endif
 endif
 ifeq ($(uname_S),SunOS)
 	NEEDS_SOCKET = YesPlease
@@ -521,7 +526,7 @@ git-http-fetch$X: fetch.o http.o http-fetch.o $(LIB_FILE)
 	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
 		$(LIBS) $(CURL_LIBCURL)
 
-git-http-push$X: http.o http-push.o $(LIB_FILE)
+git-http-push$X: revision.o http.o http-push.o $(LIB_FILE)
 	$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
 		$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)