diff options
| author | Jan D <jan.h.d@swipnet.se> | 2015-05-17 16:46:34 +0200 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2015-05-17 16:46:34 +0200 |
| commit | 6445ee0fb751ae2c1dfef900d44721b3d952812f (patch) | |
| tree | d43006cb93d9ea7b00ea02aabcd5577c41ff827f /lwlib | |
| parent | f92ac2e82ed199d6f25d2a59508e08addb1150ac (diff) | |
| parent | c9c4708ed47b18987940a71b98eb9873150d2b95 (diff) | |
| download | emacs-6445ee0fb751ae2c1dfef900d44721b3d952812f.tar.gz | |
Merge branch 'master' into cairo
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 7c91fb3a21c..cbc747cbbac 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -71,10 +71,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. @@ -104,8 +109,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: |