diff options
| author | Glenn Morris | 2014-11-22 13:40:25 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-11-22 13:40:25 -0800 |
| commit | d00c866167d95612ddc0debdeeb18601b063bcdc (patch) | |
| tree | d28604c72e401b110cb0f903d0a9fae2c0371f8e | |
| parent | cc252fc141482e64f8824967449f1076a6feb540 (diff) | |
| download | emacs-d00c866167d95612ddc0debdeeb18601b063bcdc.tar.gz emacs-d00c866167d95612ddc0debdeeb18601b063bcdc.zip | |
* src/Makefile.in (emacs.res): Add dependency on icons/hand.cur. Use $<.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0f1d0478447..a474398ba78 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-11-22 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (emacs.res): Add dependency on icons/hand.cur. Use $<. | ||
| 4 | |||
| 1 | 2014-11-22 Martin Rudalics <rudalics@gmx.at> | 5 | 2014-11-22 Martin Rudalics <rudalics@gmx.at> |
| 2 | 6 | ||
| 3 | Don't shrink frame when using desktop-save-mode (Bug#19048). | 7 | Don't shrink frame when using desktop-save-mode (Bug#19048). |
diff --git a/src/Makefile.in b/src/Makefile.in index 270119ee264..7defb4d1a75 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -548,11 +548,12 @@ $(top_srcdir)/aclocal.m4 $(top_srcdir)/configure config.in ../config.status \ | |||
| 548 | 548 | ||
| 549 | doc.o: buildobj.h | 549 | doc.o: buildobj.h |
| 550 | 550 | ||
| 551 | ## This rule (and file) is duplicated in nt/: why? | ||
| 551 | emacs.res: $(ntsource)/emacs.rc \ | 552 | emacs.res: $(ntsource)/emacs.rc \ |
| 552 | $(ntsource)/icons/emacs.ico \ | 553 | $(ntsource)/icons/emacs.ico \ |
| 554 | $(ntsource)/icons/hand.cur \ | ||
| 553 | $(ntsource)/$(EMACS_MANIFEST) | 555 | $(ntsource)/$(EMACS_MANIFEST) |
| 554 | $(WINDRES) -O COFF --include-dir=$(top_srcdir)/nt \ | 556 | $(WINDRES) -O COFF --include-dir=$(top_srcdir)/nt -o $@ $< |
| 555 | -o $@ $(ntsource)/emacs.rc | ||
| 556 | 557 | ||
| 557 | .PHONY: ns-app | 558 | .PHONY: ns-app |
| 558 | ns-app: emacs$(EXEEXT) | 559 | ns-app: emacs$(EXEEXT) |