aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-05-29 19:48:42 +0300
committerEli Zaretskii2013-05-29 19:48:42 +0300
commit38b787fa727fd98c3d61b9677a30e17d291d490c (patch)
tree2dd1206cdab3dd27718dd7a2ea7168e1bc0cd98b /src
parent8e399682a1f6298e1315cf799f30335abac78e4a (diff)
downloademacs-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 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in1
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4b1281c17e6..56e13da832a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-05-29 Eli Zaretskii <eliz@gnu.org>
2
3 * Makefile.in (mostlyclean): Remove *.res files.
4
12013-05-29 Stefan Monnier <monnier@iro.umontreal.ca> 52013-05-29 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * fileio.c (Finsert_file_contents): Preserve undo info when reverting 7 * fileio.c (Finsert_file_contents): Preserve undo info when reverting
diff --git a/src/Makefile.in b/src/Makefile.in
index c7a18363a5a..2fa7fb37348 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -547,6 +547,7 @@ mostlyclean:
547 rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT) 547 rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT)
548 rm -f buildobj.h 548 rm -f buildobj.h
549 rm -f globals.h gl-stamp 549 rm -f globals.h gl-stamp
550 rm -f *.res
550clean: mostlyclean 551clean: mostlyclean
551 rm -f emacs-*.*.*$(EXEEXT) emacs$(EXEEXT) 552 rm -f emacs-*.*.*$(EXEEXT) emacs$(EXEEXT)
552 -rm -rf $(DEPDIR) 553 -rm -rf $(DEPDIR)