aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-11-22 13:32:34 -0800
committerGlenn Morris2014-11-22 13:32:34 -0800
commitcc252fc141482e64f8824967449f1076a6feb540 (patch)
tree5106198bae8d0c185c541449312bd470d49b3219
parent9a8482589210016999a5fc3d9f18be74190756f9 (diff)
downloademacs-cc252fc141482e64f8824967449f1076a6feb540.tar.gz
emacs-cc252fc141482e64f8824967449f1076a6feb540.zip
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.
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/Makefile.in2
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/Makefile.in3
4 files changed, 11 insertions, 2 deletions
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 @@
12014-11-22 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (emacsclient.res): Add dependency on icons/emacs.ico.
4
12014-10-20 Glenn Morris <rgm@gnu.org> 52014-10-20 Glenn Morris <rgm@gnu.org>
2 6
3 * Merge in all changes up to 24.4 release. 7 * 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)
388 -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ 388 -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
389 $< $(LOADLIBES) $(NTLIB) -o $@ 389 $< $(LOADLIBES) $(NTLIB) -o $@
390 390
391emacsclient.res: $(NTINC)/../emacsclient.rc 391emacsclient.res: $(NTINC)/../emacsclient.rc ${srcdir}/icons/emacs.ico
392 $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $< 392 $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $<
393 393
394## Makefile ends here. 394## 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 @@
12014-11-22 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (emacs.res): Add dependency on icons/hand.cur.
4
12014-11-18 Glenn Morris <rgm@gnu.org> 52014-11-18 Glenn Morris <rgm@gnu.org>
2 6
3 * Makefile.in (addpm${EXEEXT}, ddeclient${EXEEXT}) 7 * 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
225runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES) 225runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES)
226 $(CC) ${ALL_CFLAGS} $^ -mwindows -o $@ 226 $(CC) ${ALL_CFLAGS} $^ -mwindows -o $@
227 227
228emacs.res: ${srcdir}/emacs.rc ${srcdir}/icons/emacs.ico ${srcdir}/$(EMACS_MANIFEST) 228emacs.res: ${srcdir}/emacs.rc ${srcdir}/icons/emacs.ico \
229 ${srcdir}/icons/hand.cur ${srcdir}/$(EMACS_MANIFEST)
229 ${WINDRES} -I ${srcdir} -O coff -o $@ $< 230 ${WINDRES} -I ${srcdir} -O coff -o $@ $<