diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.in | 14 | ||||
| -rw-r--r-- | leim/ChangeLog | 6 | ||||
| -rw-r--r-- | leim/Makefile.in | 4 | ||||
| -rw-r--r-- | lib-src/ChangeLog | 7 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 5 | ||||
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/Makefile.in | 11 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.in | 3 |
10 files changed, 67 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 8ef1837ada7..d3c52b6922d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-07-30 Paul Eggert <eggert@cs.ucla.edu> + + Update .PHONY listings in makefiles. + * Makefile.in (.PHONY): Add all, ${SUBDIR}, blessmail, epath-force, + FRC, install-arch-dep, install-arch-indep, install-doc, + install-info, install-man, install-etc, install-strip, uninstall, + bootstrap-clean, TAGS, tags, info-real, force-info, check-info-dir. + (.RECURSIVE): Remove; hasn't been needed for years. + 2012-07-30 Glenn Morris <rgm@gnu.org> * configure.ac (SIGNAL_H_AHB): New hack macro. diff --git a/Makefile.in b/Makefile.in index b780576ea5e..4b9364ac3f4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -278,6 +278,8 @@ COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic all: ${SUBDIR} +.PHONY: all ${SUBDIR} blessmail epaths-force FRC + removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' # Generate epaths.h from epaths.in. This target is invoked by `configure'. @@ -307,8 +309,6 @@ lib-src src: lib src: lib-src FRC -.RECURSIVE: ${SUBDIR} - # We need to build `emacs' in `src' to compile the *.elc files in `lisp' # and `leim'. lisp leim: src @@ -393,12 +393,13 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) # ==================== Installation ==================== +.PHONY: install install-arch-dep install-arch-indep install-doc install-info +.PHONY: install-man install-etc install-strip uninstall + ## If we let lib-src do its own installation, that means we ## don't have to duplicate the list of utilities to install in ## this Makefile as well. -.PHONY: install - install: all install-arch-indep install-doc install-arch-dep blessmail @true @@ -681,7 +682,7 @@ FRC: # ==================== Cleaning up and miscellanea ==================== -.PHONY: mostlyclean clean distclean maintainer-clean extraclean +.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean extraclean ### `mostlyclean' ### Like `clean', but may refrain from deleting a few files that people @@ -798,6 +799,7 @@ extraclean: # The src subdir knows how to do the right thing # even when the build directory and source dir are different. +.PHONY: TAGS tags TAGS tags: lib lib-src src cd src; $(MAKE) $(MFLAGS) tags @@ -812,7 +814,7 @@ check: dist: cd ${srcdir}; ./make-dist -.PHONY: info dvi dist check html +.PHONY: info dvi dist check html info-real force-info check-info-dir info-real: (cd doc/emacs; $(MAKE) $(MFLAGS) info) diff --git a/leim/ChangeLog b/leim/ChangeLog index fbe656c037c..cafaf5a9eb1 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,9 @@ +2012-07-30 Paul Eggert <eggert@cs.ucla.edu> + + Update .PHONY listings in makefiles. + * Makefile.in (.PHONY): Add all, compile-main, clean, mostlyclean, + bootstrap-clean, distclean, maintainer-clean, extraclean. + 2012-07-29 Paul Eggert <eggert@cs.ucla.edu> deactive->inactive, inactivate->deactivate spelling fixes (Bug#10150) diff --git a/leim/Makefile.in b/leim/Makefile.in index 04f64c0ce0b..f61ab42b9f3 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -82,6 +82,7 @@ TIT_MISC=${CHINESE_TIT} ${MISC} @${RUN_EMACS} -l ${buildlisppath}/international/quail -f batch-byte-compile $< all: leim-list.el compile-main +.PHONY: all TIT_SOURCES= \ ${srcdir}/CXTERM-DIC/4Corner.tit \ @@ -154,6 +155,7 @@ compile-targets: $(TARGETS) # Compile all the Elisp files that need it. Beware: it approximates # `no-byte-compile', so watch out for false-positives! +.PHONY: compile-main compile-main: ${TIT_MISC} @($(setwins); \ els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \ @@ -166,6 +168,8 @@ compile-main: ${TIT_MISC} $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ done +.PHONY: clean mostlyclean bootstrap-clean distclean maintainer-clean extraclean + clean mostlyclean: rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \ leim-list.el changed.tit changed.misc diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 3a5c80db356..2d2bb06cd6f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,10 @@ +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. 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/lisp/ChangeLog b/lisp/ChangeLog index 5b703837257..0af7ff9ad11 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2012-07-30 Paul Eggert <eggert@cs.ucla.edu> + + Update .PHONY listings in makefiles. + * Makefile.in (.PHONY): Add all, doit, custom-deps, finder-data, + autoloads, update-subdirs, updates, bzr-update, update-authors, + compile-onefile, compile-calc, backup-compiled-files, + compile-after-backup, compile-one-process, mh-autoloads, + bootstrap-clean, distclean, maintainer-clean. + 2012-07-29 Jay Belanger <jay.p.belanger@gmail.com> * calc/calc.el (calc-simplify-mode): Make 'alg the default value. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 0cb142a7267..643b698c6e8 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -139,6 +139,8 @@ all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el doit: +.PHONY: all doit custom-deps finder-data autoloads update-subdirs + # custom-deps and finder-data both used to scan _all_ the *.el files. # This could lead to problems in parallel builds if automatically # generated *.el files (eg loaddefs etc) were being changed at the same time. @@ -184,6 +186,8 @@ update-subdirs: doit $(top_srcdir)/build-aux/update-subdirs $$file; \ done; +.PHONY: updates bzr-update update-authors + # Some modes of make-dist use this. updates: update-subdirs autoloads finder-data custom-deps @@ -215,6 +219,7 @@ TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptags # src/Makefile.in to rebuild a particular Lisp file, no questions asked. # Use byte-compile-refresh-preloaded to try and work around some of # the most common problems of not bootstrapping from a clean state. +.PHONY: compile-onefile compile-onefile: @echo Compiling $(THEFILE) @# Use byte-compile-refresh-preloaded to try and work around some of @@ -302,6 +307,8 @@ compile-always: doit cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc $(MAKE) $(MFLAGS) compile EMACS=$(EMACS) +.PHONY: compile-calc backup-compiled-files compile-after-backup + compile-calc: for el in $(lisp)/calc/*.el; do \ echo Compiling $$el; \ @@ -334,6 +341,7 @@ compile-after-backup: backup-compiled-files compile-always # files that use byte-compile-dynamic are updated. # There is no reason to use this rule unless you only have a single # core and CPU time is an issue. +.PHONY: compile-one-process compile-one-process: doit $(LOADDEFS) compile-first $(lisp)/progmodes/cc-mode.elc $(emacs) $(BYTE_COMPILE_FLAGS) \ --eval "(batch-byte-recompile-directory 0)" $(lisp) @@ -356,6 +364,7 @@ MH_E_SRC = $(MH_E_DIR)/mh-acros.el $(MH_E_DIR)/mh-alias.el \ $(MH_E_DIR)/mh-tool-bar.el $(MH_E_DIR)/mh-utils.el \ $(MH_E_DIR)/mh-xface.el +.PHONY: mh-autoloads mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC) $(emacs) -l autoload \ @@ -418,6 +427,8 @@ $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) --eval "(setq make-backup-files nil)" \ -f batch-update-autoloads $(CAL_DIR) +.PHONY: bootstrap-clean distclean maintainer-clean + bootstrap-clean: cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc $(AUTOGENEL) diff --git a/src/ChangeLog b/src/ChangeLog index d36fff428fe..792dc10f88c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2012-07-30 Paul Eggert <eggert@cs.ucla.edu> + Update .PHONY listings in makefiles. + * Makefile.in (.PHONY): Add all, mostlyclean, clean, + bootstrap-clean, distclean, maintainer-clean, versioclean, + extraclean, frc. + * lisp.h (STRING_BYTES_BOUND): Cast entire result to ptrdiff_t. This is a bit clearer. Fix some commentary typos. diff --git a/src/Makefile.in b/src/Makefile.in index da458b4fb8a..2f96affeb56 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -391,6 +391,7 @@ LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC) all: emacs$(EXEEXT) $(OTHER_FILES) +.PHONY: all $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe) @@ -496,6 +497,8 @@ doc.o: buildobj.h ## If HAVE_NS, some ns-specific rules (for OTHER_FILES) are inserted here. @ns_frag@ +.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean +.PHONY: versioclean extraclean frc mostlyclean: rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a |