comparison src/Makefile @ 4952:9f7b92f232d3 v7.3.1221

updated for version 7.3.1221 Problem: When build flags change "make distclean" run into a configure error. Solution: When CFLAGS changes delete auto/config.cache. Also avoid adding duplicate text to flags.
author Bram Moolenaar <bram@vim.org>
date Tue, 18 Jun 2013 23:31:55 +0200
parents d02448031708
children 07831d280e90
comparison
equal deleted inserted replaced
4951:8f2fc8c065e4 4952:9f7b92f232d3
1653 # dependency on auto/config.h would cause running configure each time when 1653 # dependency on auto/config.h would cause running configure each time when
1654 # auto/config.h isn't updated. The dependency on auto/config.mk should make 1654 # auto/config.h isn't updated. The dependency on auto/config.mk should make
1655 # sure configure is run when it's needed. 1655 # sure configure is run when it's needed.
1656 # 1656 #
1657 config auto/config.mk: auto/configure config.mk.in config.h.in 1657 config auto/config.mk: auto/configure config.mk.in config.h.in
1658 if test -f auto/config.cache && \
1659 grep '^ac_cv_env_CFLAGS_value=' auto/config.cache > /dev/null && \
1660 ! grep -x -F 'ac_cv_env_CFLAGS_value=$(CFLAGS)' auto/config.cache > /dev/null; then \
1661 rm auto/config.cache; \
1662 fi
1658 GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \ 1663 GUI_INC_LOC="$(GUI_INC_LOC)" GUI_LIB_LOC="$(GUI_LIB_LOC)" \
1659 CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \ 1664 CC="$(CC)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
1660 LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \ 1665 LDFLAGS="$(LDFLAGS)" $(CONF_SHELL) srcdir="$(srcdir)" \
1661 ./configure $(CONF_OPT_GUI) $(CONF_OPT_X) $(CONF_OPT_XSMP) \ 1666 ./configure $(CONF_OPT_GUI) $(CONF_OPT_X) $(CONF_OPT_XSMP) \
1662 $(CONF_OPT_DARWIN) $(CONF_OPT_FAIL) \ 1667 $(CONF_OPT_DARWIN) $(CONF_OPT_FAIL) \