aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2014-06-14 17:34:22 -0700
committerGlenn Morris2014-06-14 17:34:22 -0700
commit0d9f81376b7ef14ec7a61077a059cfa2420c5666 (patch)
treee831d8882b1e5ee5a56b3ddadb5daca054b0ea31 /src
parent0e6929ecab39164b384c76884a7eac559a1fe9b9 (diff)
downloademacs-0d9f81376b7ef14ec7a61077a059cfa2420c5666.tar.gz
emacs-0d9f81376b7ef14ec7a61077a059cfa2420c5666.zip
Use `make -C' rather than `cd && make'
* Makefile.in: Use `make -C' rather than `cd && make' throughout. * lib-src/Makefile.in (../lib/libgnu.a): Use `make -C' rather than `cd && make'. * lisp/Makefile.in (leim, semantic): Use `make -C' rather than `cd && make'. * lwlib/Makefile.in ($(globals_h)): Use `make -C' rather than `cd && make'. * src/Makefile.in: Use `make -C' rather than `cd && make' throughout.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in27
2 files changed, 17 insertions, 14 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1bb96989b60..66ccae26c5c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12014-06-15 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in: Use `make -C' rather than `cd && make' throughout.
4
12014-06-15 Eli Zaretskii <eliz@gnu.org> 52014-06-15 Eli Zaretskii <eliz@gnu.org>
2 6
3 * xdisp.c (Fmove_point_visually): Don't use the glyph matrix 7 * xdisp.c (Fmove_point_visually): Don't use the glyph matrix
diff --git a/src/Makefile.in b/src/Makefile.in
index c858220c432..64c6b72479b 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) leim-list.el EMACS="$(bootstrap_exe)" 417 $(MAKE) -C ../leim 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) all EMACS="../$(bootstrap_exe)" 421 $(MAKE) -C ../admin/unidata 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) make-docfile$(EXEEXT) 462 $(MAKE) -C $(libsrc) make-docfile$(EXEEXT)
463 463
464buildobj.h: Makefile 464buildobj.h: Makefile
465 for i in $(ALLOBJS); do \ 465 for i in $(ALLOBJS); do \
@@ -480,7 +480,7 @@ gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES)
480$(ALLOBJS): globals.h 480$(ALLOBJS): globals.h
481 481
482$(lib)/libgnu.a: $(config_h) 482$(lib)/libgnu.a: $(config_h)
483 cd $(lib) && $(MAKE) libgnu.a 483 $(MAKE) -C $(lib) libgnu.a
484 484
485## We have to create $(etc) here because init_cmdargs tests its 485## We have to create $(etc) here because init_cmdargs tests its
486## existence when setting Vinstallation_directory (FIXME?). 486## existence when setting Vinstallation_directory (FIXME?).
@@ -499,9 +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) && $(MAKE) liblw.a 502 $(MAKE) -C $(lwlibdir) liblw.a
503$(oldXMenudir)/libXMenu11.a: FORCE 503$(oldXMenudir)/libXMenu11.a: FORCE
504 cd $(oldXMenudir) && $(MAKE) libXMenu11.a 504 $(MAKE) -C $(oldXMenudir) libXMenu11.a
505FORCE: 505FORCE:
506.PHONY: FORCE 506.PHONY: FORCE
507 507
@@ -519,7 +519,7 @@ emacs.res: $(ntsource)/emacs.rc \
519 -o $@ $(ntsource)/emacs.rc 519 -o $@ $(ntsource)/emacs.rc
520 520
521ns-app: emacs$(EXEEXT) 521ns-app: emacs$(EXEEXT)
522 cd ../nextstep && $(MAKE) all 522 $(MAKE) -C ./nextstep all
523 523
524.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean 524.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
525.PHONY: versionclean extraclean 525.PHONY: versionclean extraclean
@@ -578,10 +578,10 @@ TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) $(srcdir)/$(ctagsfiles3)
578## Arrange to make tags tables for ../lisp and ../lwlib, 578## Arrange to make tags tables for ../lisp and ../lwlib,
579## which the above TAGS file for the C files includes by reference. 579## which the above TAGS file for the C files includes by reference.
580../lisp/TAGS: 580../lisp/TAGS:
581 cd ../lisp && $(MAKE) TAGS ETAGS="$(ETAGS)" 581 $(MAKE) -C ../lisp TAGS ETAGS="$(ETAGS)"
582 582
583$(lwlibdir)/TAGS: 583$(lwlibdir)/TAGS:
584 cd $(lwlibdir) && $(MAKE) TAGS ETAGS="$(ETAGS)" 584 $(MAKE) -C $(lwlibdir) TAGS ETAGS="$(ETAGS)"
585 585
586tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS 586tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
587.PHONY: tags 587.PHONY: tags
@@ -617,8 +617,7 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
617## separately below. 617## separately below.
618## With GNU Make, we would just say "%.el : %.elc $(BOOTSTRAPEMACS)" 618## With GNU Make, we would just say "%.el : %.elc $(BOOTSTRAPEMACS)"
619.el.elc: 619.el.elc:
620 @cd ../lisp && $(MAKE) compile-onefile \ 620 @$(MAKE) -C ../lisp compile-onefile THEFILE=$< EMACS="$(bootstrap_exe)"
621 THEFILE=$< EMACS="$(bootstrap_exe)"
622 621
623## Since the .el.elc rule cannot specify an extra dependency, we do it here. 622## Since the .el.elc rule cannot specify an extra dependency, we do it here.
624$(lisp): $(BOOTSTRAPEMACS) 623$(lisp): $(BOOTSTRAPEMACS)
@@ -629,12 +628,12 @@ $(lisp): $(BOOTSTRAPEMACS)
629VCSWITNESS = 628VCSWITNESS =
630 629
631$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS) 630$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS)
632 cd ../lisp && $(MAKE) autoloads EMACS="$(bootstrap_exe)" 631 $(MAKE) -C ../lisp autoloads EMACS="$(bootstrap_exe)"
633 632
634## Dump an Emacs executable named bootstrap-emacs containing the 633## Dump an Emacs executable named bootstrap-emacs containing the
635## files from loadup.el in source form. 634## files from loadup.el in source form.
636bootstrap-emacs$(EXEEXT): temacs$(EXEEXT) 635bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
637 cd ../lisp && $(MAKE) update-subdirs 636 $(MAKE) -C ../lisp update-subdirs
638 if test "$(CANNOT_DUMP)" = "yes"; then \ 637 if test "$(CANNOT_DUMP)" = "yes"; then \
639 rm -f bootstrap-emacs$(EXEEXT); \ 638 rm -f bootstrap-emacs$(EXEEXT); \
640 ln temacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ 639 ln temacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
@@ -644,7 +643,7 @@ bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
644 mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ 643 mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
645 fi 644 fi
646 @: Compile some files earlier to speed up further compilation. 645 @: Compile some files earlier to speed up further compilation.
647 cd ../lisp && $(MAKE) compile-first EMACS="$(bootstrap_exe)" 646 $(MAKE) -C ../lisp compile-first EMACS="$(bootstrap_exe)"
648 647
649## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk. 648## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk.
650@deps_frag@ 649@deps_frag@