diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-03-25 15:34:48 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-03-25 15:34:48 +0100 |
| commit | 1a3eb8e1b51015b99d2e68242dc5326153edc72f (patch) | |
| tree | 871535568bd7ac233cd487fc07b52b07490c7a45 | |
| parent | c410530637aad9e7ab187e1fb0ffc6c3de2b5b20 (diff) | |
| download | vim-git-1a3eb8e1b51015b99d2e68242dc5326153edc72f.tar.gz | |
updated for version 7.4.217v7.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)
| -rw-r--r-- | src/Makefile | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 6b006f565..4e9b5f14c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -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,7 +1667,8 @@ 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 - GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \ + 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)" \ ./configure $(CONF_OPT_GUI) $(CONF_OPT_X) $(CONF_OPT_XSMP) \ @@ -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. diff --git a/src/version.c b/src/version.c index 65c25fe52..ce4659c6a 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 217, +/**/ 216, /**/ 215, |