Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Compile some programs only conditionally.
author
Johannes Sixt
<johannes.sixt@telecom.at>
Sat, 1 Dec 2007 10:10:54 +0000
(11:10 +0100)
committer
Johannes Sixt
<johannes.sixt@telecom.at>
Sun, 22 Jun 2008 09:32:45 +0000
(11:32 +0200)
These programs depend on difficult to emulate POSIX functionality.
On Windows, we won't compile them.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Makefile
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
f05951f
)
diff --git
a/Makefile
b/Makefile
index b003e3e60a1aecae27497d941d211849bedec02b..95572efee5987b2cae52ffc9569c10348d19dda4 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-273,11
+273,9
@@
EXTRA_PROGRAMS =
# ... and all the rest that could be moved out of bindir to gitexecdir
PROGRAMS += $(EXTRA_PROGRAMS)
# ... and all the rest that could be moved out of bindir to gitexecdir
PROGRAMS += $(EXTRA_PROGRAMS)
-PROGRAMS += git-daemon$X
PROGRAMS += git-fast-import$X
PROGRAMS += git-fetch-pack$X
PROGRAMS += git-hash-object$X
PROGRAMS += git-fast-import$X
PROGRAMS += git-fetch-pack$X
PROGRAMS += git-hash-object$X
-PROGRAMS += git-imap-send$X
PROGRAMS += git-index-pack$X
PROGRAMS += git-merge-index$X
PROGRAMS += git-merge-tree$X
PROGRAMS += git-index-pack$X
PROGRAMS += git-merge-index$X
PROGRAMS += git-merge-tree$X
@@
-773,6
+771,10
@@
ifdef ZLIB_PATH
endif
EXTLIBS += -lz
endif
EXTLIBS += -lz
+ifndef NO_POSIX_ONLY_PROGRAMS
+ PROGRAMS += git-daemon$X
+ PROGRAMS += git-imap-send$X
+endif
ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl
ifdef OPENSSLDIR
ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl
ifdef OPENSSLDIR