aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2017-05-30 09:27:33 -0700
committerPaul Eggert2017-05-30 09:28:19 -0700
commit1b01601d3f5d34a267c47e5d1208aa01730dd157 (patch)
tree20f3d5af4671d411e3c039ce8d7c755bbc839a98
parent91a52e38e5194f19f0d44ae4c2ad88565b28a196 (diff)
downloademacs-1b01601d3f5d34a267c47e5d1208aa01730dd157.tar.gz
emacs-1b01601d3f5d34a267c47e5d1208aa01730dd157.zip
Skip .#* temporaries when finding sources
Without this patch, ‘make check’ can fail with the diagnostic ‘invalid syntax in conditional’ if there is an Emacs temporary file whose name starts with ‘.#’, because the ‘#’ is treated as the start of a Make comment. * lisp/Makefile.in (loaddefs, tagsfiles, check-defun-deps): * test/Makefile.in (ELFILES): Skip files starting with ‘.’, so that the .#* files do not cause trouble. (We cannot easily skip just files starting with ‘.#’, since ‘#’ starts a Make comment!)
-rw-r--r--lisp/Makefile.in8
-rw-r--r--test/Makefile.in2
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index ba4925fb792..653200577db 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -78,7 +78,7 @@ LOADDEFS = $(lisp)/calendar/cal-loaddefs.el \
78 $(lisp)/net/tramp-loaddefs.el 78 $(lisp)/net/tramp-loaddefs.el
79 79
80# All generated autoload files. 80# All generated autoload files.
81loaddefs = $(shell find ${srcdir} -name '*loaddefs.el') 81loaddefs = $(shell find ${srcdir} -name '*loaddefs.el' ! -name '.*')
82# Elisp files auto-generated. 82# Elisp files auto-generated.
83AUTOGENEL = ${loaddefs} ${srcdir}/cus-load.el ${srcdir}/finder-inf.el \ 83AUTOGENEL = ${loaddefs} ${srcdir}/cus-load.el ${srcdir}/finder-inf.el \
84 ${srcdir}/subdirs.el ${srcdir}/eshell/esh-groups.el 84 ${srcdir}/subdirs.el ${srcdir}/eshell/esh-groups.el
@@ -243,8 +243,8 @@ update-gnus-news:
243FORCE: 243FORCE:
244.PHONY: FORCE 244.PHONY: FORCE
245 245
246tagsfiles = $(shell find ${srcdir} -name '*.el') 246tagsfiles = $(shell find ${srcdir} -name '*.el' \
247tagsfiles := $(filter-out ${srcdir}/%loaddefs.el,${tagsfiles}) 247 ! -name '.*' ! -name '*loaddefs.el')
248tagsfiles := $(filter-out ${srcdir}/ldefs-boot.el,${tagsfiles}) 248tagsfiles := $(filter-out ${srcdir}/ldefs-boot.el,${tagsfiles})
249tagsfiles := $(filter-out ${srcdir}/eshell/esh-groups.el,${tagsfiles}) 249tagsfiles := $(filter-out ${srcdir}/eshell/esh-groups.el,${tagsfiles})
250 250
@@ -470,7 +470,7 @@ check-declare:
470## This finds a lot of duplicates between foo.el and obsolete/foo.el. 470## This finds a lot of duplicates between foo.el and obsolete/foo.el.
471check-defun-dups: 471check-defun-dups:
472 sed -n -e '/^(defun /s/\(.\)(.*/\1/p' \ 472 sed -n -e '/^(defun /s/\(.\)(.*/\1/p' \
473 $$(find . -name '*.el' -print | \ 473 $$(find . -name '*.el' ! -name '.*' -print | \
474 grep -Ev '(loaddefs|ldefs-boot)\.el|obsolete') | sort | uniq -d 474 grep -Ev '(loaddefs|ldefs-boot)\.el|obsolete') | sort | uniq -d
475 475
476# Dependencies 476# Dependencies
diff --git a/test/Makefile.in b/test/Makefile.in
index c9065d90d1b..49a4dfdfd8d 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -138,7 +138,7 @@ ELFILES := $(shell find ${srcdir} -path "${srcdir}/manual" -prune -o \
138 -path "${srcdir}/data" -prune -o \ 138 -path "${srcdir}/data" -prune -o \
139 -name "*resources" -prune -o \ 139 -name "*resources" -prune -o \
140 ${maybe_exclude_module_tests} \ 140 ${maybe_exclude_module_tests} \
141 -name "*.el" -print) 141 -name "*.el" ! -name ".*" -print)
142## .log files may be in a different directory for out of source builds 142## .log files may be in a different directory for out of source builds
143LOGFILES := $(patsubst %.el,%.log, \ 143LOGFILES := $(patsubst %.el,%.log, \
144 $(patsubst $(srcdir)/%,%,$(ELFILES))) 144 $(patsubst $(srcdir)/%,%,$(ELFILES)))