diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-11-22 14:04:32 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-11-22 14:07:48 -0800 |
| commit | 84e2f13cd50a7ef6af736559107f0a8e6bcec6c5 (patch) | |
| tree | c8b5f5424908cc820cc8e51c1669e889b15f3d7c /nt/Makefile.in | |
| parent | 239cd5b62759b23020cb308d993b7e26933943d7 (diff) | |
| download | emacs-84e2f13cd50a7ef6af736559107f0a8e6bcec6c5.tar.gz | |
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.
Diffstat (limited to 'nt/Makefile.in')
| -rw-r--r-- | nt/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
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 $@ $< |