From: Glenn Morris Date: Sat, 22 Nov 2014 21:32:34 +0000 (-0800) Subject: Add some .ico dependencies to Makefile .res rules X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3423^2~415 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cc252fc141482e64f8824967449f1076a6feb540;p=emacs.git Add some .ico dependencies to Makefile .res rules * lib-src/Makefile.in (emacsclient.res): Add dependency on icons/emacs.ico. * nt/Makefile.in (emacs.res): Add dependency on icons/hand.cur. --- diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 0093abe5c0c..a8281a579f1 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2014-11-22 Glenn Morris + + * Makefile.in (emacsclient.res): Add dependency on icons/emacs.ico. + 2014-10-20 Glenn Morris * Merge in all changes up to 24.4 release. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index fe101047dea..eb16c3305ae 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 +emacsclient.res: $(NTINC)/../emacsclient.rc ${srcdir}/icons/emacs.ico $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $< ## Makefile ends here. diff --git a/nt/ChangeLog b/nt/ChangeLog index 457d97c5257..49ef65afe6e 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2014-11-22 Glenn Morris + + * Makefile.in (emacs.res): Add dependency on icons/hand.cur. + 2014-11-18 Glenn Morris * Makefile.in (addpm${EXEEXT}, ddeclient${EXEEXT}) diff --git a/nt/Makefile.in b/nt/Makefile.in index 63bef288ae3..c456d55e4f8 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -225,5 +225,6 @@ 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 ${srcdir}/$(EMACS_MANIFEST) +emacs.res: ${srcdir}/emacs.rc ${srcdir}/icons/emacs.ico \ + ${srcdir}/icons/hand.cur ${srcdir}/$(EMACS_MANIFEST) ${WINDRES} -I ${srcdir} -O coff -o $@ $<