From 84e2f13cd50a7ef6af736559107f0a8e6bcec6c5 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 22 Nov 2014 14:04:32 -0800 Subject: 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. --- lib-src/ChangeLog | 3 +++ lib-src/Makefile.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index a8281a579f1..4fc3b4dbe57 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,8 @@ 2014-11-22 Glenn Morris + * Makefile.in (emacsclient.res): Update deps for nt/emacsclient.rc + now being in the build directory, not the source directory. + * Makefile.in (emacsclient.res): Add dependency on icons/emacs.ico. 2014-10-20 Glenn Morris diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index eb16c3305ae..432314f02dd 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -388,7 +388,7 @@ update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h) -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ $< $(LOADLIBES) $(NTLIB) -o $@ -emacsclient.res: $(NTINC)/../emacsclient.rc ${srcdir}/icons/emacs.ico +emacsclient.res: ../nt/emacsclient.rc ${srcdir}/icons/emacs.ico $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $< ## Makefile ends here. -- cgit v1.2.1