ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Achim Gratz 2012-09-29 10:49:20 +02:00
parent 6e61cfc80f e6228c448e
commit 9ab8cb1196
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -49,6 +49,7 @@ helpall::
help helpall:: help helpall::
$(info make config - check main configuration) $(info make config - check main configuration)
helpall:: helpall::
$(info make config-version - check Org version)
$(info make config-test - check test configuration) $(info make config-test - check test configuration)
$(info make config-exe - check executables configuration) $(info make config-exe - check executables configuration)
$(info make config-cmd - check command configuration) $(info make config-cmd - check command configuration)

11
mk/default.mk
View File

@ -67,9 +67,16 @@ BTEST = $(BATCH) \
# BATCH = $(EMACS) -batch -vanilla # XEmacs # BATCH = $(EMACS) -batch -vanilla # XEmacs
BATCH = $(EMACS) -batch -Q BATCH = $(EMACS) -batch -Q
# Emacs must be started in toplevel directory
BATCHO = $(BATCH) \
--eval '(add-to-list '"'"'load-path "./lisp")'
# How to show Org version
SHOWVER = $(BATCHO) \
--eval '(org-version nil '"'"'full '"'"'message)'
# How to generate local.mk # How to generate local.mk
MAKE_LOCAL_MK = $(BATCH) \ MAKE_LOCAL_MK = $(BATCHO) \
--eval '(add-to-list '"'"'load-path "./lisp")' \
--eval '(load "org-compat.el")' \ --eval '(load "org-compat.el")' \
--eval '(load "../mk/org-fixup.el")' \ --eval '(load "../mk/org-fixup.el")' \
--eval '(org-make-local-mk)' --eval '(org-make-local-mk)'

7
mk/targets.mk
View File

@ -31,7 +31,7 @@ endif
clean-install cleanelc cleandirs cleanaddcontrib \ clean-install cleanelc cleandirs cleanaddcontrib \
cleanlisp cleandoc cleandocs cleantest \ cleanlisp cleandoc cleandocs cleantest \
compile compile-dirty uncompiled \ compile compile-dirty uncompiled \
config config-test config-exe config-all config-eol config config-test config-exe config-all config-eol config-version
CONF_BASE = EMACS DESTDIR ORGCM ORG_MAKE_DOC CONF_BASE = EMACS DESTDIR ORGCM ORG_MAKE_DOC
CONF_DEST = lispdir infodir datadir testdir CONF_DEST = lispdir infodir datadir testdir
@ -64,7 +64,10 @@ config-cmd config-all::
$(info ) $(info )
$(info ========= Commands used by make) $(info ========= Commands used by make)
$(foreach var,$(CONF_CALL),$(info $(var) = $($(var))$(EOL))) $(foreach var,$(CONF_CALL),$(info $(var) = $($(var))$(EOL)))
config config-test config-exe config-all:: config config-test config-exe config-all config-version::
$(info ========= Org version)
$(info make: Org-mode version $(ORGVERSION) ($(GITVERSION) => $(lispdir)))
@echo -n "emacs: " ; $(SHOWVER)
@echo "" @echo ""
oldorg: compile info # what the old makefile did when no target was specified oldorg: compile info # what the old makefile did when no target was specified