From 38b787fa727fd98c3d61b9677a30e17d291d490c Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 29 May 2013 19:48:42 +0300 Subject: [PATCH] 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. --- lib-src/ChangeLog | 4 ++++ lib-src/Makefile.in | 2 +- nt/ChangeLog | 6 ++++++ nt/Makefile.in | 4 ++-- src/ChangeLog | 4 ++++ src/Makefile.in | 1 + 6 files changed, 18 insertions(+), 3 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index e565983e14..e1025fc5f6 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2013-05-29 Eli Zaretskii + + * Makefile.in (mostlyclean): Remove *.res files. + 2013-05-18 Paul Eggert Port --enable-gcc-warnings to clang. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index e0acea867b..f32333fe76 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 696d320c8b..781dfbb7c3 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,9 @@ +2013-05-29 Eli Zaretskii + + * Makefile.in (emacs.res): Include srcdir when preprocessing + resources, for out-of-tree builds. + (mostlyclean): Remove *.res files. + 2013-05-17 Eli Zaretskii * runemacs.c (WinMain): Support invocation of un-installed diff --git a/nt/Makefile.in b/nt/Makefile.in index 3d5e1ca084..7f68a1b83a 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 4b1281c17e..56e13da832 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-05-29 Eli Zaretskii + + * Makefile.in (mostlyclean): Remove *.res files. + 2013-05-29 Stefan Monnier * fileio.c (Finsert_file_contents): Preserve undo info when reverting diff --git a/src/Makefile.in b/src/Makefile.in index c7a18363a5..2fa7fb3734 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) -- 2.20.1