From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 29 May 2013 16:48:42 +0000 (+0300)
Subject: Remove *.res files in mostlyclean, to avoid problems with out-of-tree builds.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~141
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38b787fa727fd98c3d61b9677a30e17d291d490c;p=emacs.git

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.
---

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e565983e147..e1025fc5f6b 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* Makefile.in (mostlyclean): Remove *.res files.
+
 2013-05-18  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Port --enable-gcc-warnings to clang.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index e0acea867b7..f32333fe765 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -278,7 +278,7 @@ uninstall:
 	fi
 
 mostlyclean:
-	-rm -f core *.o
+	-rm -f core *.o *.res
 
 clean: mostlyclean
 	-rm -f ${EXE_FILES}
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 696d320c8bc..781dfbb7c3f 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* Makefile.in (emacs.res): Include srcdir when preprocessing
+	resources, for out-of-tree builds.
+	(mostlyclean): Remove *.res files.
+
 2013-05-17  Eli Zaretskii  <eliz@gnu.org>
 
 	* 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:
 	fi
 
 mostlyclean:
-	-rm -f core *.o
+	-rm -f core *.o *.res
 
 clean: mostlyclean
 	-rm -f ${EXE_FILES}
@@ -209,4 +209,4 @@ runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES)
          -o runemacs${EXEEXT}
 
 emacs.res: ${srcdir}/emacs.rc ${srcdir}/icons/emacs.ico ${srcdir}/$(EMACS_MANIFEST)
-	${WINDRES} -O coff -o emacs.res ${srcdir}/emacs.rc
+	${WINDRES} -I ${srcdir} -O coff -o emacs.res ${srcdir}/emacs.rc
diff --git a/src/ChangeLog b/src/ChangeLog
index 4b1281c17e6..56e13da832a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* Makefile.in (mostlyclean): Remove *.res files.
+
 2013-05-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* 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:
 	rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT)
 	rm -f buildobj.h
 	rm -f globals.h gl-stamp
+	rm -f *.res
 clean: mostlyclean
 	rm -f emacs-*.*.*$(EXEEXT) emacs$(EXEEXT)
 	-rm -rf $(DEPDIR)