upstream

3 files changed, 18 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4f4d2b50a00..2d2bb06cd6f 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,14 @@
+2012-07-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Update .PHONY listings in makefiles.
+        * Makefile.in (.PHONY): Add all, need-blessmail, maybe-blessmail,
+        install, uninstall, mostlyclean, clean, distclean,
+        maintainer-clean, extraclean, check, tags.
+
+2012-07-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in ($(BLD)/profile.$(O)): Depend on stamp_BLD.
+
 2012-07-12  Paul Eggert  <eggert@cs.ucla.edu>
 
         * movemail.c: Add missing 'defined'.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index fe727c65730..a578966b0f0 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -180,6 +180,8 @@ CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 
 all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
 
+.PHONY: all need-blessmail maybe-blessmail
+
 LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM)
 $(EXE_FILES): ../lib/libgnu.a
 
@@ -231,6 +233,9 @@ $(DESTDIR)${archlibdir}: all
           done ; \
         fi
 
+.PHONY: install uninstall mostlyclean clean distclean maintainer-clean
+.PHONY: extraclean check tags
+
 install: $(DESTDIR)${archlibdir}
         @echo
         @echo "Installing utilities for users to run."
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 4b2b523ea34..65e2f7cae25 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,4 +1,4 @@
-#  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
+#  -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
 # Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -467,4 +467,4 @@ $(BLD)/test-distrib.$(O) $(MOVEMAILOBJS): stamp_BLD
 
 $(BLD)/emacsclient.$(O) $(BLD)/etags.$(O) $(BLD)/regex.$(O): stamp_BLD
 
-$(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O): stamp_BLD
+$(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O) $(BLD)/profile.$(O): stamp_BLD