Commit f9d80c51 authored by Glenn Morris's avatar Glenn Morris

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.
parent d736dd56
2014-06-13 Glenn Morris <rgm@gnu.org>
* 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.
2014-06-11 Paul Eggert <eggert@cs.ucla.edu>
Use a shell function in configure.ac to cut down on code duplication.
......
This diff is collapsed.
2014-06-13 Glenn Morris <rgm@gnu.org>
* unidata/Makefile.in (${DSTDIR}/charprop.el):
GNU make automatically passes command-line arguments to sub-makes.
2014-06-02 Paul Eggert <eggert@cs.ucla.edu>
Include sources used to create macuvs.h.
......
......@@ -52,7 +52,7 @@ compile: ${srcdir}/unidata-gen.elc
## uni-*.el files just because .elc is missing.
## Same for UnicodeData.txt v unidata.txt.
${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt
${MAKE} ${MFLAGS} compile unidata.txt EMACS="${EMACS}"
${MAKE} compile unidata.txt EMACS="${EMACS}"
-if [ -f "$@" ]; then \
cd ${DSTDIR} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \
fi
......
2014-06-13 Glenn Morris <rgm@gnu.org>
* Makefile.in (../lib/libgnu.a):
GNU make automatically passes command-line arguments to sub-makes.
2014-05-26 Eli Zaretskii <eliz@gnu.org>
* ntlib.h (lseek): Don't redirect to _lseek.
......
......@@ -304,7 +304,7 @@ TAGS: etags${EXEEXT}
etags *.[ch]
../lib/libgnu.a: $(config_h)
cd ../lib && $(MAKE) $(MFLAGS) libgnu.a
cd ../lib && $(MAKE) libgnu.a
regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
${CC} -c ${CPP_CFLAGS} ${srcdir}/../src/regex.c
......
2014-06-13 Glenn Morris <rgm@gnu.org>
* 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.
* calendar/calendar.el (calendar-generate-window):
Remove pointless call to font-lock-fontify-buffer.
......
......@@ -168,7 +168,7 @@ doit:
# since they will never contain any useful information
# (see finder-no-scan-regexp and custom-dependencies-no-scan-regexp).
$(lisp)/cus-load.el:
$(MAKE) $(MFLAGS) custom-deps
$(MAKE) custom-deps
custom-deps: doit
$(setwins_almost); \
echo Directories: $$wins; \
......@@ -177,7 +177,7 @@ custom-deps: doit
-f custom-make-dependencies $$wins
$(lisp)/finder-inf.el:
$(MAKE) $(MFLAGS) finder-data
$(MAKE) finder-data
finder-data: doit
$(setwins_finder); \
echo Directories: $$wins; \
......@@ -200,7 +200,7 @@ autoloads: $(LOADDEFS) doit
--eval '(setq autoload-builtin-package-versions t)' \
--eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(srcdir)/loaddefs.el")))' \
-f batch-update-autoloads $$wins
$(MAKE) $(MFLAGS) obsolete-autoloads
$(MAKE) obsolete-autoloads
# The obsolete/ subdirectory is normally not scanned for autoloads.
# Sometimes we still want to autoload something from that directory,
......@@ -215,7 +215,7 @@ obsolete-autoloads: ${lisp}/obsolete/*.el
# This is required by the bootstrap-emacs target in ../src/Makefile, so
# we know that if we have an emacs executable, we also have a subdirs.el.
$(lisp)/subdirs.el:
$(MAKE) $(MFLAGS) update-subdirs
$(MAKE) update-subdirs
update-subdirs: doit
$(setwins_for_subdirs); \
for file in $$wins; do \
......@@ -307,7 +307,7 @@ compile-onefile:
compile-first: $(COMPILE_FIRST)
# In `compile-main' we could directly do
# ... | xargs $(MAKE) $(MFLAGS) EMACS="$(EMACS)"
# ... | xargs $(MAKE) EMACS="$(EMACS)"
# and it works, but it generates a lot of messages like
# make[2]: gnus/gnus-mlspl.elc is up to date.
# so instead, we use "xargs echo" to split the list of file into manageable
......@@ -331,7 +331,7 @@ compile-main: leim semantic compile-clean
echo "$${el}c"; \
done | xargs $(XARGS_LIMIT) echo) | \
while read chunk; do \
$(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
$(MAKE) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
done
.PHONY: compile-clean
......@@ -348,7 +348,7 @@ compile-clean:
.PHONY: leim semantic
leim:
cd ../leim && $(MAKE) $(MFLAGS) all EMACS="$(EMACS)"
cd ../leim && $(MAKE) all EMACS="$(EMACS)"
# FIXME. Yuck.
semantic:
......@@ -356,7 +356,7 @@ semantic:
.*) EMACS="../${EMACS}" ;; \
*) EMACS="${EMACS}" ;; \
esac; \
cd ../admin/grammars && $(MAKE) $(MFLAGS) all EMACS="$${EMACS}"
cd ../admin/grammars && $(MAKE) 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
......@@ -365,14 +365,14 @@ semantic:
# Explicitly pass EMACS (sometimes ../src/bootstrap-emacs) to those
# sub-makes that run rules that use it, for the sake of some non-GNU makes.
compile: $(LOADDEFS) autoloads compile-first
$(MAKE) $(MFLAGS) compile-main EMACS="$(EMACS)"
$(MAKE) compile-main EMACS="$(EMACS)"
# Compile all Lisp files. This is like `compile' but compiles files
# unconditionally. Some files don't actually get compiled because they
# set the local variable no-byte-compile.
compile-always: doit
cd $(lisp) && rm -f *.elc */*.elc */*/*.elc */*/*/*.elc
$(MAKE) $(MFLAGS) compile EMACS="$(EMACS)"
$(MAKE) compile EMACS="$(EMACS)"
.PHONY: backup-compiled-files compile-after-backup
......
2014-06-13 Glenn Morris <rgm@gnu.org>
* Makefile.in ($(globals_h)):
GNU make automatically passes command-line arguments to sub-makes.
2014-06-04 Dmitry Antipov <dmantipov@yandex.ru>
* lwlib-widget.h (widget_value) [USE_X_TOOLKIT]: Use X toolkit
......
......@@ -80,7 +80,7 @@ globals_h = ../src/globals.h
src_h = $(config_h) $(lisp_h) $(globals_h)
$(globals_h):
cd ../src && $(MAKE) $(MFLAGS) globals.h
cd ../src && $(MAKE) 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 \
......
2014-06-13 Glenn Morris <rgm@gnu.org>
* 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.
2014-06-13 Paul Eggert <eggert@cs.ucla.edu>
Avoid hangs in accept-process-output (Bug#17647).
......
......@@ -414,11 +414,11 @@ all: emacs$(EXEEXT) $(OTHER_FILES)
.PHONY: all
$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
cd ../leim && $(MAKE) $(MFLAGS) leim-list.el EMACS="$(bootstrap_exe)"
cd ../leim && $(MAKE) leim-list.el EMACS="$(bootstrap_exe)"
$(srcdir)/macuvs.h $(lispsource)/international/charprop.el: \
bootstrap-emacs$(EXEEXT)
cd ../admin/unidata && $(MAKE) $(MFLAGS) all EMACS="../$(bootstrap_exe)"
cd ../admin/unidata && $(MAKE) 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 @@ $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp)
$(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) $(MFLAGS) make-docfile$(EXEEXT)
cd $(libsrc); $(MAKE) make-docfile$(EXEEXT)
buildobj.h: Makefile
for i in $(ALLOBJS); do \
......@@ -499,13 +499,9 @@ temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \
## 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) $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' MAKE='$(MAKE)' \
liblw.a
cd $(lwlibdir) && $(MAKE) liblw.a
$(oldXMenudir)/libXMenu11.a: FORCE
cd $(oldXMenudir) && \
$(MAKE) $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' MAKE='$(MAKE)' \
libXMenu11.a
cd $(oldXMenudir) && $(MAKE) libXMenu11.a
FORCE:
.PHONY: FORCE
......@@ -523,7 +519,7 @@ emacs.res: $(ntsource)/emacs.rc \
-o $@ $(ntsource)/emacs.rc
ns-app: emacs$(EXEEXT)
cd ../nextstep && $(MAKE) $(MFLAGS) all
cd ../nextstep && $(MAKE) all
.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
.PHONY: versionclean extraclean
......@@ -621,7 +617,7 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
## separately below.
## With GNU Make, we would just say "%.el : %.elc $(BOOTSTRAPEMACS)"
.el.elc:
@cd ../lisp; $(MAKE) $(MFLAGS) compile-onefile \
@cd ../lisp && $(MAKE) compile-onefile \
THEFILE=$< EMACS="$(bootstrap_exe)"
## Since the .el.elc rule cannot specify an extra dependency, we do it here.
......@@ -633,12 +629,12 @@ $(lisp): $(BOOTSTRAPEMACS)
VCSWITNESS =
$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS)
cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS="$(bootstrap_exe)"
cd ../lisp && $(MAKE) 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) $(MFLAGS) update-subdirs
cd ../lisp && $(MAKE) update-subdirs
if test "$(CANNOT_DUMP)" = "yes"; then \
rm -f bootstrap-emacs$(EXEEXT); \
ln temacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
......@@ -648,7 +644,7 @@ bootstrap-emacs$(EXEEXT): temacs$(EXEEXT)
mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \
fi
@: Compile some files earlier to speed up further compilation.
cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS="$(bootstrap_exe)"
cd ../lisp && $(MAKE) compile-first EMACS="$(bootstrap_exe)"
## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk.
@deps_frag@
......
2014-06-13 Glenn Morris <rgm@gnu.org>
* automated/Makefile.in (compile-main):
GNU make automatically passes command-line arguments to sub-makes.
2014-06-05 Michal Nazarewicz <mina86@mina86.com>
* automated/tildify-tests.el (tildify-test--test): Optimise the test
......
......@@ -84,7 +84,7 @@ compile-main: compile-clean
echo "$${el}c"; \
done | xargs $(XARGS_LIMIT) echo | \
while read chunk; do \
$(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
$(MAKE) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
done
# Erase left-over .elc files that do not have a corresponding .el file.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment