aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-06-13 19:05:00 -0400
committerGlenn Morris2014-06-13 19:05:00 -0400
commitf9d80c51100e230f37df6bd3864e607f6b145cc7 (patch)
treeb0f6c6785c47ece7d74f52d44b03842a51fd00c1
parentd736dd563056e3cac9f006d186ca018525f8b36a (diff)
downloademacs-f9d80c51100e230f37df6bd3864e607f6b145cc7.tar.gz
emacs-f9d80c51100e230f37df6bd3864e607f6b145cc7.zip
With GNU make, MFLAGS is not needed
* Makefile.in (CC, CFLAGS, LDFLAGS, CPPFLAGS, abs_top_srcdir): Remove, no longer used. (lib, lib-src, lisp, nt, src, blessmail, install-arch-dep) (install-nt, install-strip, uninstall, uninstall-nt) (mostlyclean, clean, distclean, bootstrap-clean) (maintainer-clean, extraclean, TAGS, tags, check, $(DOCS)): ($(INSTALL_DOC), $(UNINSTALL_DOC), info, bootstrap, check-declare): GNU make automatically passes command-line arguments to sub-makes. * admin/unidata/Makefile.in (${DSTDIR}/charprop.el): GNU make automatically passes command-line arguments to sub-makes. * lib-src/Makefile.in (../lib/libgnu.a): GNU make automatically passes command-line arguments to sub-makes. * lisp/Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el) (autoloads, $(lisp)/subdirs.el, compile-main, leim, semantic, compile) (compile-always): GNU make automatically passes command-line arguments to sub-makes. * lwlib/Makefile.in ($(globals_h)): GNU make automatically passes command-line arguments to sub-makes. * src/Makefile.in ($(leimdir)/leim-list.el, $(srcdir)/macuvs.h) ($(lispsource)/international/charprop.el) ($(libsrc)/make-docfile$(EXEEXT), $(lwlibdir)/liblw.a) ($(oldXMenudir)/libXMenu11.a, ns-app, .el.elc) ($(lispsource)/loaddefs.el, bootstrap-emacs$(EXEEXT)): GNU make automatically passes command-line arguments to sub-makes. * test/automated/Makefile.in (compile-main): GNU make automatically passes command-line arguments to sub-makes.
-rw-r--r--ChangeLog11
-rw-r--r--Makefile.in172
-rw-r--r--admin/ChangeLog5
-rw-r--r--admin/unidata/Makefile.in2
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/Makefile.in2
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/Makefile.in20
-rw-r--r--lwlib/ChangeLog5
-rw-r--r--lwlib/Makefile.in2
-rw-r--r--src/ChangeLog9
-rw-r--r--src/Makefile.in24
-rw-r--r--test/ChangeLog5
-rw-r--r--test/automated/Makefile.in2
14 files changed, 140 insertions, 129 deletions
diff --git a/ChangeLog b/ChangeLog
index 25de78e508a..90a1ce7c0c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
12014-06-13 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (CC, CFLAGS, LDFLAGS, CPPFLAGS, abs_top_srcdir):
4 Remove, no longer used.
5 (lib, lib-src, lisp, nt, src, blessmail, install-arch-dep)
6 (install-nt, install-strip, uninstall, uninstall-nt)
7 (mostlyclean, clean, distclean, bootstrap-clean)
8 (maintainer-clean, extraclean, TAGS, tags, check, $(DOCS)):
9 ($(INSTALL_DOC), $(UNINSTALL_DOC), info, bootstrap, check-declare):
10 GNU make automatically passes command-line arguments to sub-makes.
11
12014-06-11 Paul Eggert <eggert@cs.ucla.edu> 122014-06-11 Paul Eggert <eggert@cs.ucla.edu>
2 13
3 Use a shell function in configure.ac to cut down on code duplication. 14 Use a shell function in configure.ac to cut down on code duplication.
diff --git a/Makefile.in b/Makefile.in
index c6a10b0bd07..f9bfa082b0c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,10 +81,6 @@ AUTOMAKE = @AUTOMAKE@
81AUTOHEADER = @AUTOHEADER@ 81AUTOHEADER = @AUTOHEADER@
82ACLOCAL = @ACLOCAL@ 82ACLOCAL = @ACLOCAL@
83 83
84CC=@CC@
85CFLAGS=@CFLAGS@
86LDFLAGS=@LDFLAGS@
87CPPFLAGS=@CPPFLAGS@
88EXEEXT=@EXEEXT@ 84EXEEXT=@EXEEXT@
89 85
90### These help us choose version- and architecture-specific directories 86### These help us choose version- and architecture-specific directories
@@ -170,8 +166,6 @@ bitmapdir=@bitmapdir@
170# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. 166# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
171srcdir=@srcdir@ 167srcdir=@srcdir@
172abs_srcdir=@abs_srcdir@ 168abs_srcdir=@abs_srcdir@
173# MinGW CPPFLAGS may use this.
174abs_top_srcdir=@abs_top_srcdir@
175 169
176# Where the manpage source files are kept. 170# Where the manpage source files are kept.
177mansrcdir=$(srcdir)/doc/man 171mansrcdir=$(srcdir)/doc/man
@@ -364,9 +358,7 @@ lisp: src
364 358
365# These targets should be "${SUBDIR} without `src'". 359# These targets should be "${SUBDIR} without `src'".
366lib lib-src lisp nt: Makefile 360lib lib-src lisp nt: Makefile
367 cd $@ && $(MAKE) all $(MFLAGS) \ 361 cd $@ && $(MAKE) all
368 CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
369 LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
370 362
371# Pass to src/Makefile.in an additional BOOTSTRAPEMACS variable which 363# Pass to src/Makefile.in an additional BOOTSTRAPEMACS variable which
372# is either set to bootstrap-emacs (in case bootstrap-emacs has not been 364# is either set to bootstrap-emacs (in case bootstrap-emacs has not been
@@ -389,14 +381,10 @@ src: Makefile
389 cd $@ || exit; \ 381 cd $@ || exit; \
390 boot=bootstrap-emacs$(EXEEXT); \ 382 boot=bootstrap-emacs$(EXEEXT); \
391 [ ! -x "$$boot" ] || boot=''; \ 383 [ ! -x "$$boot" ] || boot=''; \
392 $(MAKE) all $(MFLAGS) \ 384 $(MAKE) all BOOTSTRAPEMACS="$$boot" VCSWITNESS="$$vcswitness"
393 CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
394 LDFLAGS='${LDFLAGS}' MAKE='${MAKE}' BOOTSTRAPEMACS="$$boot" \
395 VCSWITNESS="$$vcswitness"
396 385
397blessmail: Makefile src 386blessmail: Makefile src
398 cd lib-src && $(MAKE) maybe-blessmail $(MFLAGS) \ 387 cd lib-src && $(MAKE) maybe-blessmail
399 MAKE='${MAKE}' archlibdir='$(archlibdir)'
400 388
401# We used to have one rule per */Makefile.in, but that leads to race 389# We used to have one rule per */Makefile.in, but that leads to race
402# conditions with parallel makes, so let's assume that the time stamp on 390# conditions with parallel makes, so let's assume that the time stamp on
@@ -489,11 +477,7 @@ write_subdir=if [ -f "$${subdir}/subdirs.el" ]; \
489### Lisp files and DOC file to work properly. 477### Lisp files and DOC file to work properly.
490install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR) 478install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
491 umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}" 479 umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
492 cd lib-src && \ 480 cd lib-src && $(MAKE) install
493 $(MAKE) install $(MFLAGS) prefix="${prefix}" \
494 exec_prefix="${exec_prefix}" bindir="${bindir}" \
495 libexecdir="${libexecdir}" archlibdir="${archlibdir}" \
496 INSTALL_STRIP=${INSTALL_STRIP}
497 if test "${ns_self_contained}" = "no"; then \ 481 if test "${ns_self_contained}" = "no"; then \
498 ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)" || exit 1 ; \ 482 ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} "$(DESTDIR)${bindir}/$(EMACSFULL)" || exit 1 ; \
499 chmod 1755 "$(DESTDIR)${bindir}/$(EMACSFULL)" || true; \ 483 chmod 1755 "$(DESTDIR)${bindir}/$(EMACSFULL)" || true; \
@@ -511,12 +495,7 @@ install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
511### in nt/, and its Posix do-nothing shadow. 495### in nt/, and its Posix do-nothing shadow.
512install-: 496install-:
513install-nt: 497install-nt:
514 cd $(NTDIR) && \ 498 cd $(NTDIR) && $(MAKE) install
515 $(MAKE) install $(MFLAGS) prefix="${prefix}" \
516 exec_prefix="${exec_prefix}" bindir="${bindir}" \
517 libexecdir="${libexecdir}" archlibdir="${archlibdir}" \
518 datadir="${datadir}" \
519 INSTALL_STRIP=${INSTALL_STRIP}
520 499
521## In the share directory, we are deleting: 500## In the share directory, we are deleting:
522## applications (with emacs.desktop, also found in etc/) 501## applications (with emacs.desktop, also found in etc/)
@@ -729,19 +708,14 @@ install-etc:
729 708
730### Build Emacs and install it, stripping binaries while installing them. 709### Build Emacs and install it, stripping binaries while installing them.
731install-strip: 710install-strip:
732 $(MAKE) $(MFLAGS) INSTALL_STRIP=-s install 711 $(MAKE) INSTALL_STRIP=-s install
733 712
734### Delete all the installed files that the `install' target would 713### Delete all the installed files that the `install' target would
735### create (but not the noninstalled files such as `make all' would create). 714### create (but not the noninstalled files such as `make all' would create).
736### 715###
737### Don't delete the lisp and etc directories if they're in the source tree. 716### Don't delete the lisp and etc directories if they're in the source tree.
738uninstall: uninstall-$(NTDIR) uninstall-doc 717uninstall: uninstall-$(NTDIR) uninstall-doc
739 cd lib-src && \ 718 cd lib-src && $(MAKE) uninstall
740 $(MAKE) $(MFLAGS) uninstall \
741 prefix="${prefix}" exec_prefix="${exec_prefix}" \
742 bindir="${bindir}" libexecdir="${libexecdir}" \
743 archlibdir="${archlibdir}"
744
745 -unset CDPATH; \ 719 -unset CDPATH; \
746 for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \ 720 for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \
747 if [ -d "$${dir}" ]; then \ 721 if [ -d "$${dir}" ]; then \
@@ -790,11 +764,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
790### in nt/, and its Posix do-nothing shadow. 764### in nt/, and its Posix do-nothing shadow.
791uninstall-: 765uninstall-:
792uninstall-nt: 766uninstall-nt:
793 cd $(NTDIR) && \ 767 cd $(NTDIR) && $(MAKE) uninstall
794 $(MAKE) $(MFLAGS) uninstall \
795 prefix="${prefix}" exec_prefix="${exec_prefix}" \
796 bindir="${bindir}" libexecdir="${libexecdir}" \
797 archlibdir="${archlibdir}"
798 768
799# ==================== Cleaning up and miscellanea ==================== 769# ==================== Cleaning up and miscellanea ====================
800 770
@@ -806,16 +776,16 @@ uninstall-nt:
806### target for GCC does not delete `libgcc.a', because recompiling it 776### target for GCC does not delete `libgcc.a', because recompiling it
807### is rarely necessary and takes a lot of time. 777### is rarely necessary and takes a lot of time.
808mostlyclean: 778mostlyclean:
809 cd src && $(MAKE) $(MFLAGS) mostlyclean 779 cd src && $(MAKE) mostlyclean
810 cd oldXMenu && $(MAKE) $(MFLAGS) mostlyclean 780 cd oldXMenu && $(MAKE) mostlyclean
811 cd lwlib && $(MAKE) $(MFLAGS) mostlyclean 781 cd lwlib && $(MAKE) mostlyclean
812 cd lib && $(MAKE) $(MFLAGS) mostlyclean 782 cd lib && $(MAKE) mostlyclean
813 cd lib-src && $(MAKE) $(MFLAGS) mostlyclean 783 cd lib-src && $(MAKE) mostlyclean
814 cd nt && $(MAKE) $(MFLAGS) mostlyclean 784 cd nt && $(MAKE) mostlyclean
815 -cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean 785 -cd doc/emacs && $(MAKE) mostlyclean
816 -cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean 786 -cd doc/misc && $(MAKE) mostlyclean
817 -cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean 787 -cd doc/lispref && $(MAKE) mostlyclean
818 -cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean 788 -cd doc/lispintro && $(MAKE) mostlyclean
819 789
820### `clean' 790### `clean'
821### Delete all files from the current directory that are normally 791### Delete all files from the current directory that are normally
@@ -827,17 +797,17 @@ mostlyclean:
827### Delete `.dvi' files here if they are not part of the distribution. 797### Delete `.dvi' files here if they are not part of the distribution.
828clean: 798clean:
829 -rm -f etc/emacs.tmpdesktop 799 -rm -f etc/emacs.tmpdesktop
830 cd src && $(MAKE) $(MFLAGS) clean 800 cd src && $(MAKE) clean
831 cd oldXMenu && $(MAKE) $(MFLAGS) clean 801 cd oldXMenu && $(MAKE) clean
832 cd lwlib && $(MAKE) $(MFLAGS) clean 802 cd lwlib && $(MAKE) clean
833 cd lib && $(MAKE) $(MFLAGS) clean 803 cd lib && $(MAKE) clean
834 cd lib-src && $(MAKE) $(MFLAGS) clean 804 cd lib-src && $(MAKE) clean
835 cd nt && $(MAKE) $(MFLAGS) clean 805 cd nt && $(MAKE) clean
836 -cd doc/emacs && $(MAKE) $(MFLAGS) clean 806 -cd doc/emacs && $(MAKE) clean
837 -cd doc/misc && $(MAKE) $(MFLAGS) clean 807 -cd doc/misc && $(MAKE) clean
838 -cd doc/lispref && $(MAKE) $(MFLAGS) clean 808 -cd doc/lispref && $(MAKE) clean
839 -cd doc/lispintro && $(MAKE) $(MFLAGS) clean 809 -cd doc/lispintro && $(MAKE) clean
840 cd nextstep && $(MAKE) $(MFLAGS) clean 810 cd nextstep && $(MAKE) clean
841 811
842### `bootclean' 812### `bootclean'
843### Delete all files that need to be remade for a clean bootstrap. 813### Delete all files that need to be remade for a clean bootstrap.
@@ -853,21 +823,21 @@ top_distclean=\
853 ${top_bootclean}; \ 823 ${top_bootclean}; \
854 rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES} 824 rm -f config.status config.log~ Makefile stamp-h1 ${SUBDIR_MAKEFILES}
855distclean: 825distclean:
856 cd src && $(MAKE) $(MFLAGS) distclean 826 cd src && $(MAKE) distclean
857 cd oldXMenu && $(MAKE) $(MFLAGS) distclean 827 cd oldXMenu && $(MAKE) distclean
858 cd lwlib && $(MAKE) $(MFLAGS) distclean 828 cd lwlib && $(MAKE) distclean
859 cd lib && $(MAKE) $(MFLAGS) distclean 829 cd lib && $(MAKE) distclean
860 cd lib-src && $(MAKE) $(MFLAGS) distclean 830 cd lib-src && $(MAKE) distclean
861 cd nt && $(MAKE) $(MFLAGS) distclean 831 cd nt && $(MAKE) distclean
862 cd doc/emacs && $(MAKE) $(MFLAGS) distclean 832 cd doc/emacs && $(MAKE) distclean
863 cd doc/misc && $(MAKE) $(MFLAGS) distclean 833 cd doc/misc && $(MAKE) distclean
864 cd doc/lispref && $(MAKE) $(MFLAGS) distclean 834 cd doc/lispref && $(MAKE) distclean
865 cd doc/lispintro && $(MAKE) $(MFLAGS) distclean 835 cd doc/lispintro && $(MAKE) distclean
866 cd leim && $(MAKE) $(MFLAGS) distclean 836 cd leim && $(MAKE) distclean
867 cd lisp && $(MAKE) $(MFLAGS) distclean 837 cd lisp && $(MAKE) distclean
868 cd nextstep && $(MAKE) $(MFLAGS) distclean 838 cd nextstep && $(MAKE) distclean
869 for dir in test/automated admin/grammars admin/unidata; do \ 839 for dir in test/automated admin/grammars admin/unidata; do \
870 [ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) distclean); \ 840 [ ! -d $$dir ] || (cd $$dir && $(MAKE) distclean); \
871 done 841 done
872 ${top_distclean} 842 ${top_distclean}
873 843
@@ -875,21 +845,21 @@ distclean:
875### Delete everything that can be reconstructed by `make' and that 845### Delete everything that can be reconstructed by `make' and that
876### needs to be deleted in order to force a bootstrap from a clean state. 846### needs to be deleted in order to force a bootstrap from a clean state.
877bootstrap-clean: 847bootstrap-clean:
878 cd src && $(MAKE) $(MFLAGS) bootstrap-clean 848 cd src && $(MAKE) bootstrap-clean
879 cd oldXMenu && $(MAKE) $(MFLAGS) maintainer-clean 849 cd oldXMenu && $(MAKE) maintainer-clean
880 cd lwlib && $(MAKE) $(MFLAGS) maintainer-clean 850 cd lwlib && $(MAKE) maintainer-clean
881 cd lib && $(MAKE) $(MFLAGS) maintainer-clean 851 cd lib && $(MAKE) maintainer-clean
882 cd lib-src && $(MAKE) $(MFLAGS) maintainer-clean 852 cd lib-src && $(MAKE) maintainer-clean
883 cd nt && $(MAKE) $(MFLAGS) maintainer-clean 853 cd nt && $(MAKE) maintainer-clean
884 -cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean 854 -cd doc/emacs && $(MAKE) maintainer-clean
885 -cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean 855 -cd doc/misc && $(MAKE) maintainer-clean
886 -cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean 856 -cd doc/lispref && $(MAKE) maintainer-clean
887 -cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean 857 -cd doc/lispintro && $(MAKE) maintainer-clean
888 cd leim && $(MAKE) $(MFLAGS) bootstrap-clean 858 cd leim && $(MAKE) bootstrap-clean
889 cd lisp && $(MAKE) $(MFLAGS) bootstrap-clean 859 cd lisp && $(MAKE) bootstrap-clean
890 cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean 860 cd nextstep && $(MAKE) maintainer-clean
891 for dir in test/automated admin/grammars admin/unidata; do \ 861 for dir in test/automated admin/grammars admin/unidata; do \
892 [ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) bootstrap-clean); \ 862 [ ! -d $$dir ] || (cd $$dir && $(MAKE) bootstrap-clean); \
893 done 863 done
894 [ ! -f config.log ] || mv -f config.log config.log~ 864 [ ! -f config.log ] || mv -f config.log config.log~
895 rm -rf ${srcdir}/info 865 rm -rf ${srcdir}/info
@@ -910,11 +880,11 @@ top_maintainer_clean=\
910 ${top_distclean}; \ 880 ${top_distclean}; \
911 rm -fr autom4te.cache 881 rm -fr autom4te.cache
912maintainer-clean: bootstrap-clean 882maintainer-clean: bootstrap-clean
913 cd src && $(MAKE) $(MFLAGS) maintainer-clean 883 cd src && $(MAKE) maintainer-clean
914 cd leim && $(MAKE) $(MFLAGS) maintainer-clean 884 cd leim && $(MAKE) maintainer-clean
915 cd lisp && $(MAKE) $(MFLAGS) maintainer-clean 885 cd lisp && $(MAKE) maintainer-clean
916 for dir in test/automated admin/grammars admin/unidata; do \ 886 for dir in test/automated admin/grammars admin/unidata; do \
917 [ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) maintainer-clean); \ 887 [ ! -d $$dir ] || (cd $$dir && $(MAKE) maintainer-clean); \
918 done 888 done
919 ${top_maintainer_clean} 889 ${top_maintainer_clean}
920 890
@@ -923,7 +893,7 @@ maintainer-clean: bootstrap-clean
923### the coding standards seem to come from. It's like distclean, but 893### the coding standards seem to come from. It's like distclean, but
924### it deletes backup and autosave files too. 894### it deletes backup and autosave files too.
925extraclean: 895extraclean:
926 for i in ${SUBDIR}; do (cd $$i; $(MAKE) $(MFLAGS) extraclean); done 896 for i in ${SUBDIR}; do (cd $$i; $(MAKE) extraclean); done
927 ${top_maintainer_clean} 897 ${top_maintainer_clean}
928 -rm -f config-tmp-* 898 -rm -f config-tmp-*
929 -rm -f *~ \#* 899 -rm -f *~ \#*
@@ -932,14 +902,14 @@ extraclean:
932# even when the build directory and source dir are different. 902# even when the build directory and source dir are different.
933.PHONY: TAGS tags 903.PHONY: TAGS tags
934TAGS tags: lib lib-src src 904TAGS tags: lib lib-src src
935 cd src; $(MAKE) $(MFLAGS) tags 905 cd src && $(MAKE) tags
936 906
937check: all 907check: all
938 @if test ! -d test/automated; then \ 908 @if test ! -d test/automated; then \
939 echo "You do not seem to have the test/ directory."; \ 909 echo "You do not seem to have the test/ directory."; \
940 echo "Maybe you are using a release tarfile, rather than a repository checkout."; \ 910 echo "Maybe you are using a release tarfile, rather than a repository checkout."; \
941 else \ 911 else \
942 cd test/automated && $(MAKE) $(MFLAGS) check; \ 912 cd test/automated && $(MAKE) check; \
943 fi 913 fi
944 914
945dist: 915dist:
@@ -953,7 +923,7 @@ PSS = lispref-ps lispintro-ps emacs-ps misc-ps
953 923
954DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS) 924DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS)
955$(DOCS): 925$(DOCS):
956 t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $(MFLAGS) $$2 926 t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $$2
957 927
958.PHONY: $(DOCS) docs pdf ps 928.PHONY: $(DOCS) docs pdf ps
959.PHONY: info dvi dist check html info-real info-dir check-info 929.PHONY: info dvi dist check html info-real info-dir check-info
@@ -1002,7 +972,7 @@ INSTALL_DOC = $(INSTALL_DVI) $(INSTALL_HTML) $(INSTALL_PDF) $(INSTALL_PS)
1002## Install non .info forms of the documentation. 972## Install non .info forms of the documentation.
1003## TODO add etc/refcards. 973## TODO add etc/refcards.
1004$(INSTALL_DOC): 974$(INSTALL_DOC):
1005 t=$@; IFS=-; set $$t; IFS=; cd doc/$$2 && $(MAKE) $(MFLAGS) $$1-$$3 975 t=$@; IFS=-; set $$t; IFS=; cd doc/$$2 && $(MAKE) $$1-$$3
1006 976
1007.PHONY: $(INSTALL_DOC) install-doc 977.PHONY: $(INSTALL_DOC) install-doc
1008.PHONY: install-dvi install-html install-pdf install-ps 978.PHONY: install-dvi install-html install-pdf install-ps
@@ -1025,7 +995,7 @@ UNINSTALL_PS = uninstall-emacs-ps uninstall-lispref-ps \
1025UNINSTALL_DOC = $(UNINSTALL_DVI) $(UNINSTALL_HTML) $(UNINSTALL_PDF) $(UNINSTALL_PS) 995UNINSTALL_DOC = $(UNINSTALL_DVI) $(UNINSTALL_HTML) $(UNINSTALL_PDF) $(UNINSTALL_PS)
1026 996
1027$(UNINSTALL_DOC): 997$(UNINSTALL_DOC):
1028 t=$@; IFS=-; set $$t; IFS=; cd doc/$$2 && $(MAKE) $(MFLAGS) $$1-$$3 998 t=$@; IFS=-; set $$t; IFS=; cd doc/$$2 && $(MAKE) $$1-$$3
1029 999
1030.PHONY: $(UNINSTALL_DOC) uninstall-doc 1000.PHONY: $(UNINSTALL_DOC) uninstall-doc
1031.PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps 1001.PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps
@@ -1052,7 +1022,7 @@ info:
1052 @if test "$(HAVE_MAKEINFO)" = "no"; then \ 1022 @if test "$(HAVE_MAKEINFO)" = "no"; then \
1053 echo "Configured --without-makeinfo, not building manuals" ; \ 1023 echo "Configured --without-makeinfo, not building manuals" ; \
1054 else \ 1024 else \
1055 $(MAKE) $(MFLAGS) info-real info-dir; \ 1025 $(MAKE) info-real info-dir; \
1056 fi 1026 fi
1057 1027
1058## build-aux/make-info-dir expects only certain dircategories. 1028## build-aux/make-info-dir expects only certain dircategories.
@@ -1092,8 +1062,8 @@ check-info: info
1092# * Do the actual build. 1062# * Do the actual build.
1093bootstrap: bootstrap-clean 1063bootstrap: bootstrap-clean
1094 cd $(srcdir) && ./autogen.sh 1064 cd $(srcdir) && ./autogen.sh
1095 $(MAKE) $(MFLAGS) MAKEFILE_NAME=force-Makefile force-Makefile 1065 $(MAKE) MAKEFILE_NAME=force-Makefile force-Makefile
1096 $(MAKE) $(MFLAGS) all 1066 $(MAKE) all
1097 1067
1098.PHONY: check-declare 1068.PHONY: check-declare
1099 1069
@@ -1102,4 +1072,4 @@ check-declare:
1102 echo "You must build Emacs to use this command"; \ 1072 echo "You must build Emacs to use this command"; \
1103 exit 1; \ 1073 exit 1; \
1104 fi 1074 fi
1105 cd lisp && $(MAKE) $(MFLAGS) $@ 1075 cd lisp && $(MAKE) $@
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 4419d90fcd6..02d8dc08eac 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12014-06-13 Glenn Morris <rgm@gnu.org>
2
3 * unidata/Makefile.in (${DSTDIR}/charprop.el):
4 GNU make automatically passes command-line arguments to sub-makes.
5
12014-06-02 Paul Eggert <eggert@cs.ucla.edu> 62014-06-02 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Include sources used to create macuvs.h. 8 Include sources used to create macuvs.h.
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 3074864bb68..c86fff0bab4 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -52,7 +52,7 @@ compile: ${srcdir}/unidata-gen.elc
52## uni-*.el files just because .elc is missing. 52## uni-*.el files just because .elc is missing.
53## Same for UnicodeData.txt v unidata.txt. 53## Same for UnicodeData.txt v unidata.txt.
54${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt 54${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt
55 ${MAKE} ${MFLAGS} compile unidata.txt EMACS="${EMACS}" 55 ${MAKE} compile unidata.txt EMACS="${EMACS}"
56 -if [ -f "$@" ]; then \ 56 -if [ -f "$@" ]; then \
57 cd ${DSTDIR} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \ 57 cd ${DSTDIR} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \
58 fi 58 fi
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index d7c755e67f0..2586cfdd393 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
12014-06-13 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (../lib/libgnu.a):
4 GNU make automatically passes command-line arguments to sub-makes.
5
12014-05-26 Eli Zaretskii <eliz@gnu.org> 62014-05-26 Eli Zaretskii <eliz@gnu.org>
2 7
3 * ntlib.h (lseek): Don't redirect to _lseek. 8 * ntlib.h (lseek): Don't redirect to _lseek.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 3009ff26745..c7183fe751e 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -304,7 +304,7 @@ TAGS: etags${EXEEXT}
304 etags *.[ch] 304 etags *.[ch]
305 305
306../lib/libgnu.a: $(config_h) 306../lib/libgnu.a: $(config_h)
307 cd ../lib && $(MAKE) $(MFLAGS) libgnu.a 307 cd ../lib && $(MAKE) libgnu.a
308 308
309regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h) 309regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
310 ${CC} -c ${CPP_CFLAGS} ${srcdir}/../src/regex.c 310 ${CC} -c ${CPP_CFLAGS} ${srcdir}/../src/regex.c
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d4bfe84ac2..1ce8092f79e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12014-06-13 Glenn Morris <rgm@gnu.org> 12014-06-13 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)
4 (autoloads, $(lisp)/subdirs.el, compile-main, leim, semantic, compile)
5 (compile-always): GNU make automatically passes
6 command-line arguments to sub-makes.
7
3 * calendar/calendar.el (calendar-generate-window): 8 * calendar/calendar.el (calendar-generate-window):
4 Remove pointless call to font-lock-fontify-buffer. 9 Remove pointless call to font-lock-fontify-buffer.
5 10
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index a57b818e143..6504539ba42 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -168,7 +168,7 @@ doit:
168# since they will never contain any useful information 168# since they will never contain any useful information
169# (see finder-no-scan-regexp and custom-dependencies-no-scan-regexp). 169# (see finder-no-scan-regexp and custom-dependencies-no-scan-regexp).
170$(lisp)/cus-load.el: 170$(lisp)/cus-load.el:
171 $(MAKE) $(MFLAGS) custom-deps 171 $(MAKE) custom-deps
172custom-deps: doit 172custom-deps: doit
173 $(setwins_almost); \ 173 $(setwins_almost); \
174 echo Directories: $$wins; \ 174 echo Directories: $$wins; \
@@ -177,7 +177,7 @@ custom-deps: doit
177 -f custom-make-dependencies $$wins 177 -f custom-make-dependencies $$wins
178 178
179$(lisp)/finder-inf.el: 179$(lisp)/finder-inf.el:
180 $(MAKE) $(MFLAGS) finder-data 180 $(MAKE) finder-data
181finder-data: doit 181finder-data: doit
182 $(setwins_finder); \ 182 $(setwins_finder); \
183 echo Directories: $$wins; \ 183 echo Directories: $$wins; \
@@ -200,7 +200,7 @@ autoloads: $(LOADDEFS) doit
200 --eval '(setq autoload-builtin-package-versions t)' \ 200 --eval '(setq autoload-builtin-package-versions t)' \
201 --eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(srcdir)/loaddefs.el")))' \ 201 --eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(srcdir)/loaddefs.el")))' \
202 -f batch-update-autoloads $$wins 202 -f batch-update-autoloads $$wins
203 $(MAKE) $(MFLAGS) obsolete-autoloads 203 $(MAKE) obsolete-autoloads
204 204
205# The obsolete/ subdirectory is normally not scanned for autoloads. 205# The obsolete/ subdirectory is normally not scanned for autoloads.
206# Sometimes we still want to autoload something from that directory, 206# Sometimes we still want to autoload something from that directory,
@@ -215,7 +215,7 @@ obsolete-autoloads: ${lisp}/obsolete/*.el
215# This is required by the bootstrap-emacs target in ../src/Makefile, so 215# This is required by the bootstrap-emacs target in ../src/Makefile, so
216# we know that if we have an emacs executable, we also have a subdirs.el. 216# we know that if we have an emacs executable, we also have a subdirs.el.
217$(lisp)/subdirs.el: 217$(lisp)/subdirs.el:
218 $(MAKE) $(MFLAGS) update-subdirs 218 $(MAKE) update-subdirs
219update-subdirs: doit 219update-subdirs: doit
220 $(setwins_for_subdirs); \ 220 $(setwins_for_subdirs); \
221 for file in $$wins; do \ 221 for file in $$wins; do \
@@ -307,7 +307,7 @@ compile-onefile:
307compile-first: $(COMPILE_FIRST) 307compile-first: $(COMPILE_FIRST)
308 308
309# In `compile-main' we could directly do 309# In `compile-main' we could directly do
310# ... | xargs $(MAKE) $(MFLAGS) EMACS="$(EMACS)" 310# ... | xargs $(MAKE) EMACS="$(EMACS)"
311# and it works, but it generates a lot of messages like 311# and it works, but it generates a lot of messages like
312# make[2]: gnus/gnus-mlspl.elc is up to date. 312# make[2]: gnus/gnus-mlspl.elc is up to date.
313# so instead, we use "xargs echo" to split the list of file into manageable 313# so instead, we use "xargs echo" to split the list of file into manageable
@@ -331,7 +331,7 @@ compile-main: leim semantic compile-clean
331 echo "$${el}c"; \ 331 echo "$${el}c"; \
332 done | xargs $(XARGS_LIMIT) echo) | \ 332 done | xargs $(XARGS_LIMIT) echo) | \
333 while read chunk; do \ 333 while read chunk; do \
334 $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ 334 $(MAKE) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
335 done 335 done
336 336
337.PHONY: compile-clean 337.PHONY: compile-clean
@@ -348,7 +348,7 @@ compile-clean:
348 348
349.PHONY: leim semantic 349.PHONY: leim semantic
350leim: 350leim:
351 cd ../leim && $(MAKE) $(MFLAGS) all EMACS="$(EMACS)" 351 cd ../leim && $(MAKE) all EMACS="$(EMACS)"
352 352
353# FIXME. Yuck. 353# FIXME. Yuck.
354semantic: 354semantic:
@@ -356,7 +356,7 @@ semantic:
356 .*) EMACS="../${EMACS}" ;; \ 356 .*) EMACS="../${EMACS}" ;; \
357 *) EMACS="${EMACS}" ;; \ 357 *) EMACS="${EMACS}" ;; \
358 esac; \ 358 esac; \
359 cd ../admin/grammars && $(MAKE) $(MFLAGS) all EMACS="$${EMACS}" 359 cd ../admin/grammars && $(MAKE) all EMACS="$${EMACS}"
360 360
361# Compile all Lisp files, but don't recompile those that are up to 361# Compile all Lisp files, but don't recompile those that are up to
362# date. Some .el files don't get compiled because they set the 362# date. Some .el files don't get compiled because they set the
@@ -365,14 +365,14 @@ semantic:
365# Explicitly pass EMACS (sometimes ../src/bootstrap-emacs) to those 365# Explicitly pass EMACS (sometimes ../src/bootstrap-emacs) to those
366# sub-makes that run rules that use it, for the sake of some non-GNU makes. 366# sub-makes that run rules that use it, for the sake of some non-GNU makes.
367compile: $(LOADDEFS) autoloads compile-first 367compile: $(LOADDEFS) autoloads compile-first
368 $(MAKE) $(MFLAGS) compile-main EMACS="$(EMACS)" 368 $(MAKE) compile-main EMACS="$(EMACS)"
369 369
370# Compile all Lisp files. This is like `compile' but compiles files 370# Compile all Lisp files. This is like `compile' but compiles files
371# unconditionally. Some files don't actually get compiled because they 371# unconditionally. Some files don't actually get compiled because they
372# set the local variable no-byte-compile. 372# set the local variable no-byte-compile.
373compile-always: doit 373compile-always: doit
374 cd $(lisp) && rm -f *.elc */*.elc */*/*.elc */*/*/*.elc 374 cd $(lisp) && rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
375 $(MAKE) $(MFLAGS) compile EMACS="$(EMACS)" 375 $(MAKE) compile EMACS="$(EMACS)"
376 376
377.PHONY: backup-compiled-files compile-after-backup 377.PHONY: backup-compiled-files compile-after-backup
378 378
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index 5a5d1e703fd..c62b72ab9a1 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,8 @@
12014-06-13 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in ($(globals_h)):
4 GNU make automatically passes command-line arguments to sub-makes.
5
12014-06-04 Dmitry Antipov <dmantipov@yandex.ru> 62014-06-04 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 * lwlib-widget.h (widget_value) [USE_X_TOOLKIT]: Use X toolkit 8 * lwlib-widget.h (widget_value) [USE_X_TOOLKIT]: Use X toolkit
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 8bdd2bbbf3d..145f6ec56c5 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -80,7 +80,7 @@ globals_h = ../src/globals.h
80src_h = $(config_h) $(lisp_h) $(globals_h) 80src_h = $(config_h) $(lisp_h) $(globals_h)
81 81
82$(globals_h): 82$(globals_h):
83 cd ../src && $(MAKE) $(MFLAGS) globals.h 83 cd ../src && $(MAKE) globals.h
84 84
85lwlib-utils.o: $(src_h) lwlib-utils.c lwlib-utils.h lwlib.h 85lwlib-utils.o: $(src_h) lwlib-utils.c lwlib-utils.h lwlib.h
86lwlib.o: $(src_h) lwlib.c lwlib.h lwlib-int.h lwlib-utils.h \ 86lwlib.o: $(src_h) lwlib.c lwlib.h lwlib-int.h lwlib-utils.h \
diff --git a/src/ChangeLog b/src/ChangeLog
index 6db73ca7f69..5fc04c10f59 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
12014-06-13 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in ($(leimdir)/leim-list.el, $(srcdir)/macuvs.h)
4 ($(lispsource)/international/charprop.el)
5 ($(libsrc)/make-docfile$(EXEEXT), $(lwlibdir)/liblw.a)
6 ($(oldXMenudir)/libXMenu11.a, ns-app, .el.elc)
7 ($(lispsource)/loaddefs.el, bootstrap-emacs$(EXEEXT)):
8 GNU make automatically passes command-line arguments to sub-makes.
9
12014-06-13 Paul Eggert <eggert@cs.ucla.edu> 102014-06-13 Paul Eggert <eggert@cs.ucla.edu>
2 11
3 Avoid hangs in accept-process-output (Bug#17647). 12 Avoid hangs in accept-process-output (Bug#17647).
diff --git a/src/Makefile.in b/src/Makefile.in
index bda4623d7de..c858220c432 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -414,11 +414,11 @@ all: emacs$(EXEEXT) $(OTHER_FILES)
414.PHONY: all 414.PHONY: all
415 415
416$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT) 416$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
417 cd ../leim && $(MAKE) $(MFLAGS) leim-list.el EMACS="$(bootstrap_exe)" 417 cd ../leim && $(MAKE) leim-list.el EMACS="$(bootstrap_exe)"
418 418
419$(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \ 419$(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \
420 bootstrap-emacs$(EXEEXT) 420 bootstrap-emacs$(EXEEXT)
421 cd ../admin/unidata && $(MAKE) $(MFLAGS) all EMACS="../$(bootstrap_exe)" 421 cd ../admin/unidata && $(MAKE) all EMACS="../$(bootstrap_exe)"
422 422
423## The dumped Emacs is as functional and more efficient than 423## The dumped Emacs is as functional and more efficient than
424## bootstrap-emacs, so we replace the latter with the former. 424## bootstrap-emacs, so we replace the latter with the former.
@@ -459,7 +459,7 @@ $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp)
459 $(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) `sed -n -e 's| \\\\||' -e 's|^[ ]*$$(lispsource)/||p' $(srcdir)/lisp.mk` 459 $(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) `sed -n -e 's| \\\\||' -e 's|^[ ]*$$(lispsource)/||p' $(srcdir)/lisp.mk`
460 460
461$(libsrc)/make-docfile$(EXEEXT): 461$(libsrc)/make-docfile$(EXEEXT):
462 cd $(libsrc); $(MAKE) $(MFLAGS) make-docfile$(EXEEXT) 462 cd $(libsrc); $(MAKE) make-docfile$(EXEEXT)
463 463
464buildobj.h: Makefile 464buildobj.h: Makefile
465 for i in $(ALLOBJS); do \ 465 for i in $(ALLOBJS); do \
@@ -499,13 +499,9 @@ temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \
499## The following oldxmenu-related rules are only (possibly) used if 499## The following oldxmenu-related rules are only (possibly) used if
500## HAVE_X11 && !USE_GTK, but there is no harm in always defining them. 500## HAVE_X11 && !USE_GTK, but there is no harm in always defining them.
501$(lwlibdir)/liblw.a: $(config_h) globals.h lisp.h FORCE 501$(lwlibdir)/liblw.a: $(config_h) globals.h lisp.h FORCE
502 cd $(lwlibdir) && \ 502 cd $(lwlibdir) && $(MAKE) liblw.a
503 $(MAKE) $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' MAKE='$(MAKE)' \
504 liblw.a
505$(oldXMenudir)/libXMenu11.a: FORCE 503$(oldXMenudir)/libXMenu11.a: FORCE
506 cd $(oldXMenudir) && \ 504 cd $(oldXMenudir) && $(MAKE) libXMenu11.a
507 $(MAKE) $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' MAKE='$(MAKE)' \
508 libXMenu11.a
509FORCE: 505FORCE:
510.PHONY: FORCE 506.PHONY: FORCE
511 507
@@ -523,7 +519,7 @@ emacs.res: $(ntsource)/emacs.rc \
523 -o $@ $(ntsource)/emacs.rc 519 -o $@ $(ntsource)/emacs.rc
524 520
525ns-app: emacs$(EXEEXT) 521ns-app: emacs$(EXEEXT)
526 cd ../nextstep && $(MAKE) $(MFLAGS) all 522 cd ../nextstep && $(MAKE) all
527 523
528.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean 524.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
529.PHONY: versionclean extraclean 525.PHONY: versionclean extraclean
@@ -621,7 +617,7 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
621## separately below. 617## separately below.
622## With GNU Make, we would just say "%.el : %.elc $(BOOTSTRAPEMACS)" 618## With GNU Make, we would just say "%.el : %.elc $(BOOTSTRAPEMACS)"
623.el.elc: 619.el.elc:
624 @cd ../lisp; $(MAKE) $(MFLAGS) compile-onefile \ 620 @cd ../lisp && $(MAKE) compile-onefile \
625 THEFILE=$< EMACS="$(bootstrap_exe)" 621 THEFILE=$< EMACS="$(bootstrap_exe)"
626 622
627## Since the .el.elc rule cannot specify an extra dependency, we do it here. 623## Since the .el.elc rule cannot specify an extra dependency, we do it here.
@@ -633,12 +629,12 @@ $(lisp): $(BOOTSTRAPEMACS)
633VCSWITNESS = 629VCSWITNESS =
634 630
635$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS) 631$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS)
636 cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS="$(bootstrap_exe)" 632 cd ../lisp && $(MAKE) autoloads EMACS="$(bootstrap_exe)"
637 633
638## Dump an Emacs executable named bootstrap-emacs containing the 634## Dump an Emacs executable named bootstrap-emacs containing the
639## files from loadup.el in source form. 635## files from loadup.el in source form.
640bootstrap-emacs$(EXEEXT): temacs$(EXEEXT) 636bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
641 cd ../lisp; $(MAKE) $(MFLAGS) update-subdirs 637 cd ../lisp && $(MAKE) update-subdirs
642 if test "$(CANNOT_DUMP)" = "yes"; then \ 638 if test "$(CANNOT_DUMP)" = "yes"; then \
643 rm -f bootstrap-emacs$(EXEEXT); \ 639 rm -f bootstrap-emacs$(EXEEXT); \
644 ln temacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ 640 ln temacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
@@ -648,7 +644,7 @@ bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
648 mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ 644 mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
649 fi 645 fi
650 @: Compile some files earlier to speed up further compilation. 646 @: Compile some files earlier to speed up further compilation.
651 cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS="$(bootstrap_exe)" 647 cd ../lisp && $(MAKE) compile-first EMACS="$(bootstrap_exe)"
652 648
653## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk. 649## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk.
654@deps_frag@ 650@deps_frag@
diff --git a/test/ChangeLog b/test/ChangeLog
index bb8ed89bed0..39470d7a79d 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
12014-06-13 Glenn Morris <rgm@gnu.org>
2
3 * automated/Makefile.in (compile-main):
4 GNU make automatically passes command-line arguments to sub-makes.
5
12014-06-05 Michal Nazarewicz <mina86@mina86.com> 62014-06-05 Michal Nazarewicz <mina86@mina86.com>
2 7
3 * automated/tildify-tests.el (tildify-test--test): Optimise the test 8 * automated/tildify-tests.el (tildify-test--test): Optimise the test
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 9d9f60e3efe..e0800f09eb0 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -84,7 +84,7 @@ compile-main: compile-clean
84 echo "$${el}c"; \ 84 echo "$${el}c"; \
85 done | xargs $(XARGS_LIMIT) echo | \ 85 done | xargs $(XARGS_LIMIT) echo | \
86 while read chunk; do \ 86 while read chunk; do \
87 $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ 87 $(MAKE) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
88 done 88 done
89 89
90# Erase left-over .elc files that do not have a corresponding .el file. 90# Erase left-over .elc files that do not have a corresponding .el file.