[Emacs-diffs] /srv/bzr/emacs/trunk r112772: Remove *.res files in mostlyclean, to avoid problems with out-of-tree builds.

[Eli Zaretskii]

------------------------------------------------------------
revno: 112772
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2013-05-29 19:48:42 +0300
message:
  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.
modified:
  lib-src/ChangeLog
  lib-src/Makefile.in
  nt/ChangeLog
  nt/Makefile.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2013-05-18 05:32:17 +0000
+++ b/lib-src/ChangeLog 2013-05-29 16:48:42 +0000
@@ -1,3 +1,7 @@
+2013-05-29  Eli Zaretskii  <address@hidden>
+
+       * Makefile.in (mostlyclean): Remove *.res files.
+
 2013-05-18  Paul Eggert  <address@hidden>
 
        Port --enable-gcc-warnings to clang.

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2013-04-14 16:36:49 +0000
+++ b/lib-src/Makefile.in       2013-05-29 16:48:42 +0000
@@ -278,7 +278,7 @@
        fi
 
 mostlyclean:
-       -rm -f core *.o
+       -rm -f core *.o *.res
 
 clean: mostlyclean
        -rm -f ${EXE_FILES}

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2013-05-17 09:35:23 +0000
+++ b/nt/ChangeLog      2013-05-29 16:48:42 +0000
@@ -1,3 +1,9 @@
+2013-05-29  Eli Zaretskii  <address@hidden>
+
+       * Makefile.in (emacs.res): Include srcdir when preprocessing
+       resources, for out-of-tree builds.
+       (mostlyclean): Remove *.res files.
+
 2013-05-17  Eli Zaretskii  <address@hidden>
 
        * runemacs.c (WinMain): Support invocation of un-installed

=== modified file 'nt/Makefile.in'
--- a/nt/Makefile.in    2013-04-21 15:13:24 +0000
+++ b/nt/Makefile.in    2013-05-29 16:48:42 +0000
@@ -168,7 +168,7 @@
        fi
 
 mostlyclean:
-       -rm -f core *.o
+       -rm -f core *.o *.res
 
 clean: mostlyclean
        -rm -f ${EXE_FILES}
@@ -209,4 +209,4 @@
          -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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-05-29 01:07:53 +0000
+++ b/src/ChangeLog     2013-05-29 16:48:42 +0000
@@ -1,3 +1,7 @@
+2013-05-29  Eli Zaretskii  <address@hidden>
+
+       * Makefile.in (mostlyclean): Remove *.res files.
+
 2013-05-29  Stefan Monnier  <address@hidden>
 
        * fileio.c (Finsert_file_contents): Preserve undo info when reverting

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2013-05-16 09:58:56 +0000
+++ b/src/Makefile.in   2013-05-29 16:48:42 +0000
@@ -547,6 +547,7 @@
        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)