aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lisp/ChangeLog12
-rw-r--r--lisp/Makefile.in51
2 files changed, 52 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b51bb6059e..14b2c748b7d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
12009-09-29 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (lisptagsfiles4): New.
4 (AUTOGENEL): Add cedet loaddefs files.
5 (TAGS, TAGS-LISP): Use $lisptagsfiles4.
6 (update-elclist, compile-always, backup-compiled-files)
7 (bootstrap-clean): Add yet another directory level.
8 (update-elclist): Use LC_COLLATE rather than COLLATE.
9 (ELCFILES): Update, via `make update-elclist'.
10
12009-09-29 Juanma Barranquero <lekktu@gmail.com> 112009-09-29 Juanma Barranquero <lekktu@gmail.com>
2 12
3 * makefile.w32-in (WINS_CEDET, WINS_BASIC, WINS_SUBDIR): New macros. 13 * makefile.w32-in (WINS_CEDET, WINS_BASIC, WINS_SUBDIR): New macros.
@@ -7,7 +17,7 @@
72009-09-28 Andreas Schwab <schwab@linux-m68k.org> 172009-09-28 Andreas Schwab <schwab@linux-m68k.org>
8 18
9 * Makefile.in (lisptagsfiles3): Define. 19 * Makefile.in (lisptagsfiles3): Define.
10 (TAGS TAGS-LISP): Use it. 20 (TAGS, TAGS-LISP): Use it.
11 (update-elclist): Add third directory level to look for elc files. 21 (update-elclist): Add third directory level to look for elc files.
12 (compile-always): Likewise. 22 (compile-always): Likewise.
13 (backup-compiled-files): Likewise. 23 (backup-compiled-files): Likewise.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 5b97b8805f7..9fc7398f9e7 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -42,6 +42,7 @@ BYTE_COMPILE_EXTRA_FLAGS =
42lisptagsfiles1 = $(lisp)/*.el 42lisptagsfiles1 = $(lisp)/*.el
43lisptagsfiles2 = $(lisp)/*/*.el 43lisptagsfiles2 = $(lisp)/*/*.el
44lisptagsfiles3 = $(lisp)/*/*/*.el 44lisptagsfiles3 = $(lisp)/*/*/*.el
45lisptagsfiles4 = $(lisp)/*/*/*/*.el
45ETAGS = ../lib-src/etags 46ETAGS = ../lib-src/etags
46 47
47# Automatically generated autoload files, apart from lisp/loaddefs.el. 48# Automatically generated autoload files, apart from lisp/loaddefs.el.
@@ -60,7 +61,10 @@ AUTOGENEL = loaddefs.el \
60 finder-inf.el \ 61 finder-inf.el \
61 subdirs.el \ 62 subdirs.el \
62 calc/calc-loaddefs.el \ 63 calc/calc-loaddefs.el \
63 eshell/esh-groups.el 64 eshell/esh-groups.el \
65 cedet/semantic/loaddefs.el \
66 cedet/ede/loaddefs.el \
67 cedet/srecode/loaddefs.el
64 68
65# Files to compile before others during a bootstrap. This is done to 69# Files to compile before others during a bootstrap. This is done to
66# speed up the bootstrap process. 70# speed up the bootstrap process.
@@ -169,8 +173,8 @@ cvs-update: recompile autoloads finder-data custom-deps
169update-authors: 173update-authors:
170 $(emacs) -l authors -f batch-update-authors $(srcdir)/etc/AUTHORS $(srcdir) 174 $(emacs) -l authors -f batch-update-authors $(srcdir)/etc/AUTHORS $(srcdir)
171 175
172TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) 176TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4)
173 els=`echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \ 177 els=`echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \
174 ${ETAGS} -o $@ $$els 178 ${ETAGS} -o $@ $$els
175 179
176.PHONY: update-elclist 180.PHONY: update-elclist
@@ -185,7 +189,7 @@ TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3)
185update-elclist: 189update-elclist:
186 echo "/^ELCFILES/,/^$$/c\\" > temp.sed 190 echo "/^ELCFILES/,/^$$/c\\" > temp.sed
187 echo "ELCFILES =" | sed -e 's/$$/ \\\\\\/' >> temp.sed 191 echo "ELCFILES =" | sed -e 's/$$/ \\\\\\/' >> temp.sed
188 LC_COLLATE=C ls $(lisp)/*.elc $(lisp)/*/*.elc $(lisp)/*/*/*.elc | sed -e "s|^$(lisp)| \$$(lisp)|" -e 's/$$/ \\\\\\/' -e '$$ s/ \\\\//' >> temp.sed 192 LC_COLLATE=C ls $(lisp)/*.elc $(lisp)/*/*.elc $(lisp)/*/*/*.elc $(lisp)/*/*/*/*.elc | sed -e "s|^$(lisp)| \$$(lisp)|" -e 's/$$/ \\\\\\/' -e '$$ s/ \\\\//' >> temp.sed
189 echo "" >> temp.sed 193 echo "" >> temp.sed
190 -sed -f temp.sed $(lisp)/Makefile.in > temp-elcfiles || rm temp-elcfiles 194 -sed -f temp.sed $(lisp)/Makefile.in > temp-elcfiles || rm temp-elcfiles
191 rm temp.sed 195 rm temp.sed
@@ -194,9 +198,9 @@ update-elclist:
194 chmod +w $(lisp)/Makefile.in; \ 198 chmod +w $(lisp)/Makefile.in; \
195 mv -f temp-elcfiles $(lisp)/Makefile.in; \ 199 mv -f temp-elcfiles $(lisp)/Makefile.in; \
196 fi 200 fi
197 -(COLLATE=C ls $(lisp)/*.elc $(lisp)/*/*.elc $(lisp)/*/*/*.elc | sed 's/elc$$/el/'; \ 201 -(LC_COLLATE=C ls $(lisp)/*.elc $(lisp)/*/*.elc $(lisp)/*/*/*.elc $(lisp)/*/*/*/*.elc | sed 's/elc$$/el/'; \
198 COLLATE=C ls $(lisp)/*.el $(lisp)/*/*.el $(lisp)/*/*/*.el; \ 202 LC_COLLATE=C ls $(lisp)/*.el $(lisp)/*/*.el $(lisp)/*/*/*.el $(lisp)/*/*/*/*.el; \
199 COLLATE=C ls $(lisp)/*.el $(lisp)/*/*.el $(lisp)/*/*/*.el) | \ 203 LC_COLLATE=C ls $(lisp)/*.el $(lisp)/*/*.el $(lisp)/*/*/*.el $(lisp)/*/*/*/*.el) | \
200 sort | uniq -u | while read extra; do \ 204 sort | uniq -u | while read extra; do \
201 echo "Found left over byte-compiled file: $${extra}c !!" ;\ 205 echo "Found left over byte-compiled file: $${extra}c !!" ;\
202 done 206 done
@@ -338,7 +342,20 @@ ELCFILES = \
338 $(lisp)/cedet/pulse.elc \ 342 $(lisp)/cedet/pulse.elc \
339 $(lisp)/cedet/semantic.elc \ 343 $(lisp)/cedet/semantic.elc \
340 $(lisp)/cedet/semantic/analyze.elc \ 344 $(lisp)/cedet/semantic/analyze.elc \
345 $(lisp)/cedet/semantic/analyze/complete.elc \
346 $(lisp)/cedet/semantic/analyze/debug.elc \
347 $(lisp)/cedet/semantic/analyze/fcn.elc \
348 $(lisp)/cedet/semantic/analyze/refs.elc \
341 $(lisp)/cedet/semantic/bovine.elc \ 349 $(lisp)/cedet/semantic/bovine.elc \
350 $(lisp)/cedet/semantic/bovine/c-by.elc \
351 $(lisp)/cedet/semantic/bovine/c.elc \
352 $(lisp)/cedet/semantic/bovine/debug.elc \
353 $(lisp)/cedet/semantic/bovine/el.elc \
354 $(lisp)/cedet/semantic/bovine/gcc.elc \
355 $(lisp)/cedet/semantic/bovine/make-by.elc \
356 $(lisp)/cedet/semantic/bovine/make.elc \
357 $(lisp)/cedet/semantic/bovine/scm-by.elc \
358 $(lisp)/cedet/semantic/bovine/scm.elc \
342 $(lisp)/cedet/semantic/chart.elc \ 359 $(lisp)/cedet/semantic/chart.elc \
343 $(lisp)/cedet/semantic/complete.elc \ 360 $(lisp)/cedet/semantic/complete.elc \
344 $(lisp)/cedet/semantic/ctxt.elc \ 361 $(lisp)/cedet/semantic/ctxt.elc \
@@ -355,6 +372,8 @@ ELCFILES = \
355 $(lisp)/cedet/semantic/db.elc \ 372 $(lisp)/cedet/semantic/db.elc \
356 $(lisp)/cedet/semantic/debug.elc \ 373 $(lisp)/cedet/semantic/debug.elc \
357 $(lisp)/cedet/semantic/decorate.elc \ 374 $(lisp)/cedet/semantic/decorate.elc \
375 $(lisp)/cedet/semantic/decorate/include.elc \
376 $(lisp)/cedet/semantic/decorate/mode.elc \
358 $(lisp)/cedet/semantic/dep.elc \ 377 $(lisp)/cedet/semantic/dep.elc \
359 $(lisp)/cedet/semantic/doc.elc \ 378 $(lisp)/cedet/semantic/doc.elc \
360 $(lisp)/cedet/semantic/ede-grammar.elc \ 379 $(lisp)/cedet/semantic/ede-grammar.elc \
@@ -377,6 +396,12 @@ ELCFILES = \
377 $(lisp)/cedet/semantic/senator.elc \ 396 $(lisp)/cedet/semantic/senator.elc \
378 $(lisp)/cedet/semantic/sort.elc \ 397 $(lisp)/cedet/semantic/sort.elc \
379 $(lisp)/cedet/semantic/symref.elc \ 398 $(lisp)/cedet/semantic/symref.elc \
399 $(lisp)/cedet/semantic/symref/cscope.elc \
400 $(lisp)/cedet/semantic/symref/filter.elc \
401 $(lisp)/cedet/semantic/symref/global.elc \
402 $(lisp)/cedet/semantic/symref/grep.elc \
403 $(lisp)/cedet/semantic/symref/idutils.elc \
404 $(lisp)/cedet/semantic/symref/list.elc \
380 $(lisp)/cedet/semantic/tag-file.elc \ 405 $(lisp)/cedet/semantic/tag-file.elc \
381 $(lisp)/cedet/semantic/tag-ls.elc \ 406 $(lisp)/cedet/semantic/tag-ls.elc \
382 $(lisp)/cedet/semantic/tag-write.elc \ 407 $(lisp)/cedet/semantic/tag-write.elc \
@@ -385,6 +410,12 @@ ELCFILES = \
385 $(lisp)/cedet/semantic/util-modes.elc \ 410 $(lisp)/cedet/semantic/util-modes.elc \
386 $(lisp)/cedet/semantic/util.elc \ 411 $(lisp)/cedet/semantic/util.elc \
387 $(lisp)/cedet/semantic/wisent.elc \ 412 $(lisp)/cedet/semantic/wisent.elc \
413 $(lisp)/cedet/semantic/wisent/comp.elc \
414 $(lisp)/cedet/semantic/wisent/java-tags.elc \
415 $(lisp)/cedet/semantic/wisent/javascript.elc \
416 $(lisp)/cedet/semantic/wisent/javat-wy.elc \
417 $(lisp)/cedet/semantic/wisent/js-wy.elc \
418 $(lisp)/cedet/semantic/wisent/wisent.elc \
388 $(lisp)/cedet/srecode.elc \ 419 $(lisp)/cedet/srecode.elc \
389 $(lisp)/cedet/srecode/args.elc \ 420 $(lisp)/cedet/srecode/args.elc \
390 $(lisp)/cedet/srecode/compile.elc \ 421 $(lisp)/cedet/srecode/compile.elc \
@@ -1465,7 +1496,7 @@ compile: $(LOADDEFS) autoloads compile-first
1465# unconditionally. Some files don't actually get compiled because they 1496# unconditionally. Some files don't actually get compiled because they
1466# set the local variable no-byte-compile. 1497# set the local variable no-byte-compile.
1467compile-always: doit 1498compile-always: doit
1468 cd $(lisp); rm -f *.elc */*.elc */*/*.elc 1499 cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
1469 $(MAKE) $(MFLAGS) compile EMACS=$(EMACS) 1500 $(MAKE) $(MFLAGS) compile EMACS=$(EMACS)
1470 1501
1471## In case any files are missing from ELCFILES. 1502## In case any files are missing from ELCFILES.
@@ -1495,7 +1526,7 @@ compile-calc:
1495 1526
1496backup-compiled-files: 1527backup-compiled-files:
1497 -mv $(lisp)/elc.tar.gz $(lisp)/elc.tar.gz~ 1528 -mv $(lisp)/elc.tar.gz $(lisp)/elc.tar.gz~
1498 -tar czf $(lisp)/elc.tar.gz $(lisp)/*.elc $(lisp)/*/*.elc $(lisp)/*/*/*.elc 1529 -tar czf $(lisp)/elc.tar.gz $(lisp)/*.elc $(lisp)/*/*.elc $(lisp)/*/*/*.elc $(lisp)/*/*/*/*.elc
1499 1530
1500# Compile Lisp files, but save old compiled files first. 1531# Compile Lisp files, but save old compiled files first.
1501 1532
@@ -1593,7 +1624,7 @@ $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
1593# file, we don't want to store it in the source repository). 1624# file, we don't want to store it in the source repository).
1594 1625
1595bootstrap-clean: 1626bootstrap-clean:
1596 cd $(lisp); rm -f *.elc */*.elc */*/*.elc $(AUTOGENEL) 1627 cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc $(AUTOGENEL)
1597 1628
1598distclean: 1629distclean:
1599 -rm -f ./Makefile 1630 -rm -f ./Makefile
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-03 21:12:45 +0000