Re: [Emacs-diffs] /srv/bzr/emacs/trunk r109306: Use an include file in configure.ac's AH_BOTTOM

[Paul Eggert]

On 07/31/2012 12:35 PM, Glenn Morris wrote:
> I'd be fine with the absolute minimum change:
> 
> mv s/msdos.h conf_msdos.h

It'd be better to move it to the msdos/ directory,
since it's MS-DOS specific.  Similarly for the other
include file.  This will help localize the system-specific
information.

Something like this:

=== modified file 'admin/MAINTAINERS'
--- admin/MAINTAINERS   2012-05-22 16:20:27 +0000
+++ admin/MAINTAINERS   2012-07-31 20:31:34 +0000
@@ -34,7 +34,6 @@
            src/msdos.[ch]
            src/dosfns.[ch]
            src/w16select.c
-           src/s/msdos.h
            lisp/term/internal.el
            lisp/term/pc-win.el
            lisp/dos-fns.el

=== modified file 'lib-src/make-docfile.c'
--- lib-src/make-docfile.c      2012-07-10 21:48:34 +0000
+++ lib-src/make-docfile.c      2012-07-31 20:31:34 +0000
@@ -80,7 +80,7 @@
 static void write_globals (void);
 
 #ifdef MSDOS
-/* s/msdos.h defines this as sys_chdir, but we're not linking with the
+/* msdos/msdos.h defines this as sys_chdir, but we're not linking with the
    file where that function is defined.  */
 #undef chdir
 #endif

=== modified file 'lib-src/makefile.w32-in'
--- lib-src/makefile.w32-in     2012-07-29 15:53:31 +0000
+++ lib-src/makefile.w32-in     2012-07-31 20:31:34 +0000
@@ -360,7 +360,7 @@
 NT_INC         = $(EMACS_ROOT)/nt/inc
 GNU_LIB                = $(EMACS_ROOT)/lib
 
-MS_W32_H       = $(SRC)/s/ms-w32.h \
+MS_W32_H       = $(SRC)/../nt/ms-w32.h \
                 $(NT_INC)/sys/stat.h
 CONFIG_H       = $(SRC)/config.h \
                 $(MS_W32_H)

=== modified file 'lib/makefile.w32-in'
--- lib/makefile.w32-in 2012-07-29 08:18:29 +0000
+++ lib/makefile.w32-in 2012-07-31 20:31:34 +0000
@@ -71,7 +71,7 @@
 
 C_CTYPE_H      = $(GNU_LIB)/c-ctype.h \
                 $(NT_INC)/stdbool.h
-MS_W32_H       = $(SRC)/s/ms-w32.h \
+MS_W32_H       = $(SRC)/../nt/ms-w32.h \
                 $(NT_INC)/sys/stat.h
 CONFIG_H       = $(SRC)/config.h \
                 $(MS_W32_H)

=== modified file 'lisp/emacs-lisp/authors.el'
--- lisp/emacs-lisp/authors.el  2012-07-10 01:11:08 +0000
+++ lisp/emacs-lisp/authors.el  2012-07-31 20:31:34 +0000
@@ -578,6 +578,7 @@
     ("w32console.c" . "w32term.c")
     ("unexnt.c" . "unexw32.c")
     ("s/windowsnt.h" . "s/ms-w32.h")
+    ("s/ms-w32.h" . "nt/ms-w32.h")
     ("winnt.el" . "w32-fns.el")
     ("config.emacs" . "configure")
     ("configure.in" . "configure.ac")

=== modified file 'msdos/ChangeLog'
--- msdos/ChangeLog     2012-07-28 23:05:32 +0000
+++ msdos/ChangeLog     2012-07-31 20:31:34 +0000
@@ -1,3 +1,7 @@
+2012-07-31  Paul Eggert  <address@hidden>
+
+       * msdos.h: Rename from ../src/s/msdos.h.  All uses changed.
+
 2012-07-28  Paul Eggert  <address@hidden>
 
        Use Gnulib stdalign module (Bug#9772, Bug#9960).

=== modified file 'msdos/mainmake.v2'
--- msdos/mainmake.v2   2012-06-30 15:32:51 +0000
+++ msdos/mainmake.v2   2012-07-31 20:31:34 +0000
@@ -162,7 +162,7 @@
        ../bin/etags --include=../lisp/TAGS \
         --regex='/[    ]*DEFVAR_[A-Z_  (]+"\([^"]+\)"/' \
         $(CURDIR)/src/*.c $(CURDIR)/src/*.h \
-         $(CURDIR)/src/s/msdos.h
+         $(CURDIR)/src/../msdos/msdos.h
        cd ..
        ./bin/etags --include=src/TAGS
 

=== renamed file 'src/s/msdos.h' => 'msdos/msdos.h'
=== modified file 'msdos/sed1v2.inp'
--- msdos/sed1v2.inp    2012-07-14 10:03:30 +0000
+++ msdos/sed1v2.inp    2012-07-31 20:31:34 +0000
@@ -129,7 +129,7 @@
 /^MKDEPDIR *=/s/@MKDEPDIR@//
 /^version *=/s/@address@hidden@//
 /^M_FILE *=/address@hidden@!$(srcdir)/m/intel386.h!
-/^S_FILE *=/address@hidden@!$(srcdir)/s/msdos.h!
+/^S_FILE *=/address@hidden@!$(srcdir)/../msdos/msdos.h!
 /address@hidden@$/s/@SET_MAKE@//
 /^     [       
]*\$(libsrc)\/make-docfile.*>.*\/DOC/s!make-docfile!make-docfile -o $(etc)/DOC!
 /^     [       
]*\$(libsrc)\/make-docfile.*>.*gl-tmp/s!make-docfile!make-docfile -o gl-tmp!

=== modified file 'msdos/sed2v2.inp'
--- msdos/sed2v2.inp    2012-07-28 23:05:32 +0000
+++ msdos/sed2v2.inp    2012-07-31 20:31:34 +0000
@@ -90,7 +90,7 @@
 s/^#undef STACK_DIRECTION *$/#define STACK_DIRECTION -1/
 s/^#undef EMACS_CONFIGURATION *$/#define EMACS_CONFIGURATION 
"i386-pc-msdosdjgpp"/
 s/^#undef EMACS_CONFIG_OPTIONS *$/#define EMACS_CONFIG_OPTIONS "msdos"/
-s!^#undef config_opsysfile *$!#define config_opsysfile "s/msdos.h"!
+s!^#undef config_opsysfile *$!#define config_opsysfile "../msdos/msdos.h"!
 s!^#undef config_machfile *$!#define config_machfile "m/intel386.h"!
 s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/
 s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/

=== modified file 'nt/ChangeLog'
--- nt/ChangeLog        2012-07-29 16:56:18 +0000
+++ nt/ChangeLog        2012-07-31 20:31:34 +0000
@@ -1,3 +1,7 @@
+2012-07-31  Paul Eggert  <address@hidden>
+
+       * ms-w32.h: Rename from ../src/s/ms-w32.h.  All uses changed.
+
 2012-07-29  Juanma Barranquero  <address@hidden>
 
        * config.nt: Sync with autogen/config.in.

=== modified file 'nt/config.nt'
--- nt/config.nt        2012-07-29 16:56:18 +0000
+++ nt/config.nt        2012-07-31 20:31:34 +0000
@@ -22,7 +22,7 @@
    This file is intentionally kept in sync with autogen/config.in to
    ease maintenance.  Please do not remove non-Windows related stuff
    unless strictly necessary.  Also, before adding anything here
-   consider whether src/s/ms-w32.h would be a better place; this is
+   consider whether nt/ms-w32.h would be a better place; this is
    particularly true for gcc vs. MSVC conditional defines, MinGW or
    MSVC specific code, and macros not already defined in config.in.  */
 
@@ -1484,7 +1484,7 @@
 #undef __restrict_arr
 
 /* Define to the used os dependent file. */
-#define config_opsysfile "s/ms-w32.h"
+#define config_opsysfile "../nt/ms-w32.h"
 
 /* A replacement for va_copy, if needed.  */
 #define gl_va_copy(a,b) ((a) = (b))

=== renamed file 'src/s/ms-w32.h' => 'nt/ms-w32.h'
=== modified file 'src/makefile.w32-in'
--- src/makefile.w32-in 2012-07-30 21:20:43 +0000
+++ src/makefile.w32-in 2012-07-31 20:31:34 +0000
@@ -339,7 +339,7 @@
 ##
 ## This works only with GNU Make.
 
-TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/s/ms-w32.h
+TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/../nt/ms-w32.h
        $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE)
 
 TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2)
@@ -353,7 +353,7 @@
          $(OBJ1_c)
        ../lib-src/$(BLD)/etags.exe -a address@hidden/nt/emacs-src.tags \
          $(OBJ2_c) \
-         $(CURDIR)/*.h $(CURDIR)/s/ms-w32.h
+         $(CURDIR)/*.h $(CURDIR)/../nt/ms-w32.h
 
 TAGS-nmake:
        echo This target is not supported with NMake
@@ -403,7 +403,7 @@
                 $(GNU_LIB)/verify.h
 CODING_H       = $(SRC)/coding.h \
                 $(SRC)/composite.h
-MS_W32_H       = $(SRC)/s/ms-w32.h \
+MS_W32_H       = $(SRC)/../nt/ms-w32.h \
                 $(NT_INC)/sys/stat.h
 CONFIG_H       = $(SRC)/config.h \
                 $(SRC)/conf_post.h \