Mercurial > emacs
changeset 44106:748924636cc4
(finder-inf.el): Remove.
(finder-data): Don't depend on finder-inf.el any more.
(compile, compile-always): Handle the case where some files
from DONTCOMPILE are missing (it tried to compile them).
(bootstrap-clean): Use src/emacs only if executable.
(bootstrap): Update subdirs.el and finder-inf.el.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 22 Mar 2002 23:36:15 +0000 |
| parents | 70f755b6a5c9 |
| children | c10785cb0f83 |
| files | lisp/Makefile.in |
| diffstat | 1 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/Makefile.in Fri Mar 22 23:27:35 2002 +0000 +++ b/lisp/Makefile.in Fri Mar 22 23:36:15 2002 +0000 @@ -148,9 +148,7 @@ echo Directories: $$wins; \ $(EMACS) $(EMACSOPT) -l cus-dep -f custom-make-dependencies $$wins -finder-inf.el: - echo "(provide 'finder-inf)" >> $@ -finder-data: finder-inf.el doit +finder-data: doit wd=$(lisp); $(finder_setwins); \ echo Directories: $$wins; \ $(EMACS) $(EMACSOPT) -l finder -f finder-compile-keywords-make-dist $$wins @@ -212,12 +210,16 @@ # current directory and its subdirectories, to make sure require's and # load's in the files being compiled find the right files. +# NOTE about DONTCOMPILE: in the `echo <foo> | sort | uniq -u' we pass +# $(DONTCOMPILE) twice. This is in case one of the files in DONTCOMPILE +# is absent. -stef + compile: subdirs.el doit 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|'`; \ - els=`echo $$elpat $(DONTCOMPILE) $(COMPILE_FIRST) | \ + els=`echo $$elpat $(DONTCOMPILE) $(DONTCOMPILE) $(COMPILE_FIRST) | \ tr ' ' '\012\012' | sort | uniq -u`; \ for el in $(COMPILE_FIRST) $$els; do \ echo Compiling $$el; \ @@ -231,7 +233,7 @@ wd=$(lisp); $(setwins); \ elpat=`echo $$wins | tr ' ' '\012\012' | \ sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \ - els=`echo $$elpat $(DONTCOMPILE) $(COMPILE_FIRST) | \ + els=`echo $$elpat $(DONTCOMPILE) $(DONTCOMPILE) $(COMPILE_FIRST) | \ tr ' ' '\012\012' | sort | uniq -u`; \ for el in $(COMPILE_FIRST) $$els; do \ echo Compiling $$el; \ @@ -269,12 +271,12 @@ # bootstrap-emacs will be built from sources only. bootstrap-clean: - if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi + if test -x $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi -rm -f $(lisp)/*.elc $(lisp)/*/*.elc # Generate/update files for the bootstrap process. -bootstrap: subdirs.el autoloads compile-always custom-deps +bootstrap: update-subdirs autoloads compile finder-data custom-deps distclean: -rm -f ./Makefile