diff options
-rw-r--r-- | configure.ac | 22 | ||||
-rw-r--r-- | lwlib/Makefile.in | 20 | ||||
-rw-r--r-- | lwlib/autodeps.mk | 5 | ||||
-rw-r--r-- | lwlib/deps.mk | 2 | ||||
-rw-r--r-- | oldXMenu/Makefile.in | 20 | ||||
-rw-r--r-- | oldXMenu/autodeps.mk | 5 | ||||
-rw-r--r-- | oldXMenu/deps.mk | 2 | ||||
-rw-r--r-- | src/Makefile.in | 25 | ||||
-rw-r--r-- | src/autodeps.mk | 5 | ||||
-rw-r--r-- | src/deps.mk | 2 |
10 files changed, 49 insertions, 59 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 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: diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index ef2a3600a6b..de5b8e1114c 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -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 diff --git a/oldXMenu/autodeps.mk b/oldXMenu/autodeps.mk deleted file mode 100644 index f7109295ce2..00000000000 --- a/oldXMenu/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/oldXMenu/deps.mk b/oldXMenu/deps.mk index cdb89f9ead9..54ce3587574 100644 --- a/oldXMenu/deps.mk +++ b/oldXMenu/deps.mk @@ -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: diff --git a/src/Makefile.in b/src/Makefile.in index 1c03b27c2c3..51a5b982474 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -323,10 +323,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 ## DO NOT use -R. There is a special hack described in lastfile.c ## which is used instead. Some initialized data areas are modified @@ -413,9 +418,7 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \ FIRSTFILE_OBJ=@FIRSTFILE_OBJ@ ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj) -## Configure inserts the file lisp.mk at this point, defining $lisp. -@lisp_frag@ - +include $(srcdir)/lisp.mk ## Construct full set of libraries to be linked. LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ @@ -667,8 +670,10 @@ endif @: Compile some files earlier to speed up further compilation. $(MAKE) -C ../lisp compile-first EMACS="$(bootstrap_exe)" -## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk. -@deps_frag@ - +ifeq ($(AUTO_DEPEND),yes) +-include $(ALLOBJS:%.o=${DEPDIR}/%.d) +else +include $(srcdir)/deps.mk +endif ### Makefile.in ends here diff --git a/src/autodeps.mk b/src/autodeps.mk deleted file mode 100644 index 8b014a7508c..00000000000 --- a/src/autodeps.mk +++ /dev/null @@ -1,5 +0,0 @@ -### autodeps.mk --- src/Makefile fragment for GNU Emacs - -## This is inserted in src/Makefile if AUTO_DEPEND=yes. - --include $(ALLOBJS:%.o=${DEPDIR}/%.d) diff --git a/src/deps.mk b/src/deps.mk index 71a5f42d22e..23789384fdb 100644 --- a/src/deps.mk +++ b/src/deps.mk @@ -20,7 +20,7 @@ ## Commentary: ## -## This file is inserted in src/Makefile if AUTO_DEPEND=no. +## This file is included in src/Makefile if AUTO_DEPEND=no. ## It defines static dependencies between the various source files. ## FIXME some of these dependencies are platform-specific. |