summaryrefslogtreecommitdiff
path: root/lwlib
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-11-02 12:18:50 -0700
committerGlenn Morris <rgm@gnu.org>2013-11-02 12:18:50 -0700
commitb0b9e5923267012e5c4f3523ee601c229ea85232 (patch)
treeeae7642a57eb26e46185d176f8c65033a21a0f8b /lwlib
parent5246583bdbbf7f00daae1d94abfd17b28dcbddac (diff)
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 963b5baed1..6d10fe551c 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-02 Glenn Morris <rgm@gnu.org>
+
+ * Makefile.in (abs_srcdir): New, set by configure.
+ (ETAGS, ctagsfiles): New variables.
+ (TAGS): Use ETAGS, ctagsfiles. Use absolute filenames again.
+
2013-10-24 Glenn Morris <rgm@gnu.org>
* Makefile.in (abs_top_srcdir): New, set by configure.
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index b7f1673aca..550983c175 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -23,6 +23,7 @@
# and set up to be configured by ../configure.
srcdir=@srcdir@
+abs_srcdir=@abs_srcdir@
# MinGW CPPFLAGS may use this.
abs_top_srcdir=@abs_top_srcdir@
VPATH=@srcdir@
@@ -100,7 +101,17 @@ distclean: clean
maintainer-clean: distclean
rm -f TAGS
-TAGS:
- ../lib-src/etags $(srcdir)/*.[ch]
+
+ETAGS = ../lib-src/etags
+
+## FIXME? Does etags need to use absolute filenames?
+## See comments in lisp/Makefile.in, src/Makefile.in.
+ctagsfiles= *.[ch]
+
+TAGS: $(srcdir)/$(ctagsfiles)
+ "$(ETAGS)" "$(abs_srcdir)"/$(ctagsfiles)
tags: TAGS
.PHONY: tags
+
+
+### Makefile.in ends here