diff options
| author | Eli Zaretskii | 2013-05-29 19:48:42 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-05-29 19:48:42 +0300 |
| commit | 38b787fa727fd98c3d61b9677a30e17d291d490c (patch) | |
| tree | 2dd1206cdab3dd27718dd7a2ea7168e1bc0cd98b /nt | |
| parent | 8e399682a1f6298e1315cf799f30335abac78e4a (diff) | |
| download | emacs-38b787fa727fd98c3d61b9677a30e17d291d490c.tar.gz emacs-38b787fa727fd98c3d61b9677a30e17d291d490c.zip | |
Remove *.res files in mostlyclean, to avoid problems with out-of-tree builds.
src/Makefile.in (mostlyclean): Remove *.res files.
lib-src/Makefile.in (mostlyclean): Remove *.res files.
nt/Makefile.in (emacs.res): Include srcdir when preprocessing
resources, for out-of-tree builds.
(mostlyclean): Remove *.res files.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 6 | ||||
| -rw-r--r-- | nt/Makefile.in | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 696d320c8bc..781dfbb7c3f 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-05-29 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (emacs.res): Include srcdir when preprocessing | ||
| 4 | resources, for out-of-tree builds. | ||
| 5 | (mostlyclean): Remove *.res files. | ||
| 6 | |||
| 1 | 2013-05-17 Eli Zaretskii <eliz@gnu.org> | 7 | 2013-05-17 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * runemacs.c (WinMain): Support invocation of un-installed | 9 | * runemacs.c (WinMain): Support invocation of un-installed |
diff --git a/nt/Makefile.in b/nt/Makefile.in index 3d5e1ca084c..7f68a1b83ad 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in | |||
| @@ -168,7 +168,7 @@ uninstall: | |||
| 168 | fi | 168 | fi |
| 169 | 169 | ||
| 170 | mostlyclean: | 170 | mostlyclean: |
| 171 | -rm -f core *.o | 171 | -rm -f core *.o *.res |
| 172 | 172 | ||
| 173 | clean: mostlyclean | 173 | clean: mostlyclean |
| 174 | -rm -f ${EXE_FILES} | 174 | -rm -f ${EXE_FILES} |
| @@ -209,4 +209,4 @@ runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES) | |||
| 209 | -o runemacs${EXEEXT} | 209 | -o runemacs${EXEEXT} |
| 210 | 210 | ||
| 211 | emacs.res: ${srcdir}/emacs.rc ${srcdir}/icons/emacs.ico ${srcdir}/$(EMACS_MANIFEST) | 211 | emacs.res: ${srcdir}/emacs.rc ${srcdir}/icons/emacs.ico ${srcdir}/$(EMACS_MANIFEST) |
| 212 | ${WINDRES} -O coff -o emacs.res ${srcdir}/emacs.rc | 212 | ${WINDRES} -I ${srcdir} -O coff -o emacs.res ${srcdir}/emacs.rc |