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.
This commit is contained in:
Eli Zaretskii 2013-05-29 19:48:42 +03:00
parent 8e399682a1
commit 38b787fa72
6 changed files with 18 additions and 3 deletions

View file

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

View file

@ -278,7 +278,7 @@ uninstall:
fi
mostlyclean:
-rm -f core *.o
-rm -f core *.o *.res
clean: mostlyclean
-rm -f ${EXE_FILES}

View file

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

View file

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

View file

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

View file

@ -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)