From 05012a713a11f0e8484d7a0b6c5a50b0d76b8cd2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 23 May 2008 04:46:47 +0000 Subject: [PATCH] (SOURCES): Remove, unused. (lisptagsfiles1, lisptagsfiles2): Use '*' rather than '[a-zA-Z]*'. (TAGS, TAGS-LISP): Use a single rule with multiple targets. Exclude more '*loaddefs' files. (compile-always): Simplify '.elc' deletion. --- lisp/ChangeLog | 8 ++++++++ lisp/Makefile.in | 20 ++++++-------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4dca5463eeb..41a30290767 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2008-05-23 Glenn Morris + + * Makefile.in (SOURCES): Remove, unused. + (lisptagsfiles1, lisptagsfiles2): Use '*' rather than '[a-zA-Z]*'. + (TAGS, TAGS-LISP): Use a single rule with multiple targets. + Exclude more '*loaddefs' files. + (compile-always): Simplify '.elc' deletion. + 2008-05-23 Stefan Monnier * vc-bzr.el (vc-bzr-annotate-time): Reduce memory allocation. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 2b71f5413df..20de2e70377 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -39,9 +39,8 @@ BYTE_COMPILE_EXTRA_FLAGS = # BYTE_COMPILE_EXTRA_FLAGS = --eval '(setq byte-compile-warnings (quote (not unresolved)))' # The example above is just for developers, it should not be used by default. -SOURCES = *.el COPYING Makefile -lisptagsfiles1 = $(lisp)/[a-zA-Z]*.el -lisptagsfiles2 = $(lisp)/[a-zA-Z]*/[a-zA-Z]*.el +lisptagsfiles1 = $(lisp)/*.el +lisptagsfiles2 = $(lisp)/*/*.el ETAGS = ../lib-src/etags # Automatically generated autoload files, apart from lisp/loaddefs.el. @@ -146,13 +145,9 @@ cvs-update: recompile autoloads finder-data custom-deps update-authors: $(emacs) -l authors -f batch-update-authors $(srcdir)/etc/AUTHORS $(srcdir) -TAGS: $(lisptagsfiles1) $(lisptagsfiles2) - els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e "s,$(lisp)/loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \ - ${ETAGS} $$els - -TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) - els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e "s,$(lisp)/loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \ - ${ETAGS} -o TAGS-LISP $$els +TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) + els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \ + ${ETAGS} -o $@ $$els ## Explicitly list the .elc files, for the sake of parallel builds. @@ -1253,10 +1248,7 @@ compile: $(emacs-deps) $(LOADDEFS) autoloads compile-first # unconditionally. Some files don't actually get compiled because they # set the local variable no-byte-compile. compile-always: doit - for el in $(COMPILE_FIRST); do \ - -rm $${el}c; \ - done - -rm $(ELCFILES) + cd $(lisp); rm -f *.elc */*.elc $(MAKE) $(MFLAGS) compile ## In case any files are missing from ELCFILES. -- 2.39.2