aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2014-06-13 19:05:00 -0400
committerGlenn Morris2014-06-13 19:05:00 -0400
commitf9d80c51100e230f37df6bd3864e607f6b145cc7 (patch)
treeb0f6c6785c47ece7d74f52d44b03842a51fd00c1 /src
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog9
-rw-r--r--src/Makefile.in24
2 files changed, 19 insertions, 14 deletions
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@