diff options
| author | Glenn Morris | 2014-06-13 19:05:00 -0400 |
|---|---|---|
| committer | Glenn Morris | 2014-06-13 19:05:00 -0400 |
| commit | f9d80c51100e230f37df6bd3864e607f6b145cc7 (patch) | |
| tree | b0f6c6785c47ece7d74f52d44b03842a51fd00c1 /lisp | |
| parent | d736dd563056e3cac9f006d186ca018525f8b36a (diff) | |
| download | emacs-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 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/Makefile.in | 20 |
2 files changed, 15 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0d4bfe84ac2..1ce8092f79e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2014-06-13 Glenn Morris <rgm@gnu.org> | 1 | 2014-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 |
| 172 | custom-deps: doit | 172 | custom-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 |
| 181 | finder-data: doit | 181 | finder-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 |
| 219 | update-subdirs: doit | 219 | update-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: | |||
| 307 | compile-first: $(COMPILE_FIRST) | 307 | compile-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 |
| 350 | leim: | 350 | leim: |
| 351 | cd ../leim && $(MAKE) $(MFLAGS) all EMACS="$(EMACS)" | 351 | cd ../leim && $(MAKE) all EMACS="$(EMACS)" |
| 352 | 352 | ||
| 353 | # FIXME. Yuck. | 353 | # FIXME. Yuck. |
| 354 | semantic: | 354 | semantic: |
| @@ -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. |
| 367 | compile: $(LOADDEFS) autoloads compile-first | 367 | compile: $(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. |
| 373 | compile-always: doit | 373 | compile-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 | ||