mirror of
https://github.com/vim/vim.git
synced 2025-07-04 23:07:33 -04:00
updated for version 7.4.217
Problem: When src/auto/configure was updated, "make clean" would run configure pointlessly. Solution: Do not run configure for "make clean" and "make distclean" when the make program supports $MAKECMDGOALS. (Ken Takata)
This commit is contained in:
parent
c410530637
commit
1a3eb8e1b5
@ -546,6 +546,7 @@ CClink = $(CC)
|
||||
# again.
|
||||
#CC = cc
|
||||
#CC = gcc
|
||||
#CC = clang
|
||||
|
||||
# COMPILER FLAGS - change as you please. Either before running {{{1
|
||||
# configure or afterwards. For examples see below.
|
||||
@ -1666,6 +1667,7 @@ config auto/config.mk: auto/configure config.mk.in config.h.in
|
||||
! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \
|
||||
rm auto/config.cache; \
|
||||
fi
|
||||
if test "X$(MAKECMDGOALS)" != "Xclean" -a "X$(MAKECMDGOALS)" != "Xdistclean"; then \
|
||||
GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
|
||||
CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
|
||||
LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \
|
||||
@ -1679,7 +1681,8 @@ config auto/config.mk: auto/configure config.mk.in config.h.in
|
||||
$(CONF_OPT_COMPBY) $(CONF_OPT_ACL) $(CONF_OPT_NETBEANS) \
|
||||
$(CONF_ARGS) $(CONF_OPT_MZSCHEME) $(CONF_OPT_PLTHOME) \
|
||||
$(CONF_OPT_LUA) $(CONF_OPT_LUA_PREFIX) \
|
||||
$(CONF_OPT_SYSMOUSE)
|
||||
$(CONF_OPT_SYSMOUSE); \
|
||||
fi
|
||||
|
||||
# Use "make reconfig" to rerun configure without cached values.
|
||||
# When config.h changes, most things will be recompiled automatically.
|
||||
|
@ -734,6 +734,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
217,
|
||||
/**/
|
||||
216,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user