X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/98c602effb0271d36ec2ffae257d9bc9df628f8f..1c1da4184c3870e9f207d8a35a519850b9f36d6a:/lisp/Makefile.in

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 08d2b77096..87fae4711f 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,6 +1,22 @@
-#
 # Maintenance productions for the Lisp directory
-#
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# 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.
 
 SHELL = /bin/sh
 
@@ -23,17 +39,19 @@ 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, 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)/bindings.el \
 	$(lisp)/cus-load.el \
 	$(lisp)/cus-start.el \
 	$(lisp)/emacs-lisp/cl-specs.el \
 	$(lisp)/eshell/esh-maint.el \
-	$(lisp)/eshell/esh-group.el \
+	$(lisp)/eshell/esh-groups.el \
 	$(lisp)/finder-inf.el \
 	$(lisp)/forms-d2.el \
 	$(lisp)/forms-pass.el \
@@ -46,28 +64,66 @@ DONTCOMPILE = \
 	$(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/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)/loadup.el \
 	$(lisp)/mail/blessmail.el \
-	$(lisp)/mail/sc.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)/term/xterm.el \
 	$(lisp)/version.el
 
-# Files to compile before others during a bootstrap.  This is done
-# to speed up the bootstrap process.
+# Files to compile before others during a bootstrap.  This is done to
+# speed up the bootstrap process.  The CC files are compiled first
+# because CC mode tweaks the compilation process, and requiring
+# cc-mode when it is not compiled doesn't work during the
+# bootstrapping.
 
 COMPILE_FIRST = \
 	$(lisp)/emacs-lisp/byte-opt.el \
 	$(lisp)/emacs-lisp/bytecomp.el \
-	$(lisp)/subr.el
+	$(lisp)/subr.el \
+	$(lisp)/progmodes/cc-mode.el \
+	$(lisp)/progmodes/cc-vars.el
 
 # The actual Emacs command run in the targets below.
 
-emacs = $(EMACS) $(EMACSOPT)
+emacs = EMACSLOADPATH=$(lisp) $(EMACS) $(EMACSOPT)
 
 # Common command to find subdirectories
 
@@ -78,6 +134,13 @@ setwins=subdirs=`find $$wd -type d -print`; \
 	   esac; \
         done
 
+finder_setwins=subdirs=`find $$wd -type d -print`; \
+	for file in $$subdirs; do \
+	   case $$file in */Old | */RCS | */CVS | */CVS/* | */=* | */obsolete | */term ) ;; \
+		*) wins="$$wins $$file" ;; \
+	   esac; \
+        done
+
 doit:
 
 cus-load.el:
@@ -85,14 +148,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); \
+	wd=$(lisp); $(finder_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" >> $@
@@ -107,7 +170,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
@@ -119,15 +182,23 @@ 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)
+	els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e "s,$(lisp)/loaddefs.el,,"`; \
+	${ETAGS} $$els
 
-TAGS-LISP: $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2)
-	${ETAGS} -o TAGS-LISP \
-	  $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2)
+TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
+	els=`echo $(lisptagsfiles1) $(lisptagsfiles2) | sed -e "s,$(lisp)/loaddefs.el,,"`; \
+	${ETAGS} -o TAGS-LISP $$els
+
+.SUFFIXES: .elc .el
 
 .el.elc: subdirs.el
-	-EMACSLOADPATH=$(lisp) $(emacs) -f batch-byte-compile $<
+	-$(emacs) -f batch-byte-compile $<
 
 $(DONTCOMPILE:.el=.elc):
 	-rm -f $@
@@ -142,7 +213,7 @@ $(DONTCOMPILE:.el=.elc):
 # load's in the files being compiled find the right files.
 
 compile-files: subdirs.el doit
-	find $(lisp) -name "*.elc" -print | xargs chmod +w; \
+	find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1; \
 	wd=$(lisp); $(setwins);	\
 	elpat=`echo $$wins | tr ' 	' '\012\012' | \
 		sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`;	\
@@ -150,7 +221,13 @@ 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
+
+compile-calc: 
+	for el in $(find $(lisp)/calc -name '*.el'); do \
+	  echo Compiling $$el; \
+	  $(emacs) -f batch-byte-compile $$el || exit 1; \
 	done
 
 # Backup compiled Lisp files in elc.tar.gz.  If that file already
@@ -169,7 +246,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
@@ -186,6 +263,6 @@ bootstrap-clean:
 bootstrap: autoloads compile-files custom-deps
 
 distclean:
-	-rm -f $(lisp)/Makefile
+	-rm -f ./Makefile
 
 # Makefile ends here.