[Emacs-diffs] trunk r114769: Attempt at a fix for mingw CPPFLAGS

[Glenn Morris]

------------------------------------------------------------
revno: 114769
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-10-23 19:15:16 -0700
message:
  Attempt at a fix for mingw CPPFLAGS
  
  * configure.ac (CPPFLAGS) [mingw32]: Use abs_top_srcdir.
  
  * Makefile.in (abs_top_srcdir):
  * lib-src/Makefile.in (abs_top_srcdir):
  * lwlib/Makefile.in (abs_top_srcdir):
  * nt/Makefile.in (abs_top_srcdir):
  * oldXMenu/Makefile.in (abs_top_srcdir):
  * src/Makefile.in (abs_top_srcdir):
  New, set by configure.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  Makefile.in                    makefile.in-20091113204419-o5vbwnq5f7feedwu-446
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  lib-src/ChangeLog              changelog-20091113204419-o5vbwnq5f7feedwu-1608
  lib-src/Makefile.in            makefile.in-20091113204419-o5vbwnq5f7feedwu-475
  lwlib/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-1447
  lwlib/Makefile.in              makefile.in-20091113204419-o5vbwnq5f7feedwu-662
  nt/ChangeLog                   changelog-20091113204419-o5vbwnq5f7feedwu-1545
  nt/Makefile.in                 makefile.in-20130401120038-v7du7ljz2h0zkbc6-1
  oldXMenu/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-1572
  oldXMenu/Makefile.in           
makefile.in-20091113204419-o5vbwnq5f7feedwu-1588
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/Makefile.in                makefile.in-20091113204419-o5vbwnq5f7feedwu-631

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-10-23 23:27:19 +0000
+++ b/ChangeLog 2013-10-24 02:15:16 +0000
@@ -1,3 +1,9 @@
+2013-10-24  Glenn Morris  <address@hidden>
+
+       * configure.ac (CPPFLAGS) [mingw32]: Use abs_top_srcdir.
+
+       * Makefile.in (abs_top_srcdir): New, set by configure.
+
 2013-10-23  Glenn Morris  <address@hidden>
 
        * configure.ac: Explicit error for non-ASCII directories.  (Bug#15260)

=== modified file 'Makefile.in'
--- a/Makefile.in       2013-10-23 22:33:08 +0000
+++ b/Makefile.in       2013-10-24 02:15:16 +0000
@@ -164,6 +164,7 @@
 # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
 address@hidden@
 address@hidden@
address@hidden@ # MinGW CPPFLAGS may use this
 
 # Where the manpage source files are kept.
 mansrcdir=$(srcdir)/doc/man

=== modified file 'configure.ac'
--- a/configure.ac      2013-10-23 23:27:19 +0000
+++ b/configure.ac      2013-10-24 02:15:16 +0000
@@ -4738,7 +4738,7 @@
 LIBS=$SAVE_LIBS
 
 if test "${opsys}" = "mingw32"; then
-  CPPFLAGS="$CPPFLAGS -DUSE_CRT_DLL=1 -I $srcdir/nt/inc"
+  CPPFLAGS="$CPPFLAGS -DUSE_CRT_DLL=1 -I \${abs_top_srcdir}/nt/inc"
   # Remove unneeded switches from the value of CC that goes to Makefiles
   CC=`echo $CC | sed -e "s,$GCC_TEST_OPTIONS,,"`
 fi

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2013-10-23 07:20:57 +0000
+++ b/lib-src/ChangeLog 2013-10-24 02:15:16 +0000
@@ -1,3 +1,7 @@
+2013-10-24  Glenn Morris  <address@hidden>
+
+       * Makefile.in (abs_top_srcdir): New, set by configure.
+
 2013-10-23  Glenn Morris  <address@hidden>
 
        * Makefile.in ($(DESTDIR)${archlibdir}, need-blessmail, install)

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2013-10-23 07:20:57 +0000
+++ b/lib-src/Makefile.in       2013-10-24 02:15:16 +0000
@@ -84,6 +84,7 @@
 
 # The top-level source directory, also set by configure.
 address@hidden@
address@hidden@ # MinGW CPPFLAGS may use this
 
 # ==================== Emacs-specific directories ====================
 

=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog   2013-09-04 06:45:44 +0000
+++ b/lwlib/ChangeLog   2013-10-24 02:15:16 +0000
@@ -1,3 +1,7 @@
+2013-10-24  Glenn Morris  <address@hidden>
+
+       * Makefile.in (abs_top_srcdir): New, set by configure.
+
 2013-09-04  Paul Eggert  <address@hidden>
 
        Makefile improvements.

=== modified file 'lwlib/Makefile.in'
--- a/lwlib/Makefile.in 2013-09-04 06:45:44 +0000
+++ b/lwlib/Makefile.in 2013-10-24 02:15:16 +0000
@@ -23,6 +23,7 @@
 # and set up to be configured by ../configure.
 
 address@hidden@
address@hidden@ # MinGW CPPFLAGS may use this
 address@hidden@
 @SET_MAKE@
 address@hidden@

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2013-10-23 07:20:57 +0000
+++ b/nt/ChangeLog      2013-10-24 02:15:16 +0000
@@ -1,3 +1,7 @@
+2013-10-24  Glenn Morris  <address@hidden>
+
+       * Makefile.in (abs_top_srcdir): New, set by configure.
+
 2013-10-23  Glenn Morris  <address@hidden>
 
        * Makefile.in ($(DESTDIR)${archlibdir}, install, uninstall):

=== modified file 'nt/Makefile.in'
--- a/nt/Makefile.in    2013-10-23 07:20:57 +0000
+++ b/nt/Makefile.in    2013-10-24 02:15:16 +0000
@@ -76,6 +76,7 @@
 
 # The top-level source directory, also set by configure.
 address@hidden@
address@hidden@ # MinGW CPPFLAGS may use this
 
 # ==================== Emacs-specific directories ====================
 

=== modified file 'oldXMenu/ChangeLog'
--- a/oldXMenu/ChangeLog        2013-09-04 06:45:44 +0000
+++ b/oldXMenu/ChangeLog        2013-10-24 02:15:16 +0000
@@ -1,3 +1,7 @@
+2013-10-24  Glenn Morris  <address@hidden>
+
+       * Makefile.in (abs_top_srcdir): New, set by configure.
+
 2013-09-04  Paul Eggert  <address@hidden>
 
        Makefile improvements.

=== modified file 'oldXMenu/Makefile.in'
--- a/oldXMenu/Makefile.in      2013-09-04 06:45:44 +0000
+++ b/oldXMenu/Makefile.in      2013-10-24 02:15:16 +0000
@@ -43,6 +43,7 @@
 ### Code:
 
 address@hidden@
address@hidden@ # MinGW CPPFLAGS may use this
 address@hidden@
 address@hidden@
 address@hidden@

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-23 16:11:30 +0000
+++ b/src/ChangeLog     2013-10-24 02:15:16 +0000
@@ -1,3 +1,7 @@
+2013-10-24  Glenn Morris  <address@hidden>
+
+       * Makefile.in (abs_top_srcdir): New, set by configure.
+
 2013-10-23  Dmitry Antipov  <address@hidden>
 
        Adjust recent font-related changes to fix bug#15686.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2013-10-23 06:22:54 +0000
+++ b/src/Makefile.in   2013-10-24 02:15:16 +0000
@@ -28,6 +28,7 @@
 # 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@
address@hidden@ # MinGW CPPFLAGS may use this
 ntsource = $(srcdir)/../nt
 abs_builddir = @abs_builddir@
 VPATH = $(srcdir)