Commit 1499d2dd authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(EMACSOPT): Remove --no-init-file (implied by -batch).

(autoloads): Explicitly load `autoload' to bootstrap without loaddefs.
(backup-compiled-files): Ignore errors during `tar'.
(bootstrap): Make autoloads before elc files.
parent b54f61ed
...@@ -10,7 +10,7 @@ EMACS = ../src/emacs ...@@ -10,7 +10,7 @@ EMACS = ../src/emacs
# Command line flags for Emacs. This must include --multibyte, # Command line flags for Emacs. This must include --multibyte,
# otherwise some files will not compile. # otherwise some files will not compile.
EMACSOPT = --no-init-file --no-site-file --multibyte -batch EMACSOPT = -batch --no-site-file --multibyte
SOURCES = *.el COPYING Makefile SOURCES = *.el COPYING Makefile
lisptagsfiles1 = [a-zA-Z]*.el lisptagsfiles1 = [a-zA-Z]*.el
...@@ -79,7 +79,7 @@ loaddefs.el: ...@@ -79,7 +79,7 @@ loaddefs.el:
autoloads: loaddefs.el doit autoloads: loaddefs.el doit
wd=.; $(setwins); \ wd=.; $(setwins); \
echo Directories: $$wins; \ echo Directories: $$wins; \
$(emacs) --eval '(setq generated-autoload-file "'`pwd`'/loaddefs.el")' -f batch-update-autoloads $$wins $(emacs) -l autoload --eval '(setq generated-autoload-file "'`pwd`'/loaddefs.el")' -f batch-update-autoloads $$wins
subdirs.el: subdirs.el:
$(MAKE) $(MFLAGS) update-subdirs $(MAKE) $(MFLAGS) update-subdirs
...@@ -130,7 +130,7 @@ compile-files: subdirs.el doit ...@@ -130,7 +130,7 @@ compile-files: subdirs.el doit
backup-compiled-files: backup-compiled-files:
-mv elc.tar.gz elc.tar.gz~ -mv elc.tar.gz elc.tar.gz~
tar czf elc.tar.gz *.elc */*.elc -tar czf elc.tar.gz *.elc */*.elc
# Compile Lisp files, but save old compiled files first. # Compile Lisp files, but save old compiled files first.
...@@ -155,6 +155,6 @@ bootstrap-clean: ...@@ -155,6 +155,6 @@ bootstrap-clean:
# Generate/update files for the bootstrap process. # Generate/update files for the bootstrap process.
bootstrap: compile-files autoloads custom-deps bootstrap: autoloads compile-files custom-deps
# Makefile ends here. # Makefile ends here.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment