[Emacs-diffs] trunk r117526: Improve behavior of 'bzr up; cd src; make -k'.

[Paul Eggert]

------------------------------------------------------------
revno: 117526
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2014-07-13 08:50:35 -0700
message:
  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.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  Makefile.in                    makefile.in-20091113204419-o5vbwnq5f7feedwu-446
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/Makefile.in                makefile.in-20091113204419-o5vbwnq5f7feedwu-631

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-07-12 20:02:44 +0000
+++ b/ChangeLog 2014-07-13 15:50:35 +0000
@@ -1,3 +1,8 @@
+2014-07-13  Paul Eggert  <address@hidden>
+
+       Improve behavior of 'bzr up; cd src; make -k'.
+       * Makefile.in (ACLOCAL_INPUTS): Add all m4/*.m4 files.
+
 2014-07-12  Paul Eggert  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'Makefile.in'
--- a/Makefile.in       2014-07-12 17:53:29 +0000
+++ b/Makefile.in       2014-07-13 15:50:35 +0000
@@ -413,7 +413,7 @@
        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
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-07-12 17:53:29 +0000
+++ b/src/ChangeLog     2014-07-13 15:50:35 +0000
@@ -1,3 +1,20 @@
+2014-07-13  Paul Eggert  <address@hidden>
+
+       Improve behavior of 'bzr up; cd src; make -k'.
+       * 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.
+
 2014-07-12  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (display_line): Don't call FETCH_BYTE with argument less

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2014-06-29 00:49:59 +0000
+++ b/src/Makefile.in   2014-07-13 15:50:35 +0000
@@ -28,9 +28,10 @@
 # Here are the things that we expect ../configure to edit.
 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 # MinGW CPPFLAGS may use this.
 address@hidden@
-ntsource = $(srcdir)/../nt
+ntsource = $(top_srcdir)/nt
 VPATH = $(srcdir)
 CC = @CC@
 WINDRES = @WINDRES@
@@ -48,7 +49,7 @@
 # LIBS = @LIBS@
 LIBOBJS = @LIBOBJS@
 
-lispsource = $(srcdir)/../lisp
+lispsource = $(top_srcdir)/lisp
 lib = ../lib
 libsrc = ../lib-src
 etc = ../etc
@@ -319,7 +320,7 @@
 ##
 ## FIXME? MYCPPFLAGS only referenced in etc/DEBUG.
 ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \
-  -I$(lib) -I$(srcdir)/../lib \
+  -I$(lib) -I$(top_srcdir)/lib \
   $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
   $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \
   $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \
@@ -474,7 +475,7 @@
 
 gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES)
        $(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl.tmp
-       $(srcdir)/../build-aux/move-if-change gl.tmp globals.h
+       $(top_srcdir)/build-aux/move-if-change gl.tmp globals.h
        echo timestamp > $@
 
 $(ALLOBJS): globals.h
@@ -505,17 +506,23 @@
 FORCE:
 .PHONY: FORCE
 
-../config.status: config.in epaths.in
-       @echo "The file ${?:.in=.h} needs to be set up from $?."
-       @echo "Please run the 'configure' script again."
-       exit 1
+ACLOCAL_INPUTS = $(top_srcdir)/configure.ac $(wildcard $(top_srcdir)/m4/*.m4)
+AUTOCONF_INPUTS = $(top_srcdir)/configure.ac $(top_srcdir)/aclocal.m4
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_INPUTS)
+$(top_srcdir)/configure config.in: $(AUTOCONF_INPUTS)
+.PRECIOUS: ../config.status Makefile
+../config.status: $(top_srcdir)/configure $(top_srcdir)/lisp/version.el
+Makefile: ../config.status $(srcdir)/Makefile.in
+$(top_srcdir)/aclocal.m4 $(top_srcdir)/configure config.in ../config.status \
+  Makefile:
+       $(MAKE) -C .. am--refresh
 
 doc.o: buildobj.h
 
 emacs.res: $(ntsource)/emacs.rc \
           $(ntsource)/icons/emacs.ico \
           $(ntsource)/$(EMACS_MANIFEST)
-       $(WINDRES) -O COFF --include-dir=$(srcdir)/../nt \
+       $(WINDRES) -O COFF --include-dir=$(top_srcdir)/nt \
          -o $@ $(ntsource)/emacs.rc
 
 .PHONY: ns-app