On MinGW, we won't compile some programs. Signed-off-by: Johannes Sixt <johannes.sixt@xxxxxxxxxx> --- Makefile | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d33a556..870a862 100644 --- a/Makefile +++ b/Makefile @@ -255,7 +255,6 @@ PROGRAMS = \ git-fetch-pack$X \ git-hash-object$X git-index-pack$X \ git-fast-import$X \ - git-daemon$X \ git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \ git-receive-pack$X \ git-send-pack$X git-shell$X \ @@ -264,7 +263,7 @@ PROGRAMS = \ git-update-server-info$X \ git-upload-pack$X \ git-pack-redundant$X git-var$X \ - git-merge-tree$X git-imap-send$X \ + git-merge-tree$X \ git-merge-recursive$X \ $(EXTRA_PROGRAMS) @@ -583,6 +582,11 @@ ifdef ZLIB_PATH endif EXTLIBS += -lz +ifndef NO_EXTRA_PROGRAMS + EXTRA_PROGRAMS += \ + git-daemon$X \ + git-imap-send$X +endif ifndef NO_OPENSSL OPENSSL_LIBSSL = -lssl ifdef OPENSSLDIR -- 1.5.4.1.126.ge5a7d - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
