From 4bb6564bcb3fd7731af67c79ce443a60409b8d17 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Thu, 13 Mar 2008 12:49:13 +0100 Subject: [PATCH] Do not abuse $(EXTRA_PROGRAMS). We don't want to compile some programs on Windows. There was already a Makefile variable EXTRA_PROGRAMS, which we used to achieve this. But this is not exactly self-explanatory. So we name the variable POSIX_ONLY_PROGRAMS and reinstate the old EXTRA_PROGRAMS. Signed-off-by: Johannes Sixt --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index cb64a43091..9023eff0bb 100644 --- a/Makefile +++ b/Makefile @@ -268,6 +268,7 @@ PROGRAMS = \ git-upload-pack$X \ git-pack-redundant$X git-var$X \ git-merge-tree$X \ + $(POSIX_ONLY_PROGRAMS) \ $(EXTRA_PROGRAMS) # Empty... @@ -551,7 +552,7 @@ ifneq (,$(findstring MINGW,$(uname_S))) NO_MKDTEMP = YesPlease NO_SVN_TESTS = YesPlease NO_PERL_MAKEMAKER = YesPlease - NO_EXTRA_PROGRAMS = YesPlease + NO_POSIX_ONLY_PROGRAMS = YesPlease COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\" COMPAT_OBJS += compat/mingw.o compat/fnmatch.o compat/regex.o @@ -621,8 +622,8 @@ ifdef ZLIB_PATH endif EXTLIBS += -lz -ifndef NO_EXTRA_PROGRAMS - EXTRA_PROGRAMS += \ +ifndef NO_POSIX_ONLY_PROGRAMS + POSIX_ONLY_PROGRAMS = \ git-daemon$X \ git-imap-send$X endif