X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/8e6ad4fa59d4fe88396338b710b3fa670c1668b1..f720b30e1123ca3549436b0a5b8ea65b4473329b:/lisp/Makefile.in diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 77cfc236b8..b8501c5021 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -1,5 +1,5 @@ # Maintenance productions for the Lisp directory -# Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -15,8 +15,8 @@ # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. SHELL = /bin/sh @@ -39,75 +39,12 @@ lisptagsfiles1 = $(lisp)/[a-zA-Z]*.el lisptagsfiles2 = $(lisp)/[a-zA-Z]*/[a-zA-Z]*.el ETAGS = ../lib-src/etags -# Files which should not be compiled. If you change the name `DONTCOMPILE' -# to something different, you'll have to change make-dist as well, and -# modify the lists in $lisp and $shortlisp on src/Makefile.in. -# -# - emacs-lisp/cl-specs.el: only contains `def-edebug-spec's so there's -# no point compiling it, although it doesn't hurt. - -DONTCOMPILE = \ - $(lisp)/cus-load.el \ - $(lisp)/emacs-lisp/cl-specs.el \ - $(lisp)/eshell/esh-maint.el \ - $(lisp)/eshell/esh-groups.el \ - $(lisp)/finder-inf.el \ - $(lisp)/forms-d2.el \ - $(lisp)/forms-pass.el \ - $(lisp)/generic-x.el \ - $(lisp)/international/latin-1.el \ - $(lisp)/international/latin-2.el \ - $(lisp)/international/latin-3.el \ - $(lisp)/international/latin-4.el \ - $(lisp)/international/latin-5.el \ - $(lisp)/international/latin-8.el \ - $(lisp)/international/latin-9.el \ - $(lisp)/international/mule-conf.el \ - $(lisp)/language/czech.el \ - $(lisp)/language/devanagari.el \ - $(lisp)/language/malayalam.el \ - $(lisp)/language/tamil.el \ - $(lisp)/language/english.el \ - $(lisp)/language/greek.el \ - $(lisp)/language/hebrew.el \ - $(lisp)/language/japanese.el \ - $(lisp)/language/korean.el \ - $(lisp)/language/lao.el \ - $(lisp)/language/misc-lang.el \ - $(lisp)/language/romanian.el \ - $(lisp)/language/slovak.el \ - $(lisp)/language/thai.el \ - $(lisp)/language/utf-8-lang.el \ - $(lisp)/language/georgian.el \ - $(lisp)/loaddefs.el \ - $(lisp)/ldefs-boot.el \ - $(lisp)/loadup.el \ - $(lisp)/mail/blessmail.el \ - $(lisp)/patcomp.el \ - $(lisp)/paths.el \ - $(lisp)/play/bruce.el \ - $(lisp)/subdirs.el \ - $(lisp)/term/internal.el \ - $(lisp)/term/AT386.el \ - $(lisp)/term/apollo.el \ - $(lisp)/term/bobcat.el \ - $(lisp)/term/iris-ansi.el \ - $(lisp)/term/keyswap.el \ - $(lisp)/term/linux.el \ - $(lisp)/term/lk201.el \ - $(lisp)/term/news.el \ - $(lisp)/term/vt102.el \ - $(lisp)/term/vt125.el \ - $(lisp)/term/vt200.el \ - $(lisp)/term/vt201.el \ - $(lisp)/term/vt220.el \ - $(lisp)/term/vt240.el \ - $(lisp)/term/vt300.el \ - $(lisp)/term/vt320.el \ - $(lisp)/term/vt400.el \ - $(lisp)/term/vt420.el \ - $(lisp)/term/wyse50.el \ - $(lisp)/version.el +# Elisp files auto-generated. +AUTOGENEL = loaddefs.el \ + cus-load.el \ + finder-inf.el \ + subdirs.el \ + eshell/esh-groups.el # Files to compile before others during a bootstrap. This is done to # speed up the bootstrap process. The CC files are compiled first @@ -128,17 +65,17 @@ emacs = EMACSLOADPATH=$(lisp) $(EMACS) $(EMACSOPT) # Common command to find subdirectories -setwins=subdirs=`find $$wd -type d -print`; \ +setwins=subdirs=`(cd $$wd; find . -type d -print)`; \ for file in $$subdirs; do \ - case $$file in */Old | */RCS | */CVS | */CVS/* | */.arch-ids | */.arch-ids/* | */=* ) ;; \ - *) wins="$$wins $$file" ;; \ + case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* ) ;; \ + *) wins="$$wins $$wd/$$file" ;; \ esac; \ done -setwins_almost=subdirs=`find $$wd -type d -print`; \ +setwins_almost=subdirs=`(cd $$wd; find . -type d -print)`; \ for file in $$subdirs; do \ - case $$file in */Old | */RCS | */CVS | */CVS/* | */=* | */obsolete | */term ) ;; \ - *) wins="$$wins $$file" ;; \ + case $$file in */Old | */RCS | */CVS | */CVS/* | */.* | */.*/* | */=* | */obsolete | */term ) ;; \ + *) wins="$$wins $$wd/$$file" ;; \ esac; \ done @@ -184,14 +121,14 @@ updates: update-subdirs autoloads finder-data custom-deps # Update the AUTHORS file. update-authors: - $(emacs) -f batch-update-authors $(srcdir)/AUTHORS $(srcdir) + $(emacs) -l authors -f batch-update-authors $(srcdir)/AUTHORS $(srcdir) TAGS: $(lisptagsfiles1) $(lisptagsfiles2) - els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e "s,$(lisp)/loaddefs.*\.el,,"`; \ + 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.*\.el,,"`; \ + els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e "s,$(lisp)/loaddefs[^ ]*,," -e "s,$(lisp)/ldefs-boot[^ ]*,,"`; \ ${ETAGS} -o TAGS-LISP $$els .SUFFIXES: .elc .el @@ -199,31 +136,23 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) .el.elc: $(lisp)/subdirs.el -$(emacs) -f batch-byte-compile $< -$(DONTCOMPILE:.el=.elc): - -rm -f $@ - -# Compile all Lisp files, except those from DONTCOMPILE, -# but don't recompile those that are up to date. - -# All .elc files are made writable -# before compilation in case we checked out read-only (CVS option -r). -# Files MUST be compiled one by one. If we compile several files in a -# row we can't make sure that the compilation environment is clean. -# We also set the load-path of the Emacs used for compilation to the -# current directory and its subdirectories, to make sure require's and -# load's in the files being compiled find the right files. +# Compile all Lisp files, but don't recompile those that are up to +# date. Some files don't actually get compiled because they set the +# local variable no-byte-compile. -# NOTE about DONTCOMPILE: in the `echo | sort | uniq -u' we pass -# $(DONTCOMPILE) twice. This is in case one of the files in DONTCOMPILE -# is absent. -stef +# All .elc files are made writable before compilation in case we +# checked out read-only (CVS option -r). Files MUST be compiled one by +# one. If we compile several files in a row we can't make sure that +# the compilation environment is clean. We also set the load-path of +# the Emacs used for compilation to the current directory and its +# subdirectories, to make sure require's and load's in the files being +# compiled find the right files. compile: $(lisp)/subdirs.el doit find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1; \ wd=$(lisp); $(setwins); \ - elpat=`echo $$wins | tr ' ' '\012\012' | \ + els=`echo $$wins | tr ' \011' '\012\012' | \ sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \ - els=`echo $$elpat $(DONTCOMPILE) $(DONTCOMPILE) $(COMPILE_FIRST) | \ - tr ' ' '\012\012' | sort | uniq -u`; \ for el in $(COMPILE_FIRST) $$els; do \ if test -f $$el; \ then \ @@ -232,17 +161,17 @@ compile: $(lisp)/subdirs.el doit fi \ done -# Compile all Lisp files, except those from DONTCOMPILE. This -# is like `compile' but compiles files unconditionally. +# Compile all Lisp files. This is like `compile' but compiles files +# unconditionally. Some files don't actually get compiled because they +# set the local variable no-byte-compile. + compile-always: $(lisp)/subdirs.el doit # `|| true' prevents old Bash versions from getting confused # by an error. find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1 || true; \ wd=$(lisp); $(setwins); \ - elpat=`echo $$wins | tr ' ' '\012\012' | \ + els=`echo $$wins | tr ' \011' '\012\012' | \ sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \ - els=`echo $$elpat $(DONTCOMPILE) $(DONTCOMPILE) $(COMPILE_FIRST) | \ - tr ' ' '\012\012' | sort | uniq -u`; \ for el in $(COMPILE_FIRST) $$els; do \ if test -f $$el; \ then \ @@ -272,30 +201,42 @@ compile-after-backup: backup-compiled-files compile-always # Note that this doesn't create .elc files. It only recompiles if an # .elc is present. -recompile: doit - $(EMACS) $(EMACSOPT) -f batch-byte-recompile-directory $(lisp) +recompile: doit $(lisp)/progmodes/cc-mode.elc + $(EMACS) $(EMACSOPT) --eval "(batch-byte-recompile-directory 0)" $(lisp) + +# CC Mode uses a compile time macro system which causes a compile time +# dependency in cc-mode.elc on the macros in cc-langs.el and the +# version string in cc-defs.el. +$(lisp)/progmodes/cc-mode.elc: \ + $(lisp)/progmodes/cc-mode.el \ + $(lisp)/progmodes/cc-langs.el \ + $(lisp)/progmodes/cc-defs.el + $(EMACS) $(EMACSOPT) -f batch-byte-compile $(lisp)/progmodes/cc-mode.el # Prepare a bootstrap in the lisp subdirectory. # -# Build loaddefs.el, because it's not sure it's up-to-date, and if it's not, -# that might lead to errors during the bootstrap because something fails to -# autoload as expected. However, if there is no emacs binary, then we can't -# build autoloads yet, so just make sure there's some loaddefs.el file, as -# it's necessary for generating the binary (because loaddefs.el is an -# automatically generated file, we don't want to store it in the source -# repository). -# -# Remove compiled Lisp files so that bootstrap-emacs will be built from -# sources only. - -bootstrap-clean: +# Build loaddefs.el to make sure it's up-to-date. If it's not, that +# might lead to errors during the bootstrap because something fails to +# autoload as expected. If there is no emacs binary, then we can't +# build autoloads yet. In that case we have to use ldefs-boot.el. +# Bootstrap should always work with ldefs-boot.el. Therefore, +# whenever a new autoload cookie gets added that is necessary during +# bootstrapping, ldefs-boot.el should be updated by overwriting it with +# an up-to-date copy of loaddefs.el that is uncorrupted by +# local changes. (Because loaddefs.el is an automatically generated +# file, we don't want to store it in the source repository). + +bootstrap-prepare: if test -x $(EMACS); then \ $(MAKE) $(MFLAGS) autoloads; \ else \ - if test ! -r $(lisp)/loaddefs.el; then \ - cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el; \ - fi \ + cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el; \ fi + +maintainer-clean: distclean + cd $(lisp); rm -f *.elc */*.elc $(AUTOGENEL) + +bootstrap-clean: cd $(lisp); rm -f *.elc */*.elc # Generate/update files for the bootstrap process. @@ -310,5 +251,4 @@ bootstrap-after: finder-data custom-deps distclean: -rm -f ./Makefile -# arch-tag: d4ea703a-b91c-405c-a171-8dde30b163a7 # Makefile ends here.