From 4939f58d2c45062d5eac3f4c845b4494cf113f1f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 13 Jul 2014 08:50:35 -0700 Subject: Improve behavior of 'bzr up; cd src; make -k'. * Makefile.in (ACLOCAL_INPUTS): Add all m4/*.m4 files. * src/Makefile.in (top_srcdir): New var. (ntsource, lispsource, ALL_CFLAGS, gl-stamp, emacs.res): Use '$(top_srcdir)' instead of '$(srcdir)/..'; its expansion is a bit shorter. (../config.status): Actually build config.status instead of just complaining. (ACLOCAL_INPUTS, AUTOCONF_INPUTS): New macros, copied and relocated from ../Makefile.in. ($(top_srcdir)/aclocal.m4, $(top_srcdir)/configure, config.in) (../config.status, Makefile): New dependencies and rules, copied with relocation from ../Makefile.in. This should be more likely to rebuild the build machinery properly if you do a 'make' in the src directory. --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 6b24147c8d3..a6080e5ce78 100644 --- a/Makefile.in +++ b/Makefile.in @@ -413,7 +413,7 @@ $(srcdir)/configure: $(AUTOCONF_INPUTS) cd ${srcdir} && ${AUTOCONF} ACLOCAL_PATH = @ACLOCAL_PATH@ -ACLOCAL_INPUTS = $(srcdir)/configure.ac $(srcdir)/m4/gnulib-comp.m4 +ACLOCAL_INPUTS = $(srcdir)/configure.ac $(wildcard $(srcdir)/m4/*.m4) $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS) cd $(srcdir) && ACLOCAL_PATH='$(ACLOCAL_PATH)' $(ACLOCAL) -I m4 -- cgit v1.2.1