mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Replace AC_SUBST_FILE in configure with include in Makefiles.

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2015-05-15 20:51:45 -04:00
parent c7e93c4107
commit 48e384d710
10 changed files with 49 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

20
oldXMenu/Makefile.in
View file

@ -112,10 +112,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
ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
$(C_SWITCH_X_SITE) $(DEPFLAGS) \
@ -132,8 +137,11 @@ libXMenu11.a: $(OBJS) $(EXTRA)
$(AM_V_at)$(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA)
$(AM_V_at)$(RANLIB) $@
## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk.
@oldxmenu_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

5
oldXMenu/autodeps.mk
View file

@ -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)

2
oldXMenu/deps.mk
View file

@ -32,7 +32,7 @@
### Commentary:
## This file is inserted in oldXMenu/Makefile if AUTO_DEPEND=no.
## This file is included in oldXMenu/Makefile if AUTO_DEPEND=no.
## It defines static dependencies between the various source files.
### Code: