diff options
| author | Glenn Morris | 2014-11-22 13:32:34 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-11-22 13:32:34 -0800 |
| commit | cc252fc141482e64f8824967449f1076a6feb540 (patch) | |
| tree | 5106198bae8d0c185c541449312bd470d49b3219 /lib-src | |
| parent | 9a8482589210016999a5fc3d9f18be74190756f9 (diff) | |
| download | emacs-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.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 2 |
2 files changed, 5 insertions, 1 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 @@ | |||
| 1 | 2014-11-22 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (emacsclient.res): Add dependency on icons/emacs.ico. | ||
| 4 | |||
| 1 | 2014-10-20 Glenn Morris <rgm@gnu.org> | 5 | 2014-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 | ||
| 391 | emacsclient.res: $(NTINC)/../emacsclient.rc | 391 | emacsclient.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. |