mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 22:07:49 +00:00
provide an easier way to get the old behaviour of plain "make" back
* Makefile: move setup includes to top * lisp/Makefile: reduce verbosity of org-version.el target, add a more friendly @echo instead. * targets.mk: provide compatibility target "oldorg" to do "compile autoloads info" which is closest to the old behaviour.
This commit is contained in:
parent
c5377f6034
commit
c83da85416
8
Makefile
8
Makefile
|
@ -2,7 +2,11 @@
|
||||||
#
|
#
|
||||||
# This file is not part of GNU Emacs
|
# This file is not part of GNU Emacs
|
||||||
|
|
||||||
# default target is "all"
|
# set up environment
|
||||||
|
include default.mk # defaults, customizable via "local.mk"
|
||||||
|
-include local.mk # optional local customization, use default.mk as template
|
||||||
|
|
||||||
|
# default target is "all" unless overridden in local.mk
|
||||||
all::
|
all::
|
||||||
|
|
||||||
# Describe valid make targets for org-mode.
|
# Describe valid make targets for org-mode.
|
||||||
|
@ -34,6 +38,4 @@ targets help:
|
||||||
$(info make clean-install - remove installed Org ELisp and documentation files)
|
$(info make clean-install - remove installed Org ELisp and documentation files)
|
||||||
@echo ""
|
@echo ""
|
||||||
|
|
||||||
include default.mk # defaults, customizable via "local.mk"
|
|
||||||
-include local.mk # optional local customization, use default.mk as template
|
|
||||||
include targets.mk # toplevel make machinery
|
include targets.mk # toplevel make machinery
|
||||||
|
|
|
@ -54,7 +54,8 @@ compile-dirty: cleanauto org-version.el
|
||||||
autoloads: $(LISPO)
|
autoloads: $(LISPO)
|
||||||
|
|
||||||
org-version.el: $(LISPF)
|
org-version.el: $(LISPF)
|
||||||
$(ORG-VERSION)
|
@echo "org-version: $(ORGVERSION) ($(GITVERSION))"
|
||||||
|
@$(ORG-VERSION)
|
||||||
|
|
||||||
org-install.el: org-version.el
|
org-install.el: org-version.el
|
||||||
$(ORG-INSTALL)
|
$(ORG-INSTALL)
|
||||||
|
|
|
@ -20,11 +20,14 @@ ifneq ($(GITSTATUS),)
|
||||||
GITVERSION := $(GITVERSION).dirty
|
GITVERSION := $(GITVERSION).dirty
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: default all up2 update compile lisp doc etc \
|
.PHONY: default all oldorg up2 update compile lisp doc etc \
|
||||||
check test install info html pdf card docs $(INSTSUB) \
|
check test install info html pdf card docs $(INSTSUB) \
|
||||||
autoloads cleanall clean cleancontrib cleanrel clean-install \
|
autoloads cleanall clean cleancontrib cleanrel clean-install \
|
||||||
cleanelc cleandirs cleanlisp cleandoc cleandocs cleantest
|
cleanelc cleandirs cleanlisp cleandoc cleandocs cleantest
|
||||||
|
|
||||||
|
# backwards compatibility target
|
||||||
|
oldorg: compile autoloads info
|
||||||
|
|
||||||
all \
|
all \
|
||||||
compile:: lisp
|
compile:: lisp
|
||||||
$(MAKE) -C $< clean
|
$(MAKE) -C $< clean
|
||||||
|
|
Loading…
Reference in a new issue