Commit 61784fd1 authored by Glenn Morris's avatar Glenn Morris

* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL): New, set by configure

Use throughout where appropriate.
parent 40abffe4
2014-06-10 Glenn Morris <rgm@gnu.org> 2014-06-10 Glenn Morris <rgm@gnu.org>
* Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL):
New, set by configure. Use throughout where appropriate.
* Makefile.in (INFO_EXT): Remove and replace by ".info" throughout. * Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
* configure.ac (INFO_EXT, INFO_OPTS): Remove output variables. * configure.ac (INFO_EXT, INFO_OPTS): Remove output variables.
......
...@@ -76,6 +76,11 @@ QUIET_SUBMAKE = MAKELEVEL=0 ...@@ -76,6 +76,11 @@ QUIET_SUBMAKE = MAKELEVEL=0
cache_file = @cache_file@ cache_file = @cache_file@
CONFIGURE_FLAGS = --cache-file=$(cache_file) CONFIGURE_FLAGS = --cache-file=$(cache_file)
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
ACLOCAL = @ACLOCAL@
CC=@CC@ CC=@CC@
CFLAGS=@CFLAGS@ CFLAGS=@CFLAGS@
LDFLAGS=@LDFLAGS@ LDFLAGS=@LDFLAGS@
...@@ -422,17 +427,17 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el ...@@ -422,17 +427,17 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4 AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
$(srcdir)/configure: $(AUTOCONF_INPUTS) $(srcdir)/configure: $(AUTOCONF_INPUTS)
cd ${srcdir} && autoconf cd ${srcdir} && ${AUTOCONF}
ACLOCAL_PATH = @ACLOCAL_PATH@ ACLOCAL_PATH = @ACLOCAL_PATH@
ACLOCAL_INPUTS = $(srcdir)/configure.ac $(srcdir)/m4/gnulib-comp.m4 ACLOCAL_INPUTS = $(srcdir)/configure.ac $(srcdir)/m4/gnulib-comp.m4
$(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS) $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
cd $(srcdir) && ACLOCAL_PATH='$(ACLOCAL_PATH)' aclocal -I m4 cd $(srcdir) && ACLOCAL_PATH='$(ACLOCAL_PATH)' $(ACLOCAL) -I m4
AUTOMAKE_INPUTS = $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am \ AUTOMAKE_INPUTS = $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am \
$(srcdir)/lib/gnulib.mk $(srcdir)/lib/gnulib.mk
$(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS) $(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS)
cd $(srcdir) && automake --gnu -a -c lib/Makefile cd $(srcdir) && $(AUTOMAKE) --gnu -a -c lib/Makefile
# Regenerate files that this makefile would have made, if this makefile # Regenerate files that this makefile would have made, if this makefile
# had been built by Automake. The name 'am--refresh' is for # had been built by Automake. The name 'am--refresh' is for
...@@ -445,9 +450,9 @@ $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in ...@@ -445,9 +450,9 @@ $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
@ # because stamp-h.in has changed (since building stamp-h.in @ # because stamp-h.in has changed (since building stamp-h.in
@ # refreshes config.in as well), but if config.in is missing @ # refreshes config.in as well), but if config.in is missing
@ # then we really need to do something more. @ # then we really need to do something more.
[ -r "$@" ] || ( cd ${srcdir} && autoheader ) [ -r "$@" ] || ( cd ${srcdir} && ${AUTOHEADER} )
$(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
cd ${srcdir} && autoheader cd ${srcdir} && ${AUTOHEADER}
rm -f $(srcdir)/src/stamp-h.in rm -f $(srcdir)/src/stamp-h.in
echo timestamp > $(srcdir)/src/stamp-h.in echo timestamp > $(srcdir)/src/stamp-h.in
......
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