Further reduce number of versioned files storing Emacs version number.

* configure.ac (comma_version, comma_space_version) [mingw32]:
New output variables.
(nt/emacs.rc, nt/emacsclient.rc) [mingw32]: New output files.

* make-dist: Update nt/ for *.rc -> *.rc.in changes.

* nt/emacs.rc.in, nt/emacsclient.rc.in: Rename from nt/emacs.rc, emacsclient.rc.
Let configure generate the real files, and set the version numbers.

* lib-src/Makefile.in (emacsclient.res): Update deps for nt/emacsclient.rc
now being in the build directory, not the source directory.

* nt/Makefile.in (distclean): Delete *.rc.
(emacs.res): Update deps for nt/emacsclient.rc now being in the
build directory, not the source directory.

* admin/admin.el (set-version): No more need to update nt/*.rc.

* admin/authors.el (authors-renamed-files-alist): Add .rc.in files.

4 files changed, 93 insertions, 3 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 49ef65afe6e..168f1dd9ed3 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,5 +1,11 @@
 2014-11-22  Glenn Morris  <rgm@gnu.org>
 
+	* emacs.rc.in, emacsclient.rc.in: Rename from emacs.rc, emacsclient.rc.
+	Let configure generate the real files, and set the version numbers.
+	* Makefile.in (distclean): Delete *.rc.
+	(emacs.res): Update deps for nt/emacsclient.rc now being in the
+	build directory, not the source directory.
+
 	* Makefile.in (emacs.res): Add dependency on icons/hand.cur.
 
 2014-11-18  Glenn Morris  <rgm@gnu.org>
diff --git a/nt/Makefile.in b/nt/Makefile.in
index c456d55e4f8..c6b2f0bea0e 100644
--- a/nt/Makefile.in
+++ b/nt/Makefile.in
@@ -195,8 +195,7 @@ clean: mostlyclean
 	-rm -f ${EXE_FILES}
 
 distclean: clean
-	-rm -f TAGS
-	-rm -f Makefile
+	-rm -f TAGS Makefile *.rc
 
 bootstrap-clean maintainer-clean: distclean
 	true
@@ -225,6 +224,7 @@ cmdproxy${EXEEXT}: ${srcdir}/cmdproxy.c
 runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES)
 	$(CC) ${ALL_CFLAGS} $^ -mwindows -o $@
 
-emacs.res: ${srcdir}/emacs.rc ${srcdir}/icons/emacs.ico \
+## This rule (and file) is duplicated in src/: why?
+emacs.res: emacs.rc ${srcdir}/icons/emacs.ico \
   ${srcdir}/icons/hand.cur ${srcdir}/$(EMACS_MANIFEST)
 	${WINDRES} -I ${srcdir} -O coff -o $@ $<
diff --git a/nt/emacs.rc.in b/nt/emacs.rc.in
new file mode 100644
index 00000000000..d2d17b8eb1b
--- /dev/null
+++ b/nt/emacs.rc.in
@@ -0,0 +1,45 @@
+Emacs ICON   icons/emacs.ico
+32649 CURSOR icons/hand.cur
+#if defined (WIN64) || defined (__x86_64__)
+1 24 "emacs-x64.manifest"
+#else
+1 24 "emacs-x86.manifest"
+#endif
+
+#ifndef VS_VERSION_INFO
+#define VS_VERSION_INFO 1
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @comma_version@
+ PRODUCTVERSION @comma_version@
+ FILEFLAGSMASK 0x3FL
+#ifdef EMACSDEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+	BLOCK "040904B0"
+	BEGIN
+	    VALUE "CompanyName", "Free Software Foundation\0"
+	    VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0"
+	    VALUE "FileVersion", "@comma_space_version@\0"
+	    VALUE "InternalName", "Emacs\0"
+	    VALUE "LegalCopyright", "Copyright (C) 2001-2014\0"
+	    VALUE "OriginalFilename", "emacs.exe"
+	    VALUE "ProductName", "Emacs\0"
+	    VALUE "ProductVersion", "@comma_space_version@\0"
+	    VALUE "OLESelfRegister", "\0"
+	 END
+     END
+     BLOCK "VarFileInfo"
+     BEGIN
+         VALUE "Translation", 0x409, 1200
+     END
+END
diff --git a/nt/emacsclient.rc.in b/nt/emacsclient.rc.in
new file mode 100644
index 00000000000..5c3b65d752f
--- /dev/null
+++ b/nt/emacsclient.rc.in
@@ -0,0 +1,39 @@
+Emacs ICON   icons\emacs.ico
+
+#ifndef VS_VERSION_INFO
+#define VS_VERSION_INFO 1
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION @comma_version@
+ PRODUCTVERSION @comma_version@
+ FILEFLAGSMASK 0x3FL
+#ifdef EMACSDEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+	BLOCK "040904B0"
+	BEGIN
+	    VALUE "CompanyName", "Free Software Foundation\0"
+	    VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
+	    VALUE "FileVersion", "@comma_space_version@\0"
+	    VALUE "InternalName", "EmacsClient\0"
+	    VALUE "LegalCopyright", "Copyright (C) 2001-2014\0"
+	    VALUE "OriginalFilename", "emacsclientw.exe"
+	    VALUE "ProductName", "EmacsClient\0"
+	    VALUE "ProductVersion", "@comma_space_version@\0"
+	    VALUE "OLESelfRegister", "\0"
+	 END
+     END
+     BLOCK "VarFileInfo"
+     BEGIN
+         VALUE "Translation", 0x409, 1200
+     END
+END