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 /lwlib | |
| 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 'lwlib')
| -rw-r--r-- | lwlib/Makefile.in | 20 | ||||
| -rw-r--r-- | lwlib/autodeps.mk | 5 | ||||
| -rw-r--r-- | lwlib/deps.mk | 2 |
3 files changed, 15 insertions, 12 deletions
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index 1f332e92939..2fd59598e3e 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -70,10 +70,15 @@ am__v_at_0 = @ am__v_at_1 = DEPDIR = deps -## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. -DEPFLAGS = @DEPFLAGS@ -## ${MKDIR_P} ${DEPDIR} (if AUTO_DEPEND); else ':'. -MKDEPDIR = @MKDEPDIR@ +AUTO_DEPEND = @AUTO_DEPEND@ + +ifeq ($(AUTO_DEPEND),yes) +DEPFLAGS = -MMD -MF ${DEPDIR}/$*.d -MP +MKDEPDIR = ${MKDIR_P} ${DEPDIR} +else +DEPFLAGS = +MKDEPDIR = : +endif ## ../src is where the generated file (config.h, globals.h) are. ## $(srcdir)/../src is where the non-generated files (lisp.h) are. @@ -102,8 +107,11 @@ globals_h = ../src/globals.h $(globals_h): $(MAKE) -C ../src globals.h -## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk. -@lwlib_deps_frag@ +ifeq ($(AUTO_DEPEND),yes) +-include $(ALLOBJS:%.o=${DEPDIR}/%.d) +else +include $(srcdir)/deps.mk +endif .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean diff --git a/lwlib/autodeps.mk b/lwlib/autodeps.mk deleted file mode 100644 index f7109295ce2..00000000000 --- a/lwlib/autodeps.mk +++ /dev/null @@ -1,5 +0,0 @@ -### autodeps.mk --- lwlib/Makefile fragment for GNU Emacs - -## This is inserted in lwlib/Makefile if AUTO_DEPEND=yes. - --include $(ALLOBJS:%.o=${DEPDIR}/%.d) diff --git a/lwlib/deps.mk b/lwlib/deps.mk index 11cc0567428..a19e51f34d1 100644 --- a/lwlib/deps.mk +++ b/lwlib/deps.mk @@ -20,7 +20,7 @@ ### Commentary: -## This file is inserted in lwlib/Makefile if AUTO_DEPEND=no. +## This file is included in lwlib/Makefile if AUTO_DEPEND=no. ## It defines static dependencies between the various source files. ### Code: |