diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-05-15 20:51:45 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-05-15 20:51:45 -0400 |
| commit | 48e384d7104dce8219b169c55a29c9f85024c83f (patch) | |
| tree | 4b1e1cae593af4c1253af05172b23c05a3b63096 /configure.ac | |
| parent | c7e93c41078193d4df8ca165d3aea50a51c40519 (diff) | |
| download | emacs-48e384d7104dce8219b169c55a29c9f85024c83f.tar.gz | |
Replace AC_SUBST_FILE in configure with include in Makefiles.
* configure.ac (DEPDIR, MKDEPDIR, deps_frag, lwlib_deps_frag)
(oldxmenu_deps_frag, lisp_frag): Remove output variables/files.
(AUTO_DEPEND): New output variable.
* lwlib/Makefile.in (AUTO_DEPEND): New, set by configure.
(DEPFLAGS, MKDEPDIR): Set directly via conditional.
(lwlib_deps_frag): Replace by conditional include.
* lwlib/autodeps.mk: Remove file.
* oldXMenu/Makefile.in (AUTO_DEPEND): New, set by configure.
(DEPFLAGS, MKDEPDIR): Set directly via conditional.
(oldxmenu_deps_frag): Replace by conditional include.
* oldXMenu/autodeps.mk: Remove file.
* src/Makefile.in (AUTO_DEPEND): New, set by configure.
(DEPFLAGS, MKDEPDIR): Set directly via conditional.
(lisp_frag): Replace by an include.
(deps_frag): Replace by conditional include.
* src/autodeps.mk: Remove file.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 90a40552a35..1cddeb1e45f 100644 --- a/configure.ac +++ b/configure.ac @@ -1661,9 +1661,7 @@ dnl AC_C_BIGENDIAN is done by gnulib. dnl check for Make feature -DEPFLAGS= -MKDEPDIR=":" -deps_frag=deps.mk +AUTO_DEPEND=no dnl check if we have GCC and autodepend is on. if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then AC_MSG_CHECKING([whether gcc understands -MMD -MF]) @@ -1675,24 +1673,10 @@ if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then rm -rf deps.d AC_MSG_RESULT([$ac_enable_autodepend]) if test $ac_enable_autodepend = yes; then - DEPFLAGS='-MMD -MF ${DEPDIR}/$*.d -MP' - ## MKDIR_P is documented (see AC_PROG_MKDIR_P) to be parallel-safe. - MKDEPDIR='${MKDIR_P} ${DEPDIR}' - deps_frag=autodeps.mk + AUTO_DEPEND=yes fi fi -lwlib_deps_frag=$srcdir/lwlib/$deps_frag -oldxmenu_deps_frag=$srcdir/oldXMenu/$deps_frag -deps_frag=$srcdir/src/$deps_frag -AC_SUBST(MKDEPDIR) -AC_SUBST(DEPFLAGS) -AC_SUBST_FILE(deps_frag) -AC_SUBST_FILE(lwlib_deps_frag) -AC_SUBST_FILE(oldxmenu_deps_frag) - -lisp_frag=$srcdir/src/lisp.mk -AC_SUBST_FILE(lisp_frag) - +AC_SUBST(AUTO_DEPEND) dnl checks for operating system services AC_SYS_LONG_FILE_NAMES |