Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Move couple of ifdefs after "include config.mk"
author
Timo Hirvonen
<tihirvon@gmail.com>
Thu, 1 Dec 2005 01:32:01 +0000
(
03:32
+0200)
committer
Junio C Hamano
<junkio@cox.net>
Thu, 1 Dec 2005 01:46:35 +0000
(17:46 -0800)
This makes it possible to define WITH_SEND_EMAIL etc. in config.mak.
Also remove GIT_LIST_TWEAK because it isn't used anymore.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Makefile
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
9cac9d3
)
diff --git
a/Makefile
b/Makefile
index 984d167def635bf30802e2db04043d7a160903c8..00521fe51ed8d888afb9a21e77af38eae7e39a48 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-138,8
+138,6
@@
ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) git$X
# Backward compatibility -- to be removed after 1.0
PROGRAMS += git-ssh-pull$X git-ssh-push$X
# Backward compatibility -- to be removed after 1.0
PROGRAMS += git-ssh-pull$X git-ssh-push$X
-GIT_LIST_TWEAK =
-
# Set paths to tools early so that they can be used for version tests.
ifndef SHELL_PATH
SHELL_PATH = /bin/sh
# Set paths to tools early so that they can be used for version tests.
ifndef SHELL_PATH
SHELL_PATH = /bin/sh
@@
-154,20
+152,6
@@
endif
PYMODULES = \
gitMergeCommon.py
PYMODULES = \
gitMergeCommon.py
-ifdef WITH_OWN_SUBPROCESS_PY
- PYMODULES += compat/subprocess.py
-else
- ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK)
- PYMODULES += compat/subprocess.py
- endif
-endif
-
-ifdef WITH_SEND_EMAIL
- SCRIPT_PERL += git-send-email.perl
-else
- GIT_LIST_TWEAK += -e '/^send-email$$/d'
-endif
-
LIB_FILE=libgit.a
LIB_H = \
LIB_FILE=libgit.a
LIB_H = \
@@
-256,6
+240,18
@@
endif
-include config.mak
-include config.mak
+ifdef WITH_OWN_SUBPROCESS_PY
+ PYMODULES += compat/subprocess.py
+else
+ ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK)
+ PYMODULES += compat/subprocess.py
+ endif
+endif
+
+ifdef WITH_SEND_EMAIL
+ SCRIPT_PERL += git-send-email.perl
+endif
+
ifndef NO_CURL
ifdef CURLDIR
# This is still problematic -- gcc does not always want -R.
ifndef NO_CURL
ifdef CURLDIR
# This is still problematic -- gcc does not always want -R.