[gnus git] branch master updated: m0-11-119-gdd2bbb9 =1= Fix gnus-load.el generation.

Tassilo <[email protected]> Mon, 26 Jan 2015 16:05:46 +0100
Newsgroups gmane.emacs.gnus.cvs
Message-ID <[email protected]>
       via  dd2bbb95234eb1d65e1a3a504f40339a4be85418 (commit)
      from  8f6008165e9f96274f439bc7b5a01852db3ac6ac (commit)


- Log -----------------------------------------------------------------
commit dd2bbb95234eb1d65e1a3a504f40339a4be85418
Author: Tassilo Horn <[email protected]>
Date:   Mon Jan 26 15:58:32 2015 +0100

    Fix gnus-load.el generation.
    
    Until now, making gnus/lisp/Makefile's all target had the dependencies
    clean-some and gnus-load.el where clean-some deletes gnus-load.el.
    Make uses a file cache and doesn't notice that clean-some deletes
    gnus-load.el.  Therefore, the gnus-load.el target is up-to-date if
    gnus-load.el existed initially (i.e., before clean-some performed its
    recipe).  Strangely, with make versions < 4.1 the target worked by
    chance anyhow.
    
    Now the gnus-load.el target is called with a recursive make invocation
    so that its file cache reflects the actual filesystem situation.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index acaf487..0f6ea07 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-26  Tassilo Horn  <[email protected]>
+
+	* Makefile.in (all total, warn, fail-on-warning): 
+
 2015-01-26  Trevor Murphy  <[email protected]>
 
 	* nnimap.el (nnimap-header-parameters): Refactor and request
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 58c02c1..4dfe2f0 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -16,16 +16,19 @@ EMACS_COMP = lispdir="$(lispdir)" srcdir=$(srcdir) $(EMACS) $(FLAGS)
 GZIP_PROG = @GZIP_PROG@
 COMPRESS_INSTALL = @COMPRESS_INSTALL@
 
-all total: clean-some gnus-load.el
+all total: clean-some
+	$(MAKE) gnus-load.el
 	$(EMACS_COMP) -f dgnushack-compile
 
 clean-some:
 	rm -f *.elc gnus-load.el auto-autoloads.* custom-load.*
 
-warn: clean-some gnus-load.el
+warn: clean-some
+	$(MAKE) gnus-load.el
 	$(EMACS_COMP) --eval '(dgnushack-compile t)' 2>&1 | egrep -v "variable G|inhibit-point-motion-hooks|coding-system|temp-results|variable gnus|variable nn|scroll-in-place|deactivate-mark|filladapt-mode|byte-code-function-p|print-quoted|ps-right-header|ps-left-header|article-inhibit|print-escape|ssl-program-arguments|message-log-max"
 
-fail-on-warning: clean-some gnus-load.el
+fail-on-warning: clean-some
+	$(MAKE) gnus-load.el
 	$(EMACS_COMP) -f dgnushack-compile-error-on-warn
 
 # The "clever" rule is unsafe, since redefined macros are loaded from

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    4 ++++
 lisp/Makefile.in |    9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project