aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2012-07-30 09:20:35 -0700
committerPaul Eggert2012-07-30 09:20:35 -0700
commit0aee69126fd23d3b86fae5e4812b62bbe7c59b27 (patch)
tree65bc1c790d85370e2c2cac2f005c080fb674c37b
parent88fb40b443b64be3e217e1d5cb50a77659d03330 (diff)
downloademacs-0aee69126fd23d3b86fae5e4812b62bbe7c59b27.tar.gz
emacs-0aee69126fd23d3b86fae5e4812b62bbe7c59b27.zip
Update .PHONY listings in makefiles.
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.in14
-rw-r--r--leim/ChangeLog6
-rw-r--r--leim/Makefile.in4
-rw-r--r--lib-src/ChangeLog7
-rw-r--r--lib-src/Makefile.in5
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/Makefile.in11
-rw-r--r--src/ChangeLog5
-rw-r--r--src/Makefile.in3
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 @@
12012-07-30 Paul Eggert <eggert@cs.ucla.edu>
2
3 Update .PHONY listings in makefiles.
4 * Makefile.in (.PHONY): Add all, ${SUBDIR}, blessmail, epath-force,
5 FRC, install-arch-dep, install-arch-indep, install-doc,
6 install-info, install-man, install-etc, install-strip, uninstall,
7 bootstrap-clean, TAGS, tags, info-real, force-info, check-info-dir.
8 (.RECURSIVE): Remove; hasn't been needed for years.
9
12012-07-30 Glenn Morris <rgm@gnu.org> 102012-07-30 Glenn Morris <rgm@gnu.org>
2 11
3 * configure.ac (SIGNAL_H_AHB): New hack macro. 12 * 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
278 278
279all: ${SUBDIR} 279all: ${SUBDIR}
280 280
281.PHONY: all ${SUBDIR} blessmail epaths-force FRC
282
281removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' 283removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
282 284
283# Generate epaths.h from epaths.in. This target is invoked by `configure'. 285# Generate epaths.h from epaths.in. This target is invoked by `configure'.
@@ -307,8 +309,6 @@ lib-src src: lib
307 309
308src: lib-src FRC 310src: lib-src FRC
309 311
310.RECURSIVE: ${SUBDIR}
311
312# We need to build `emacs' in `src' to compile the *.elc files in `lisp' 312# We need to build `emacs' in `src' to compile the *.elc files in `lisp'
313# and `leim'. 313# and `leim'.
314lisp leim: src 314lisp leim: src
@@ -393,12 +393,13 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
393 393
394# ==================== Installation ==================== 394# ==================== Installation ====================
395 395
396.PHONY: install install-arch-dep install-arch-indep install-doc install-info
397.PHONY: install-man install-etc install-strip uninstall
398
396## If we let lib-src do its own installation, that means we 399## If we let lib-src do its own installation, that means we
397## don't have to duplicate the list of utilities to install in 400## don't have to duplicate the list of utilities to install in
398## this Makefile as well. 401## this Makefile as well.
399 402
400.PHONY: install
401
402install: all install-arch-indep install-doc install-arch-dep blessmail 403install: all install-arch-indep install-doc install-arch-dep blessmail
403 @true 404 @true
404 405
@@ -681,7 +682,7 @@ FRC:
681 682
682# ==================== Cleaning up and miscellanea ==================== 683# ==================== Cleaning up and miscellanea ====================
683 684
684.PHONY: mostlyclean clean distclean maintainer-clean extraclean 685.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean extraclean
685 686
686### `mostlyclean' 687### `mostlyclean'
687### Like `clean', but may refrain from deleting a few files that people 688### Like `clean', but may refrain from deleting a few files that people
@@ -798,6 +799,7 @@ extraclean:
798 799
799# The src subdir knows how to do the right thing 800# The src subdir knows how to do the right thing
800# even when the build directory and source dir are different. 801# even when the build directory and source dir are different.
802.PHONY: TAGS tags
801TAGS tags: lib lib-src src 803TAGS tags: lib lib-src src
802 cd src; $(MAKE) $(MFLAGS) tags 804 cd src; $(MAKE) $(MFLAGS) tags
803 805
@@ -812,7 +814,7 @@ check:
812dist: 814dist:
813 cd ${srcdir}; ./make-dist 815 cd ${srcdir}; ./make-dist
814 816
815.PHONY: info dvi dist check html 817.PHONY: info dvi dist check html info-real force-info check-info-dir
816 818
817info-real: 819info-real:
818 (cd doc/emacs; $(MAKE) $(MFLAGS) info) 820 (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 @@
12012-07-30 Paul Eggert <eggert@cs.ucla.edu>
2
3 Update .PHONY listings in makefiles.
4 * Makefile.in (.PHONY): Add all, compile-main, clean, mostlyclean,
5 bootstrap-clean, distclean, maintainer-clean, extraclean.
6
12012-07-29 Paul Eggert <eggert@cs.ucla.edu> 72012-07-29 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 deactive->inactive, inactivate->deactivate spelling fixes (Bug#10150) 9 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}
82 @${RUN_EMACS} -l ${buildlisppath}/international/quail -f batch-byte-compile $< 82 @${RUN_EMACS} -l ${buildlisppath}/international/quail -f batch-byte-compile $<
83 83
84all: leim-list.el compile-main 84all: leim-list.el compile-main
85.PHONY: all
85 86
86TIT_SOURCES= \ 87TIT_SOURCES= \
87 ${srcdir}/CXTERM-DIC/4Corner.tit \ 88 ${srcdir}/CXTERM-DIC/4Corner.tit \
@@ -154,6 +155,7 @@ compile-targets: $(TARGETS)
154 155
155# Compile all the Elisp files that need it. Beware: it approximates 156# Compile all the Elisp files that need it. Beware: it approximates
156# `no-byte-compile', so watch out for false-positives! 157# `no-byte-compile', so watch out for false-positives!
158.PHONY: compile-main
157compile-main: ${TIT_MISC} 159compile-main: ${TIT_MISC}
158 @($(setwins); \ 160 @($(setwins); \
159 els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \ 161 els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \
@@ -166,6 +168,8 @@ compile-main: ${TIT_MISC}
166 $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ 168 $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
167 done 169 done
168 170
171.PHONY: clean mostlyclean bootstrap-clean distclean maintainer-clean extraclean
172
169clean mostlyclean: 173clean mostlyclean:
170 rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \ 174 rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \
171 leim-list.el changed.tit changed.misc 175 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 @@
12012-07-30 Paul Eggert <eggert@cs.ucla.edu>
2
3 Update .PHONY listings in makefiles.
4 * Makefile.in (.PHONY): Add all, need-blessmail, maybe-blessmail,
5 install, uninstall, mostlyclean, clean, distclean,
6 maintainer-clean, extraclean, check, tags.
7
12012-07-29 Eli Zaretskii <eliz@gnu.org> 82012-07-29 Eli Zaretskii <eliz@gnu.org>
2 9
3 * makefile.w32-in ($(BLD)/profile.$(O)): Depend on stamp_BLD. 10 * 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}
180 180
181all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} 181all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}
182 182
183.PHONY: all need-blessmail maybe-blessmail
184
183LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM) 185LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM)
184$(EXE_FILES): ../lib/libgnu.a 186$(EXE_FILES): ../lib/libgnu.a
185 187
@@ -231,6 +233,9 @@ $(DESTDIR)${archlibdir}: all
231 done ; \ 233 done ; \
232 fi 234 fi
233 235
236.PHONY: install uninstall mostlyclean clean distclean maintainer-clean
237.PHONY: extraclean check tags
238
234install: $(DESTDIR)${archlibdir} 239install: $(DESTDIR)${archlibdir}
235 @echo 240 @echo
236 @echo "Installing utilities for users to run." 241 @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 @@
12012-07-30 Paul Eggert <eggert@cs.ucla.edu>
2
3 Update .PHONY listings in makefiles.
4 * Makefile.in (.PHONY): Add all, doit, custom-deps, finder-data,
5 autoloads, update-subdirs, updates, bzr-update, update-authors,
6 compile-onefile, compile-calc, backup-compiled-files,
7 compile-after-backup, compile-one-process, mh-autoloads,
8 bootstrap-clean, distclean, maintainer-clean.
9
12012-07-29 Jay Belanger <jay.p.belanger@gmail.com> 102012-07-29 Jay Belanger <jay.p.belanger@gmail.com>
2 11
3 * calc/calc.el (calc-simplify-mode): Make 'alg the default value. 12 * 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
139 139
140doit: 140doit:
141 141
142.PHONY: all doit custom-deps finder-data autoloads update-subdirs
143
142# custom-deps and finder-data both used to scan _all_ the *.el files. 144# custom-deps and finder-data both used to scan _all_ the *.el files.
143# This could lead to problems in parallel builds if automatically 145# This could lead to problems in parallel builds if automatically
144# generated *.el files (eg loaddefs etc) were being changed at the same time. 146# generated *.el files (eg loaddefs etc) were being changed at the same time.
@@ -184,6 +186,8 @@ update-subdirs: doit
184 $(top_srcdir)/build-aux/update-subdirs $$file; \ 186 $(top_srcdir)/build-aux/update-subdirs $$file; \
185 done; 187 done;
186 188
189.PHONY: updates bzr-update update-authors
190
187# Some modes of make-dist use this. 191# Some modes of make-dist use this.
188updates: update-subdirs autoloads finder-data custom-deps 192updates: update-subdirs autoloads finder-data custom-deps
189 193
@@ -215,6 +219,7 @@ TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptags
215# src/Makefile.in to rebuild a particular Lisp file, no questions asked. 219# src/Makefile.in to rebuild a particular Lisp file, no questions asked.
216# Use byte-compile-refresh-preloaded to try and work around some of 220# Use byte-compile-refresh-preloaded to try and work around some of
217# the most common problems of not bootstrapping from a clean state. 221# the most common problems of not bootstrapping from a clean state.
222.PHONY: compile-onefile
218compile-onefile: 223compile-onefile:
219 @echo Compiling $(THEFILE) 224 @echo Compiling $(THEFILE)
220 @# Use byte-compile-refresh-preloaded to try and work around some of 225 @# Use byte-compile-refresh-preloaded to try and work around some of
@@ -302,6 +307,8 @@ compile-always: doit
302 cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc 307 cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
303 $(MAKE) $(MFLAGS) compile EMACS=$(EMACS) 308 $(MAKE) $(MFLAGS) compile EMACS=$(EMACS)
304 309
310.PHONY: compile-calc backup-compiled-files compile-after-backup
311
305compile-calc: 312compile-calc:
306 for el in $(lisp)/calc/*.el; do \ 313 for el in $(lisp)/calc/*.el; do \
307 echo Compiling $$el; \ 314 echo Compiling $$el; \
@@ -334,6 +341,7 @@ compile-after-backup: backup-compiled-files compile-always
334# files that use byte-compile-dynamic are updated. 341# files that use byte-compile-dynamic are updated.
335# There is no reason to use this rule unless you only have a single 342# There is no reason to use this rule unless you only have a single
336# core and CPU time is an issue. 343# core and CPU time is an issue.
344.PHONY: compile-one-process
337compile-one-process: doit $(LOADDEFS) compile-first $(lisp)/progmodes/cc-mode.elc 345compile-one-process: doit $(LOADDEFS) compile-first $(lisp)/progmodes/cc-mode.elc
338 $(emacs) $(BYTE_COMPILE_FLAGS) \ 346 $(emacs) $(BYTE_COMPILE_FLAGS) \
339 --eval "(batch-byte-recompile-directory 0)" $(lisp) 347 --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 \
356 $(MH_E_DIR)/mh-tool-bar.el $(MH_E_DIR)/mh-utils.el \ 364 $(MH_E_DIR)/mh-tool-bar.el $(MH_E_DIR)/mh-utils.el \
357 $(MH_E_DIR)/mh-xface.el 365 $(MH_E_DIR)/mh-xface.el
358 366
367.PHONY: mh-autoloads
359mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el 368mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el
360$(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC) 369$(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC)
361 $(emacs) -l autoload \ 370 $(emacs) -l autoload \
@@ -418,6 +427,8 @@ $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC)
418 --eval "(setq make-backup-files nil)" \ 427 --eval "(setq make-backup-files nil)" \
419 -f batch-update-autoloads $(CAL_DIR) 428 -f batch-update-autoloads $(CAL_DIR)
420 429
430.PHONY: bootstrap-clean distclean maintainer-clean
431
421bootstrap-clean: 432bootstrap-clean:
422 cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc $(AUTOGENEL) 433 cd $(lisp); rm -f *.elc */*.elc */*/*.elc */*/*/*.elc $(AUTOGENEL)
423 434
diff --git a/src/ChangeLog b/src/ChangeLog
index d36fff428fe..792dc10f88c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
12012-07-30 Paul Eggert <eggert@cs.ucla.edu> 12012-07-30 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Update .PHONY listings in makefiles.
4 * Makefile.in (.PHONY): Add all, mostlyclean, clean,
5 bootstrap-clean, distclean, maintainer-clean, versioclean,
6 extraclean, frc.
7
3 * lisp.h (STRING_BYTES_BOUND): Cast entire result to ptrdiff_t. 8 * lisp.h (STRING_BYTES_BOUND): Cast entire result to ptrdiff_t.
4 This is a bit clearer. Fix some commentary typos. 9 This is a bit clearer. Fix some commentary typos.
5 10
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) \
391 $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC) 391 $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC)
392 392
393all: emacs$(EXEEXT) $(OTHER_FILES) 393all: emacs$(EXEEXT) $(OTHER_FILES)
394.PHONY: all
394 395
395$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) 396$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
396 cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe) 397 cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe)
@@ -496,6 +497,8 @@ doc.o: buildobj.h
496## If HAVE_NS, some ns-specific rules (for OTHER_FILES) are inserted here. 497## If HAVE_NS, some ns-specific rules (for OTHER_FILES) are inserted here.
497@ns_frag@ 498@ns_frag@
498 499
500.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
501.PHONY: versioclean extraclean frc
499 502
500mostlyclean: 503mostlyclean:
501 rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a 504 rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a