all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Glenn Morris <rgm@gnu.org>
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: 26100@debbugs.gnu.org
Subject: bug#26100: Switch from Automake to GNU Make
Date: Wed, 15 Mar 2017 20:10:25 -0400	[thread overview]
Message-ID: <fs8to6krny.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <ebd1e66b-d637-cb4e-c861-e1cbf1ae8fcb@cs.ucla.edu> (Paul Eggert's message of "Tue, 14 Mar 2017 17:16:21 -0700")

Paul Eggert wrote:

> Attached is a patch to change the Emacs build procedure to use GNU
> Make instead of Automake

Thanks, great news! Nitpicks below.

> --- a/Makefile.in
> +++ b/Makefile.in
> @@ -73,10 +73,6 @@ CDPATH=
>  cache_file = @cache_file@
>  CONFIGURE_FLAGS = --cache-file=$(cache_file)
>  
> -AUTOCONF = @AUTOCONF@
[...]
> -AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
> -
> -$(srcdir)/configure: $(AUTOCONF_INPUTS)
> -	cd ${srcdir} && ${AUTOCONF}
> -
[...]
> +$(srcdir)/configure $(srcdir)/src/stamp-h.in: \
> +  $(srcdir)/configure.ac $(srcdir)/m4/*.m4
> +	cd $(srcdir) && ./autogen.sh autoconf

autogen.sh passes "-f" to autoreconf, so the new version will be more
aggressive about updating than the old version was. (Also, this hunk
isn't directly related to the overall change, is it?)

>  $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
>  	@ # Usually, there's no need to rebuild src/config.in just
>  	@ # because stamp-h.in has changed (since building stamp-h.in
>  	@ # refreshes config.in as well), but if config.in is missing
>  	@ # then we really need to do something more.
> -	$(if $(wildcard $@),,cd $(srcdir) && $(AUTOHEADER))
> -$(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
> -	cd ${srcdir} && ${AUTOHEADER}
> -	rm -f $@
> -	echo timestamp > $@
> +	$(if $(wildcard $@),,cd $(srcdir) && ./autogen.sh autoconf)

Likewise?

> diff --git a/autogen.sh b/autogen.sh
> index bb3f818..f8e71cb 100755
> --- a/autogen.sh
> +++ b/autogen.sh
[...]
> -  autoreconf -fi -I m4 || exit $?
> +  autoreconf -fi -I m4 || exit

Also unrelated?

[New files:]
> build-aux/config.guess
> build-aux/config.sub
> build-aux/install-sh

It's a tiny bit disappointing that we need to version these again
(you removed them in 2011).





  parent reply	other threads:[~2017-03-16  0:10 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-15  0:16 bug#26100: Switch from Automake to GNU Make Paul Eggert
2017-03-15 15:34 ` Eli Zaretskii
2017-03-15 17:20 ` Andy Moreton
2017-03-16  0:10 ` Glenn Morris [this message]
2017-03-16  0:42   ` Glenn Morris
2017-03-16  9:22   ` Paul Eggert
2017-03-16 20:13 ` Anders Lindgren
2017-03-17 19:05 ` Paul Eggert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fs8to6krny.fsf@fencepost.gnu.org \
    --to=rgm@gnu.org \
    --cc=26100@debbugs.gnu.org \
    --cc=eggert@cs.ucla.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.