diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-06-07 12:26:02 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-06-07 12:26:02 +0300 |
| commit | a822acffe2a370ed1726db92aad64b5287582a73 (patch) | |
| tree | 03b1cd18c24bba9b30bdaa00a709f076d5f31319 /src | |
| parent | 3649ba053bc957fdea95d3ffea3b3fc8bd96acdc (diff) | |
| download | emacs-a822acffe2a370ed1726db92aad64b5287582a73.tar.gz emacs-a822acffe2a370ed1726db92aad64b5287582a73.tar.bz2 emacs-a822acffe2a370ed1726db92aad64b5287582a73.zip | |
Fix "make TAGS" on MS-Windows.
lisp/Makefile.in (TAGS TAGS-LISP): Pass the (long) list of *.el files
through xargs, to avoid failure due to MS-Windows limitations on
command-line length.
src/Makefile.in (ctagsfiles1, ctagsfiles2): Don't include *.m files.
(ctagsfiles3): New variable, includes only *.m files.
(TAGS): Use an explicit language name in the regular expressions,
to avoid transformation of '/SOMETHING' by MSYS to
'c:\MSYS\SOMETHING'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/Makefile.in | 11 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c104b23c75e..646f1d43f43 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2013-06-07 Eli Zaretskii <eliz@gnu.org> + + * Makefile.in (ctagsfiles1, ctagsfiles2): Don't include *.m files. + (ctagsfiles3): New variable, includes only *.m files. + (TAGS): Use an explicit language name in the regular expressions, + to avoid transformation of '/SOMETHING' by MSYS to + 'c:\MSYS\SOMETHING'. + 2013-06-07 Richard Copley <rcopley@gmail.com> (tiny change) * epaths.in: Fix commentary to PATH_SITELOADSEARCH. diff --git a/src/Makefile.in b/src/Makefile.in index 9d7857e4ca2..90083eb910f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -588,13 +588,16 @@ extraclean: distclean ## Arrange to make a tags table TAGS-LISP for ../lisp, ## plus TAGS for the C files, which includes ../lisp/TAGS by reference. -ctagsfiles1 = [xyzXYZ]*.[hcm] -ctagsfiles2 = [a-wA-W]*.[hcm] +ctagsfiles1 = [xyzXYZ]*.[hc] +ctagsfiles2 = [a-wA-W]*.[hc] +ctagsfiles3 = [a-zA-Z]*.m TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) $(S_FILE) ../lib-src/etags --include=TAGS-LISP --include=$(lwlibdir)/TAGS \ - --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \ - $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) $(S_FILE) + --regex='{c}/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \ + $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) $(S_FILE) \ + --regex='{objc}/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \ + $(srcdir)/$(ctagsfiles3) frc: TAGS-LISP: frc $(MAKE) -f $(lispdir)/Makefile TAGS-LISP ETAGS=../lib-src/etags |