Move couple of ifdefs after "include config.mk"
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>
Timo Hirvonen committed
Dec 1, 2005 at 03:32 UTC
b34403aa97047f90c0cdd5177e63a8e7530e3388
1 file changed
+12
-16
Makefile
+12
-16
@@ -138,8 +138,6 @@ ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS) git$X
138
# Backward compatibility -- to be removed after 1.0
139
PROGRAMS += git-ssh-pull$X git-ssh-push$X
140
141
-GIT_LIST_TWEAK =
142
-
141
# Set paths to tools early so that they can be used for version tests.
142
ifndef SHELL_PATH
143
SHELL_PATH = /bin/sh
@@ -154,20 +152,6 @@ endif
152
PYMODULES = \
153
gitMergeCommon.py
154
157
-ifdef WITH_OWN_SUBPROCESS_PY
158
- PYMODULES += compat/subprocess.py
159
-else
160
- ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK)
161
- PYMODULES += compat/subprocess.py
162
- endif
163
-endif
164
-
165
-ifdef WITH_SEND_EMAIL
166
- SCRIPT_PERL += git-send-email.perl
167
-else
168
- GIT_LIST_TWEAK += -e '/^send-email$$/d'
169
-endif
170
-
155
LIB_FILE=libgit.a
156
157
LIB_H = \
@@ -256,6 +240,18 @@ endif
240
241
-include config.mak
242
243
+ifdef WITH_OWN_SUBPROCESS_PY
244
+ PYMODULES += compat/subprocess.py
245
+else
246
+ ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK)
247
+ PYMODULES += compat/subprocess.py
248
+ endif
249
+endif
250
+
251
+ifdef WITH_SEND_EMAIL
252
+ SCRIPT_PERL += git-send-email.perl
253
+endif
254
+
255
ifndef NO_CURL
256
ifdef CURLDIR
257
# This is still problematic -- gcc does not always want -R.