aboutsummaryrefslogtreecommitdiffstats
path: root/lwlib
diff options
context:
space:
mode:
authorGlenn Morris2013-11-02 12:18:50 -0700
committerGlenn Morris2013-11-02 12:18:50 -0700
commitb0b9e5923267012e5c4f3523ee601c229ea85232 (patch)
treeeae7642a57eb26e46185d176f8c65033a21a0f8b /lwlib
parent5246583bdbbf7f00daae1d94abfd17b28dcbddac (diff)
downloademacs-b0b9e5923267012e5c4f3523ee601c229ea85232.tar.gz
emacs-b0b9e5923267012e5c4f3523ee601c229ea85232.zip
Small Makefile cleanup mainly related to tags file generation
* src/Makefile.in (abs_srcdir): New, set by configure. (maintainer-clean): Remove pointless echo. That should be in the top-level Makefile, if anywhere. Delete TAGS-LISP. (extraclean): No s/ and m/ directories for some time. (TAGS): Remove no-longer-defined S_FILE. Pass absolute filenames to etags once more. (TAGS-LISP, $(lwlibdir)/TAGS): Correctly pass ETAGS to sub-makes. ($(lwlibdir)/TAGS): Remove useless subshell, check cd return value. * lisp/Makefile.in (lisptagsfiles1, lisptagsfiles2, lisptagsfiles3) (lisptagsfiles4): Use absolute filenames again. (TAGS, TAGS-LISP): Not everything needs to run in one line. Remove all *loaddefs files, not just the first. Remove esh-groups. (maintainer-clean): Delete TAGS, TAGS-LISP. * lwlib/Makefile.in (abs_srcdir): New, set by configure. (ETAGS, ctagsfiles): New variables. (TAGS): Use ETAGS, ctagsfiles. Use absolute filenames again.
Diffstat (limited to 'lwlib')
-rw-r--r--lwlib/ChangeLog6
-rw-r--r--lwlib/Makefile.in15
2 files changed, 19 insertions, 2 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 963b5baed1c..6d10fe551cb 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,9 @@
12013-11-02 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (abs_srcdir): New, set by configure.
4 (ETAGS, ctagsfiles): New variables.
5 (TAGS): Use ETAGS, ctagsfiles. Use absolute filenames again.
6
12013-10-24 Glenn Morris <rgm@gnu.org> 72013-10-24 Glenn Morris <rgm@gnu.org>
2 8
3 * Makefile.in (abs_top_srcdir): New, set by configure. 9 * Makefile.in (abs_top_srcdir): New, set by configure.
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index b7f1673aca9..550983c1757 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -23,6 +23,7 @@
23# and set up to be configured by ../configure. 23# and set up to be configured by ../configure.
24 24
25srcdir=@srcdir@ 25srcdir=@srcdir@
26abs_srcdir=@abs_srcdir@
26# MinGW CPPFLAGS may use this. 27# MinGW CPPFLAGS may use this.
27abs_top_srcdir=@abs_top_srcdir@ 28abs_top_srcdir=@abs_top_srcdir@
28VPATH=@srcdir@ 29VPATH=@srcdir@
@@ -100,7 +101,17 @@ distclean: clean
100maintainer-clean: distclean 101maintainer-clean: distclean
101 rm -f TAGS 102 rm -f TAGS
102 103
103TAGS: 104
104 ../lib-src/etags $(srcdir)/*.[ch] 105ETAGS = ../lib-src/etags
106
107## FIXME? Does etags need to use absolute filenames?
108## See comments in lisp/Makefile.in, src/Makefile.in.
109ctagsfiles= *.[ch]
110
111TAGS: $(srcdir)/$(ctagsfiles)
112 "$(ETAGS)" "$(abs_srcdir)"/$(ctagsfiles)
105tags: TAGS 113tags: TAGS
106.PHONY: tags 114.PHONY: tags
115
116
117### Makefile.in ends here