*** empty log message ***

[gnu-emacs] / lisp / Makefile.in

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 9985d399605ced028f1b5cdde5cfd6b5ec84653c..94a4c478cb6f1f0794a1442ccfdaa2cb00b072c1 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -6,6 +6,7 @@ SHELL = /bin/sh
 
 lisp=@srcdir@
 VPATH=@srcdir@
+srcdir=@srcdir@/..
 
 # You can specify a different executable on the make command line,
 # e.g. "make EMACS=../src/emacs ...".
@@ -22,15 +23,18 @@ 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.
+# Files which should not be compiled.  If you change the name `DONTCOMPILE'
+# to something different, you'll have to change make-dist as well.
+#
 # - 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)/bindings.el \
        $(lisp)/cus-load.el \
        $(lisp)/cus-start.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 \
@@ -64,7 +68,7 @@ COMPILE_FIRST = \
 
 # The actual Emacs command run in the targets below.
 
-emacs = $(EMACS) $(EMACSOPT)
+emacs = EMACSLOADPATH=$(lisp) $(EMACS) $(EMACSOPT)
 
 # Common command to find subdirectories
 
@@ -82,14 +86,14 @@ cus-load.el:
 custom-deps: cus-load.el doit
        wd=$(lisp); $(setwins); \
        echo Directories: $$wins; \
-       $(emacs) -l cus-dep -f custom-make-dependencies $$wins
+       $(EMACS) $(EMACSOPT) -l cus-dep -f custom-make-dependencies $$wins
 
 finder-inf.el:
        echo "(provide 'finder-inf)" >> $@
 finder-data: finder-inf.el doit
        wd=$(lisp); $(setwins); \
        echo Directories: $$wins; \
-       $(emacs) -l finder -f finder-compile-keywords-make-dist $$wins
+       $(EMACS) $(EMACSOPT) -l finder -f finder-compile-keywords-make-dist $$wins
 
 loaddefs.el:
        echo ";;; loaddefs.el --- automatically extracted autoloads" >> $@
@@ -104,7 +108,7 @@ loaddefs.el:
 autoloads: loaddefs.el doit
        wd=$(lisp); $(setwins); \
        echo Directories: $$wins; \
-       $(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
+       $(EMACS) $(EMACSOPT) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
 
 subdirs.el:
        $(MAKE) $(MFLAGS) update-subdirs
@@ -116,15 +120,21 @@ update-subdirs: doit
 
 updates: update-subdirs autoloads finder-data custom-deps
 
+# Update the AUTHORS file.
+
+update-authors:
+       $(emacs) -f batch-update-authors $(srcdir)/AUTHORS $(srcdir)
+
 TAGS: $(lisptagsfiles1) $(lisptagsfiles2)
        ${ETAGS} $(lisptagsfiles1) $(lisptagsfiles2)
 
-TAGS-LISP: $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2)
-       ${ETAGS} -o TAGS-LISP \
-         $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2)
+TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
+       ${ETAGS} -o TAGS-LISP $(lisptagsfiles1) $(lisptagsfiles2)
+
+.SUFFIXES: .elc .el
 
 .el.elc: subdirs.el
-       -EMACSLOADPATH=$(lisp) $(emacs) -f batch-byte-compile $<
+       -$(emacs) -f batch-byte-compile $<
 
 $(DONTCOMPILE:.el=.elc):
        -rm -f $@
@@ -147,7 +157,7 @@ compile-files: subdirs.el doit
                tr '     ' '\012\012' | sort | uniq -u`; \
        for el in $(COMPILE_FIRST) $$els; do \
          echo Compiling $$el; \
-         EMACSLOADPATH=$(lisp) $(emacs) -f batch-byte-compile $$el; \
+         $(emacs) -f batch-byte-compile $$el || exit 1; \
        done
 
 # Backup compiled Lisp files in elc.tar.gz.  If that file already
@@ -166,7 +176,7 @@ compile: backup-compiled-files compile-files
 # .elc is present.
 
 recompile: doit
-       $(emacs) -f batch-byte-recompile-directory $(lisp)
+       $(EMACS) $(EMACSOPT) -f batch-byte-recompile-directory $(lisp)
 
 # 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