diff options
author | Achim Gratz <Stromeko@Stromeko.DE> | 2012-04-21 17:25:35 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-04-21 17:38:49 +0200 |
commit | c83da854168aeae898f248f72e5872e3c19e39fe (patch) | |
tree | 17f51a2786ac854ee4a920400bacbc0ea126ee6a | |
parent | c5377f6034de4f787663eaa8af021052ddea4d51 (diff) | |
download | org-mode-c83da854168aeae898f248f72e5872e3c19e39fe.tar.gz |
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.
-rw-r--r-- | Makefile | 8 | ||||
-rw-r--r-- | lisp/Makefile | 3 | ||||
-rw-r--r-- | targets.mk | 5 |
3 files changed, 11 insertions, 5 deletions
@@ -2,7 +2,11 @@ # # 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:: # Describe valid make targets for org-mode. @@ -34,6 +38,4 @@ targets help: $(info make clean-install - remove installed Org ELisp and documentation files) @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 diff --git a/lisp/Makefile b/lisp/Makefile index 65b9e29..ed02a95 100644 --- a/lisp/Makefile +++ b/lisp/Makefile @@ -54,7 +54,8 @@ compile-dirty: cleanauto org-version.el autoloads: $(LISPO) org-version.el: $(LISPF) - $(ORG-VERSION) + @echo "org-version: $(ORGVERSION) ($(GITVERSION))" + @$(ORG-VERSION) org-install.el: org-version.el $(ORG-INSTALL) @@ -20,11 +20,14 @@ ifneq ($(GITSTATUS),) GITVERSION := $(GITVERSION).dirty 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) \ autoloads cleanall clean cleancontrib cleanrel clean-install \ cleanelc cleandirs cleanlisp cleandoc cleandocs cleantest +# backwards compatibility target +oldorg: compile autoloads info + all \ compile:: lisp $(MAKE) -C $< clean |