Get "make -k" to go through

[gnu-emacs-elpa] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 5d450651889887c017e9f0a18ac419e59717d9c7..3199fcc7fc5992dafc396d49b5d66eb18ae84361 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -9,34 +9,16 @@ SITE_DIR=site
 
 all: all-in-place
 
-## Set up the source files for direct usage, by pointing
-## `package-directory-list' to the site/ directory.
-site: packages
-       mkdir -p $(SITE_DIR)
-       $(EMACS) -batch -l $(CURDIR)/admin/archive-contents.el \
-         --eval "(batch-make-site-dir \"packages\" \"$(SITE_DIR)\")"
-
-site/%: do-it
-       $(EMACS) -batch -l $(CURDIR)/admin/archive-contents.el \
-         --eval "(progn (setq debug-on-error t) (batch-make-site-package \"$@\"))"
-
 ## Deploy the package archive to archive/, with packages in
 ## archive/packages/:
 archive: archive-tmp
        $(MAKE) $(MFLAGS) process-archive
 
-archive-tmp: packages changelogs
+archive-tmp: packages
        -rm -r $(ARCHIVE_TMP)
        mkdir -p $(ARCHIVE_TMP)
        cp -a packages/. $(ARCHIVE_TMP)/packages
 
-# Refresh the ChangeLog files.  This needs to be done in
-# the source tree, because it needs the Bzr data!
-changelogs:
-       cd packages; \
-       $(EMACS) -batch -l $(CURDIR)/admin/archive-contents.el \
-                       -f batch-prepare-packages
-
 process-archive:
        # FIXME, we could probably speed this up significantly with
        # rules like "%.tar: ../%/ChangeLog" so we only rebuild the packages
@@ -75,7 +57,7 @@ org-fetch: archive-tmp
 clean:
        rm -rf archive $(ARCHIVE_TMP) $(SITE_DIR)
 
-########## Rules for in-place installation ##########
+########## Rules for in-place installation ####################################
 pkgs := $(foreach pkg, $(wildcard packages/*), \
           $(if $(shell [ -d "$(pkg)" ] && echo true), $(pkg)))
 
@@ -118,13 +100,16 @@ nbc_els := $(foreach el, $(extra_els), \
 elcs := $(call SET-diff, $(naive_elcs), $(patsubst %.el, %.elc, $(nbc_els)))
 
 # '(dolist (al (quote ($(patsubst %, "%", $(autoloads))))) (load (expand-file-name al) nil t))'
-%.elc: %.el $(autoloads)
+%.elc: %.el
        @echo 'EMACS -f batch-byte-compile $<'
        @$(EMACS) --batch \
            --eval "(setq package-directory-list '(\"$(abspath packages)\"))" \
            --eval '(package-initialize)' \
            -L $(dir $@) -f batch-byte-compile $<
 
+.PHONY: elcs
+elcs: $(elcs)
+
 # Remove .elc files that don't have a corresponding .el file any more.
 extra_elcs := $(call SET-diff, $(current_elcs), $(naive_elcs))
 .PHONY: $(extra_elcs)
@@ -145,5 +130,11 @@ $(extra_elcs):; rm $@
 #          --eval '(setq d (with-current-buffer b (package-buffer-info)))' \
 #          --eval '(package-generate-description-file d "$(dir $@)")'
 
+.PHONY: all-in-place
+all-in-place: $(extra_elcs) $(autoloads) # $(single_pkgs)
+       # Do them in a sub-make, so that autoloads are done first.
+       $(MAKE) elcs
+
+
+############### Rules to prepare the externals ################################
 
-all-in-place: $(extra_elcs) $(autoloads) $(elcs) # $(single_pkgs)