emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master 01/01: * src/Makefile.in (emacs.res): Add dependenc


From: Glenn Morris
Subject: [Emacs-diffs] master 01/01: * src/Makefile.in (emacs.res): Add dependency on icons/hand.cur. Use $<.
Date: Sat, 22 Nov 2014 21:40:32 +0000

branch: master
commit d00c866167d95612ddc0debdeeb18601b063bcdc
Author: Glenn Morris <address@hidden>
Date:   Sat Nov 22 13:40:25 2014 -0800

    * src/Makefile.in (emacs.res): Add dependency on icons/hand.cur.  Use $<.
---
 src/ChangeLog   |    4 ++++
 src/Makefile.in |    5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 0f1d047..a474398 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-22  Glenn Morris  <address@hidden>
+
+       * Makefile.in (emacs.res): Add dependency on icons/hand.cur.  Use $<.
+
 2014-11-22  Martin Rudalics  <address@hidden>
 
        Don't shrink frame when using desktop-save-mode (Bug#19048).
diff --git a/src/Makefile.in b/src/Makefile.in
index 270119e..7defb4d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -548,11 +548,12 @@ $(top_srcdir)/aclocal.m4 $(top_srcdir)/configure 
config.in ../config.status \
 
 doc.o: buildobj.h
 
+## This rule (and file) is duplicated in nt/: why?
 emacs.res: $(ntsource)/emacs.rc \
           $(ntsource)/icons/emacs.ico \
+          $(ntsource)/icons/hand.cur \
           $(ntsource)/$(EMACS_MANIFEST)
-       $(WINDRES) -O COFF --include-dir=$(top_srcdir)/nt \
-         -o $@ $(ntsource)/emacs.rc
+       $(WINDRES) -O COFF --include-dir=$(top_srcdir)/nt -o $@ $<
 
 .PHONY: ns-app
 ns-app: emacs$(EXEEXT)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]