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.

Makefile

@@ -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

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)

targets.mk

@@ -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