[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117337: Use `make -C' rather than `cd && make'
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] trunk r117337: Use `make -C' rather than `cd && make' |
|
Date: |
Sun, 15 Jun 2014 00:34:37 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117337
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2014-06-14 17:34:22 -0700
message:
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.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-446
lib-src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1608
lib-src/Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-475
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831
lwlib/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1447
lwlib/Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-662
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-631
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-06-15 00:17:21 +0000
+++ b/ChangeLog 2014-06-15 00:34:22 +0000
@@ -1,5 +1,7 @@
2014-06-15 Glenn Morris <address@hidden>
+ * Makefile.in: Use `make -C' rather than `cd && make' throughout.
+
* Makefile.in: Parallelize clean rules using GNU make features.
(submake_template): New definition.
(mostlyclean_dirs, clean_dirs, distclean_dirs, maintainer_clean_dirs):
=== modified file 'Makefile.in'
--- a/Makefile.in 2014-06-15 00:17:21 +0000
+++ b/Makefile.in 2014-06-15 00:34:22 +0000
@@ -358,7 +358,7 @@
# These targets should be "${SUBDIR} without `src'".
lib lib-src lisp nt: Makefile
- cd $@ && $(MAKE) all
+ $(MAKE) -C $@ all
# Pass to src/Makefile.in an additional BOOTSTRAPEMACS variable which
# is either set to bootstrap-emacs (in case bootstrap-emacs has not been
@@ -384,7 +384,7 @@
$(MAKE) all BOOTSTRAPEMACS="$$boot" VCSWITNESS="$$vcswitness"
blessmail: Makefile src
- cd lib-src && $(MAKE) maybe-blessmail
+ $(MAKE) -C lib-src maybe-blessmail
# We used to have one rule per */Makefile.in, but that leads to race
# conditions with parallel makes, so let's assume that the time stamp on
@@ -477,7 +477,7 @@
### Lisp files and DOC file to work properly.
install-arch-dep: src install-arch-indep install-etcdoc install-$(NTDIR)
umask 022; ${MKDIR_P} "$(DESTDIR)${bindir}"
- cd lib-src && $(MAKE) install
+ $(MAKE) -C lib-src install
if test "${ns_self_contained}" = "no"; then \
${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT}
"$(DESTDIR)${bindir}/$(EMACSFULL)" || exit 1 ; \
chmod 1755 "$(DESTDIR)${bindir}/$(EMACSFULL)" || true; \
@@ -495,7 +495,7 @@
### in nt/, and its Posix do-nothing shadow.
install-:
install-nt:
- cd $(NTDIR) && $(MAKE) install
+ $(MAKE) -C $(NTDIR) install
## In the share directory, we are deleting:
## applications (with emacs.desktop, also found in etc/)
@@ -641,7 +641,7 @@
[ -f "$(DESTDIR)${infodir}/dir" ] || \
[ ! -f ${srcdir}/info/dir ] || \
${INSTALL_DATA} ${srcdir}/info/dir "$(DESTDIR)${infodir}/dir"; \
- info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
+ info_misc=`$(QUIET_SUBMAKE) $(MAKE) -s -C doc/misc echo-info`; \
cd ${srcdir}/info ; \
for elt in ${INFO_NONMISC} $${info_misc}; do \
test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
@@ -715,7 +715,7 @@
###
### Don't delete the lisp and etc directories if they're in the source tree.
uninstall: uninstall-$(NTDIR) uninstall-doc
- cd lib-src && $(MAKE) uninstall
+ $(MAKE) -C lib-src uninstall
-unset CDPATH; \
for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${etcdir}" ; do \
if [ -d "$${dir}" ]; then \
@@ -732,7 +732,7 @@
done
-rm -rf "$(DESTDIR)${libexecdir}/emacs/${version}"
thisdir=`/bin/pwd`; \
- (info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
+ (info_misc=`$(QUIET_SUBMAKE) $(MAKE) -s -C doc/misc echo-info`; \
if cd "$(DESTDIR)${infodir}"; then \
for elt in ${INFO_NONMISC} $${info_misc}; do \
(cd "$${thisdir}"; \
@@ -764,7 +764,7 @@
### in nt/, and its Posix do-nothing shadow.
uninstall-:
uninstall-nt:
- cd $(NTDIR) && $(MAKE) uninstall
+ $(MAKE) -C $(NTDIR) uninstall
# ==================== Cleaning up and miscellanea ====================
@@ -888,14 +888,14 @@
# even when the build directory and source dir are different.
.PHONY: TAGS tags
TAGS tags: lib lib-src src
- cd src && $(MAKE) tags
+ $(MAKE) -C src tags
check: all
@if test ! -d test/automated; then \
echo "You do not seem to have the test/ directory."; \
echo "Maybe you are using a release tarfile, rather than a repository
checkout."; \
else \
- cd test/automated && $(MAKE) check; \
+ $(MAKE) -C test/automated check; \
fi
dist:
@@ -909,7 +909,7 @@
DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS)
$(DOCS):
- t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $$2
+ t=$@; IFS=-; set $$t; IFS=; $(MAKE) -C doc/$$1 $$2
.PHONY: $(DOCS) docs pdf ps
.PHONY: info dvi dist check html info-real info-dir check-info
@@ -958,7 +958,7 @@
## Install non .info forms of the documentation.
## TODO add etc/refcards.
$(INSTALL_DOC):
- t=$@; IFS=-; set $$t; IFS=; cd doc/$$2 && $(MAKE) $$1-$$3
+ t=$@; IFS=-; set $$t; IFS=; $(MAKE) -C doc/$$2 $$1-$$3
.PHONY: $(INSTALL_DOC) install-doc
.PHONY: install-dvi install-html install-pdf install-ps
@@ -981,7 +981,7 @@
UNINSTALL_DOC = $(UNINSTALL_DVI) $(UNINSTALL_HTML) $(UNINSTALL_PDF)
$(UNINSTALL_PS)
$(UNINSTALL_DOC):
- t=$@; IFS=-; set $$t; IFS=; cd doc/$$2 && $(MAKE) $$1-$$3
+ t=$@; IFS=-; set $$t; IFS=; $(MAKE) -C doc/$$2 $$1-$$3
.PHONY: $(UNINSTALL_DOC) uninstall-doc
.PHONY: uninstall-dvi uninstall-html uninstall-pdf uninstall-ps
@@ -1058,4 +1058,4 @@
echo "You must build Emacs to use this command"; \
exit 1; \
fi
- cd lisp && $(MAKE) $@
+ $(MAKE) -C lisp $@
=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2014-06-15 00:17:21 +0000
+++ b/lib-src/ChangeLog 2014-06-15 00:34:22 +0000
@@ -1,5 +1,8 @@
2014-06-15 Glenn Morris <address@hidden>
+ * Makefile.in (../lib/libgnu.a):
+ Use `make -C' rather than `cd && make'.
+
* Makefile.in (bootstrap-clean): New.
2014-06-13 Glenn Morris <address@hidden>
=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in 2014-06-15 00:17:21 +0000
+++ b/lib-src/Makefile.in 2014-06-15 00:34:22 +0000
@@ -304,7 +304,7 @@
etags *.[ch]
../lib/libgnu.a: $(config_h)
- cd ../lib && $(MAKE) libgnu.a
+ $(MAKE) -C ../lib libgnu.a
regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
${CC} -c ${CPP_CFLAGS} ${srcdir}/../src/regex.c
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-06-15 00:06:30 +0000
+++ b/lisp/ChangeLog 2014-06-15 00:34:22 +0000
@@ -1,5 +1,7 @@
2014-06-15 Glenn Morris <address@hidden>
+ * Makefile.in (leim, semantic): Use `make -C' rather than `cd && make'.
+
* progmodes/cc-langs.el: Require cl-lib. (Bug#17463)
Replace delete-duplicates and mapcan by cl- versions throughout.
And cl-macroexpand-all by macroexpand-all.
=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in 2014-06-13 23:05:00 +0000
+++ b/lisp/Makefile.in 2014-06-15 00:34:22 +0000
@@ -348,7 +348,7 @@
.PHONY: leim semantic
leim:
- cd ../leim && $(MAKE) all EMACS="$(EMACS)"
+ $(MAKE) -C ../leim all EMACS="$(EMACS)"
# FIXME. Yuck.
semantic:
@@ -356,7 +356,7 @@
.*) EMACS="../${EMACS}" ;; \
*) EMACS="${EMACS}" ;; \
esac; \
- cd ../admin/grammars && $(MAKE) all EMACS="$${EMACS}"
+ $(MAKE) -C ../admin/grammars all EMACS="$${EMACS}"
# Compile all Lisp files, but don't recompile those that are up to
# date. Some .el files don't get compiled because they set the
=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog 2014-06-15 00:17:21 +0000
+++ b/lwlib/ChangeLog 2014-06-15 00:34:22 +0000
@@ -1,5 +1,7 @@
2014-06-15 Glenn Morris <address@hidden>
+ * Makefile.in ($(globals_h)): Use `make -C' rather than `cd && make'.
+
* Makefile.in (mostlyclean, clean, distclean, maintainer-clean):
Declare as PHONY.
(bootstrap-clean): New.
=== modified file 'lwlib/Makefile.in'
--- a/lwlib/Makefile.in 2014-06-15 00:17:21 +0000
+++ b/lwlib/Makefile.in 2014-06-15 00:34:22 +0000
@@ -80,7 +80,7 @@
src_h = $(config_h) $(lisp_h) $(globals_h)
$(globals_h):
- cd ../src && $(MAKE) globals.h
+ $(MAKE) -C ../src globals.h
lwlib-utils.o: $(src_h) lwlib-utils.c lwlib-utils.h lwlib.h
lwlib.o: $(src_h) lwlib.c lwlib.h lwlib-int.h lwlib-utils.h \
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-06-15 00:06:30 +0000
+++ b/src/ChangeLog 2014-06-15 00:34:22 +0000
@@ -1,3 +1,7 @@
+2014-06-15 Glenn Morris <address@hidden>
+
+ * Makefile.in: Use `make -C' rather than `cd && make' throughout.
+
2014-06-15 Eli Zaretskii <address@hidden>
* xdisp.c (Fmove_point_visually): Don't use the glyph matrix
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2014-06-13 23:05:00 +0000
+++ b/src/Makefile.in 2014-06-15 00:34:22 +0000
@@ -414,11 +414,11 @@
.PHONY: all
$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
- cd ../leim && $(MAKE) leim-list.el EMACS="$(bootstrap_exe)"
+ $(MAKE) -C ../leim leim-list.el EMACS="$(bootstrap_exe)"
$(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \
bootstrap-emacs$(EXEEXT)
- cd ../admin/unidata && $(MAKE) all EMACS="../$(bootstrap_exe)"
+ $(MAKE) -C ../admin/unidata all EMACS="../$(bootstrap_exe)"
## The dumped Emacs is as functional and more efficient than
## bootstrap-emacs, so we replace the latter with the former.
@@ -459,7 +459,7 @@
$(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) `sed -n -e 's|
\\\\||' -e 's|^[ ]*$$(lispsource)/||p' $(srcdir)/lisp.mk`
$(libsrc)/make-docfile$(EXEEXT):
- cd $(libsrc); $(MAKE) make-docfile$(EXEEXT)
+ $(MAKE) -C $(libsrc) make-docfile$(EXEEXT)
buildobj.h: Makefile
for i in $(ALLOBJS); do \
@@ -480,7 +480,7 @@
$(ALLOBJS): globals.h
$(lib)/libgnu.a: $(config_h)
- cd $(lib) && $(MAKE) libgnu.a
+ $(MAKE) -C $(lib) libgnu.a
## We have to create $(etc) here because init_cmdargs tests its
## existence when setting Vinstallation_directory (FIXME?).
@@ -499,9 +499,9 @@
## The following oldxmenu-related rules are only (possibly) used if
## HAVE_X11 && !USE_GTK, but there is no harm in always defining them.
$(lwlibdir)/liblw.a: $(config_h) globals.h lisp.h FORCE
- cd $(lwlibdir) && $(MAKE) liblw.a
+ $(MAKE) -C $(lwlibdir) liblw.a
$(oldXMenudir)/libXMenu11.a: FORCE
- cd $(oldXMenudir) && $(MAKE) libXMenu11.a
+ $(MAKE) -C $(oldXMenudir) libXMenu11.a
FORCE:
.PHONY: FORCE
@@ -519,7 +519,7 @@
-o $@ $(ntsource)/emacs.rc
ns-app: emacs$(EXEEXT)
- cd ../nextstep && $(MAKE) all
+ $(MAKE) -C ./nextstep all
.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
.PHONY: versionclean extraclean
@@ -578,10 +578,10 @@
## Arrange to make tags tables for ../lisp and ../lwlib,
## which the above TAGS file for the C files includes by reference.
../lisp/TAGS:
- cd ../lisp && $(MAKE) TAGS ETAGS="$(ETAGS)"
+ $(MAKE) -C ../lisp TAGS ETAGS="$(ETAGS)"
$(lwlibdir)/TAGS:
- cd $(lwlibdir) && $(MAKE) TAGS ETAGS="$(ETAGS)"
+ $(MAKE) -C $(lwlibdir) TAGS ETAGS="$(ETAGS)"
tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
.PHONY: tags
@@ -617,8 +617,7 @@
## separately below.
## With GNU Make, we would just say "%.el : %.elc $(BOOTSTRAPEMACS)"
.el.elc:
- @cd ../lisp && $(MAKE) compile-onefile \
- THEFILE=$< EMACS="$(bootstrap_exe)"
+ @$(MAKE) -C ../lisp compile-onefile THEFILE=$< EMACS="$(bootstrap_exe)"
## Since the .el.elc rule cannot specify an extra dependency, we do it here.
$(lisp): $(BOOTSTRAPEMACS)
@@ -629,12 +628,12 @@
VCSWITNESS =
$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS)
- cd ../lisp && $(MAKE) autoloads EMACS="$(bootstrap_exe)"
+ $(MAKE) -C ../lisp autoloads EMACS="$(bootstrap_exe)"
## Dump an Emacs executable named bootstrap-emacs containing the
## files from loadup.el in source form.
bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
- cd ../lisp && $(MAKE) update-subdirs
+ $(MAKE) -C ../lisp update-subdirs
if test "$(CANNOT_DUMP)" = "yes"; then \
rm -f bootstrap-emacs$(EXEEXT); \
ln temacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
@@ -644,7 +643,7 @@
mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
fi
@: Compile some files earlier to speed up further compilation.
- cd ../lisp && $(MAKE) compile-first EMACS="$(bootstrap_exe)"
+ $(MAKE) -C ../lisp compile-first EMACS="$(bootstrap_exe)"
## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk.
@deps_frag@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117337: Use `make -C' rather than `cd && make',
Glenn Morris <=