diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-21 09:59:10 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-21 09:59:31 -0700 |
| commit | bf8cf95d7d13ebc5d351cc2a8048f6695ab9faca (patch) | |
| tree | 1aa66a743bb6b542c2764e4c77979ede678d6881 /oldXMenu | |
| parent | 14d8b6858a49e97f9b69593df5a8a7886430d43f (diff) | |
| download | emacs-bf8cf95d7d13ebc5d351cc2a8048f6695ab9faca.tar.gz | |
Streamline dependency-file generation
* configure.ac (AUTODEPEND_PARENTS): New var.
mkdir the dependency directories here, to simplify ‘make’.
Remove dependency files just before outputting Makefiles, so that
they are preserved if ‘configure’ exits early due to some other problem.
* lib/Makefile.in, lwlib/Makefile.in, oldXMenu/Makefile.in:
* src/Makefile.in: Adjust deps strategies to be similar, as follows:
(MKDEPDIR): Remove. All uses removed. This cuts down on the
number of processes spun off by ‘make’.
(clean mostlyclean): Remove $(DEPDIR) contents, not $(DEPDIR) itself.
(distclean): Remove $(DEPDIR) itself.
* lwlib/Makefile.in (all): Move to front, so that depdir includes
do not alter default action.
Diffstat (limited to 'oldXMenu')
| -rw-r--r-- | oldXMenu/Makefile.in | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index 46061ab7ae4..7a5c9985920 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -111,15 +111,14 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = -DEPDIR = deps AUTO_DEPEND = @AUTO_DEPEND@ - +DEPDIR = deps ifeq ($(AUTO_DEPEND),yes) -DEPFLAGS = -MMD -MF ${DEPDIR}/$*.d -MP -MKDEPDIR = ${MKDIR_P} ${DEPDIR} + DEPFLAGS = -MMD -MF $(DEPDIR)/$*.d -MP + -include $(ALLOBJS:%.o=$(DEPDIR)/%.d) else -DEPFLAGS = -MKDEPDIR = : + DEPFLAGS = + include $(srcdir)/deps.mk endif ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ @@ -129,7 +128,6 @@ ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ -I../src -I../lib -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib .c.o: - @$(MKDEPDIR) $(AM_V_CC)$(CC) -c ${ALL_CFLAGS} $< libXMenu11.a: $(OBJS) $(EXTRA) @@ -137,20 +135,14 @@ libXMenu11.a: $(OBJS) $(EXTRA) $(AM_V_at)$(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA) $(AM_V_at)$(RANLIB) $@ -ifeq ($(AUTO_DEPEND),yes) --include $(ALLOBJS:%.o=${DEPDIR}/%.d) -else -include $(srcdir)/deps.mk -endif - .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean clean mostlyclean: - rm -f libXMenu11.a *.o - -rm -rf ${DEPDIR} + rm -f libXMenu11.a *.o $(DEPDIR)/* bootstrap-clean maintainer-clean distclean: clean rm -f Makefile + rm -fr $(DEPDIR) ETAGS = ../lib-src/etags${EXEEXT} |