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

168 lines
4.5 KiB
Makefile
Raw Normal View History

cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition * UTILITIES/org-fixup.el: new file, has functions to create org-version.el and org-install.el, now use by the build system. * lisp/Makefile: delete said definitions, now sourced from toplevel make. "clean" and "cleanall" should do the same thing here, make them aliases, ditto for "all" and "compile". Both autoload files must be .PHONY and depend only on each other for correct ordering. Make "compile-dirty" actually do that again (i.e. no implied "clean", but "cleanauto"). Remove autoload files directly after install, so that they will only be present when explicitly requested by "autoloads". Create "org-version.el" before compilation as it is mandatory. Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION), source from default.mk/local.mk. * default.mk: move definitions for $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION) here so that they can be more easily configured. Remove definition of "org-release" from $(BATCH) and $(BTEST), now sourced from "org-version.el". * targets.mk: target reorganization, introduce "stop" targets to prevent cleaning of org-version.el. Use new targets for "oldorg" to make it more robust in case of errors. New target "cleanutils" to remove any "*.elc" files that may have been produced there and add this target to "cleanall". Do the same in cleancontrib.
2012-04-28 13:24:39 -04:00
.EXPORT_ALL_VARIABLES:
shuffle targets to their correct place, harden recipes * Makefile: declare phony targets, remove help text for install-info-debian * default.mk: add variable for FIND and RM * targets.mk, maint-targets.mk: shuffle targets to where they belong, declare phony targets, work around a texi2dvi bug, use pattern rules, use targets for dependencies instead of repeating them verbatim
2011-07-12 16:31:41 -04:00
.NOTPARALLEL: .PHONY
Split off Makefile into several parts, included from master Makefile * Makefile: just keep help target (now also default for no target) and include all other parts from here. * default.mk: user editable variables with their default values * maint.mk: definitions by maintainer, should not be touched by user * targets.mk: user callable targets * maint-targets.mk: targets for maintenance, should not be called by user * dependencies.mk: keep order during compile (could become auto-generated) This is the first in a series of patches that restructures the Makefile to achieve easier customization and separation of different concerns (mainly user vs. maintenance of the distribution). This first patch simply establishes a set of files without changing anything else to provide a clean starting point. It uses GNU make extensions since Makefile already depends on GNU make anyway.
2011-07-12 13:45:59 -04:00
# Additional distribution files
DISTFILES_extra= Makefile request-assign-future.txt contrib etc
Do not croak when git is not available targets.mk: if no .git directory is present, assume that Git is not available. Make ORGVERSION, GITVERSION and GITSTATUS customizable from local.mk (override from command line is also possible and probably easier)
2012-01-02 15:24:36 -05:00
LISPDIRS = lisp
cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition * UTILITIES/org-fixup.el: new file, has functions to create org-version.el and org-install.el, now use by the build system. * lisp/Makefile: delete said definitions, now sourced from toplevel make. "clean" and "cleanall" should do the same thing here, make them aliases, ditto for "all" and "compile". Both autoload files must be .PHONY and depend only on each other for correct ordering. Make "compile-dirty" actually do that again (i.e. no implied "clean", but "cleanauto"). Remove autoload files directly after install, so that they will only be present when explicitly requested by "autoloads". Create "org-version.el" before compilation as it is mandatory. Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION), source from default.mk/local.mk. * default.mk: move definitions for $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION) here so that they can be more easily configured. Remove definition of "org-release" from $(BATCH) and $(BTEST), now sourced from "org-version.el". * targets.mk: target reorganization, introduce "stop" targets to prevent cleaning of org-version.el. Use new targets for "oldorg" to make it more robust in case of errors. New target "cleanutils" to remove any "*.elc" files that may have been produced there and add this target to "cleanall". Do the same in cleancontrib.
2012-04-28 13:24:39 -04:00
OTHERDIRS = doc etc
Makefile: fix some errors * targets.mk: Repair .PHONY target. Correctly group ORed parameters in find calls. Introduce $(CLEANDIRS) and use variable instead of literals. Have a command succeed at the end of `config-*´ so that no spurious warning is given by make.
2012-08-19 12:54:15 -04:00
CLEANDIRS = contrib testing UTILITIES
cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition * UTILITIES/org-fixup.el: new file, has functions to create org-version.el and org-install.el, now use by the build system. * lisp/Makefile: delete said definitions, now sourced from toplevel make. "clean" and "cleanall" should do the same thing here, make them aliases, ditto for "all" and "compile". Both autoload files must be .PHONY and depend only on each other for correct ordering. Make "compile-dirty" actually do that again (i.e. no implied "clean", but "cleanauto"). Remove autoload files directly after install, so that they will only be present when explicitly requested by "autoloads". Create "org-version.el" before compilation as it is mandatory. Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION), source from default.mk/local.mk. * default.mk: move definitions for $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION) here so that they can be more easily configured. Remove definition of "org-release" from $(BATCH) and $(BTEST), now sourced from "org-version.el". * targets.mk: target reorganization, introduce "stop" targets to prevent cleaning of org-version.el. Use new targets for "oldorg" to make it more robust in case of errors. New target "cleanutils" to remove any "*.elc" files that may have been produced there and add this target to "cleanall". Do the same in cleancontrib.
2012-04-28 13:24:39 -04:00
SUBDIRS = $(OTHERDIRS) $(LISPDIRS)
Do not croak when git is not available targets.mk: if no .git directory is present, assume that Git is not available. Make ORGVERSION, GITVERSION and GITSTATUS customizable from local.mk (override from command line is also possible and probably easier)
2012-01-02 15:24:36 -05:00
INSTSUB = $(SUBDIRS:%=install-%)
allow customization of the "doc" target to skip certain types of documentation * doc/Makefile: read targets to make for "doc" from $(ORG_MAKE_DOC), defaults to "info html pdf"; can be overridden by the user in local.mk. * targets.mk: read targets to make for "doc" and "docs" from $(ORG_MAKE_DOC), defaults to "info html pdf"; can be overridden by the user in local.mk. * default.mk: document ORG_MAKE_DOC and provide a (commented) example of how to have make only produce info documentation.
2012-04-22 02:22:31 -04:00
ORG_MAKE_DOC ?= info html pdf
Do not croak when git is not available targets.mk: if no .git directory is present, assume that Git is not available. Make ORGVERSION, GITVERSION and GITSTATUS customizable from local.mk (override from command line is also possible and probably easier)
2012-01-02 15:24:36 -05:00
Makefile: adding files from contrib * default.mk: Add customizatin variable ORG_ADD_CONTRIB with descriptiona and commented example. * targets.mk: Strip leading path and trailing suffix from all elements of ORG_ADD_CONTRIB, then prefix with contrib/lisp and do wildcard expansion (this will also remove any invalid names); store the result in ORG_FROM_CONTRIB. Strip /contrib from ORG_FROM_CONTRIB and store the result in ORG_TO_LISP. If these are non-empty, copy the files from contrib/lisp/ into lisp/ before compilation and remove them when cleanlisp is called.
2012-08-22 02:04:56 -04:00
ORG_FROM_CONTRIB = $(wildcard \
$(addsuffix .el, \
$(addprefix contrib/lisp/, \
$(basename \
$(notdir $(ORG_ADD_CONTRIB))))))
ORG_TO_LISP = $(ORG_FROM_CONTRIB:contrib/%=%)
Do not croak when git is not available targets.mk: if no .git directory is present, assume that Git is not available. Make ORGVERSION, GITVERSION and GITSTATUS customizable from local.mk (override from command line is also possible and probably easier)
2012-01-02 15:24:36 -05:00
ifneq ($(wildcard .git),)
GITVERSION ?= $(shell git describe --abbrev=6 HEAD)
ORGVERSION ?= $(subst release_,,$(shell git describe --abbrev=0 HEAD))
GITSTATUS ?= $(shell git status -uno --porcelain)
else
GITVERSION ?= N/A
ORGVERSION ?= N/A
endif
DATE = $(shell date +%Y-%m-%d)
ifneq ($(GITSTATUS),)
avoid accumulation of the ".dirty" suffix on $(GITVERSION) during sub-make invocations * targets.mk: Strip ".dirty" suffix from $(GITVERSION) before potentially re-adding it, to avoid accumulation of the suffix during sub-make invocations.
2012-05-17 04:40:54 -04:00
GITVERSION := $(GITVERSION:.dirty=).dirty
move all version strings into org-install.el * targets.mk: check for release and git version and record this into environment variables for use in sub-make invocations; add new target "compile-dirty" that does not invoke "make clean" first * doc/Makefile, lisp/Makefile: remove git version check, since they are now provided by first-level make * lisp/Makefile: add insertion of version information into org-install.el, have org-install.el depend on LISPF rather than LISPC so that autoloads can be produced without compiling everything and remove insertion into org.el and re-compilation during install; add new target "compile-dirty" to support invocation from first-level make * lisp/org.el (org-version): remove determination of version information, show "N/A" if the information is not provided via org-install.el
2011-11-06 11:53:45 -05:00
endif
Makefile: implement different compilation methods, rename _COMPILE_ to ORGCM * default.mk, targets.mk, lisp/Makefile: Rename _COMPILE_ to ORGCM. * default.mk: Define ORGCM=dirall, show other possible values as comments * targets.mk: Implement target `single´, temporarily set ORGCM (overriding configuration). Show newly introduced configuration variables with `check-*´. * lisp/Makefile: Implement dispatch for compile based on ORGCM. Output header that contains the target for easier debugging. * Makefile: Document target `single´.
2012-08-19 06:21:33 -04:00
.PHONY: all oldorg update update2 up0 up1 up2 single $(SUBDIRS) \
check test install $(INSTSUB) \
info html pdf card refcard doc docs \
Makefile: fix some errors * targets.mk: Repair .PHONY target. Correctly group ORed parameters in find calls. Introduce $(CLEANDIRS) and use variable instead of literals. Have a command succeed at the end of `config-*´ so that no spurious warning is given by make.
2012-08-19 12:54:15 -04:00
autoloads cleanall clean $(CLEANDIRS:%=clean%) \
Revert "server.mk: implement `cleanrel´ here" This reverts commit ddcf4f851154e8b13065cb8de162470827b04ca1.
2012-08-23 06:31:44 -04:00
cleanrel clean-install cleanelc cleandirs \
Makefile: fix whitespace error * targets.mk: Fix whitespace error.
2012-07-15 12:21:42 -04:00
cleanlisp cleandoc cleandocs cleantest \
Revert "Revert "Makefile: allow for different compilation methods"" This reverts commit 510f6464b06932406051fd0983586f6c1680e098.
2012-08-19 06:20:47 -04:00
compile compile-dirty uncompiled \
Add configuration checks to build system * targets.mk: Add targets "config", "config-test", "config-exe", "config-cmd", "config-all" and "config-eol" (all .PHONY). These echo various configuration dependent variables so they can be more easily checked for correctness. * Makefile: Document the new targets, "config" with "help" and the rest with "helpall".
2012-06-02 07:32:53 -04:00
config config-test config-exe config-all config-eol
Makefile: implement different compilation methods, rename _COMPILE_ to ORGCM * default.mk, targets.mk, lisp/Makefile: Rename _COMPILE_ to ORGCM. * default.mk: Define ORGCM=dirall, show other possible values as comments * targets.mk: Implement target `single´, temporarily set ORGCM (overriding configuration). Show newly introduced configuration variables with `check-*´. * lisp/Makefile: Implement dispatch for compile based on ORGCM. Output header that contains the target for easier debugging. * Makefile: Document target `single´.
2012-08-19 06:21:33 -04:00
CONF_BASE = EMACS DESTDIR ORGCM
show DESTDIR in make config * targets.mk: Show $(DESTDIR) in 'make config'.
2012-07-17 13:54:51 -04:00
CONF_DEST = lispdir infodir datadir testdir
Add configuration checks to build system * targets.mk: Add targets "config", "config-test", "config-exe", "config-cmd", "config-all" and "config-eol" (all .PHONY). These echo various configuration dependent variables so they can be more easily checked for correctness. * Makefile: Document the new targets, "config" with "help" and the rest with "helpall".
2012-06-02 07:32:53 -04:00
CONF_TEST = BTEST_PRE BTEST_POST BTEST_OB_LANGUAGES BTEST_EXTRA
CONF_EXEC = CP MKDIR RM RMR FIND SUDO PDFTEX TEXI2PDF TEXI2HTML MAKEINFO INSTALL_INFO
Makefile: implement different compilation methods, rename _COMPILE_ to ORGCM * default.mk, targets.mk, lisp/Makefile: Rename _COMPILE_ to ORGCM. * default.mk: Define ORGCM=dirall, show other possible values as comments * targets.mk: Implement target `single´, temporarily set ORGCM (overriding configuration). Show newly introduced configuration variables with `check-*´. * lisp/Makefile: Implement dispatch for compile based on ORGCM. Output header that contains the target for easier debugging. * Makefile: Document target `single´.
2012-08-19 06:21:33 -04:00
CONF_CALL = BATCH BATCHL ELC ELCDIR BTEST MAKE_LOCAL_MK MAKE_ORG_INSTALL MAKE_ORG_VERSION
Add configuration checks to build system * targets.mk: Add targets "config", "config-test", "config-exe", "config-cmd", "config-all" and "config-eol" (all .PHONY). These echo various configuration dependent variables so they can be more easily checked for correctness. * Makefile: Document the new targets, "config" with "help" and the rest with "helpall".
2012-06-02 07:32:53 -04:00
config-eol:: EOL = \#
config-eol:: config-all
config config-all::
$(info )
$(info ========= Emacs executable and Installation paths)
$(foreach var,$(CONF_BASE),$(info $(var) = $($(var))$(EOL)))
show DESTDIR in make config * targets.mk: Show $(DESTDIR) in 'make config'.
2012-07-17 13:54:51 -04:00
$(foreach var,$(CONF_DEST),$(info $(var) = $(DESTDIR)$($(var))$(EOL)))
Makefile: adding files from contrib * default.mk: Add customizatin variable ORG_ADD_CONTRIB with descriptiona and commented example. * targets.mk: Strip leading path and trailing suffix from all elements of ORG_ADD_CONTRIB, then prefix with contrib/lisp and do wildcard expansion (this will also remove any invalid names); store the result in ORG_FROM_CONTRIB. Strip /contrib from ORG_FROM_CONTRIB and store the result in ORG_TO_LISP. If these are non-empty, copy the files from contrib/lisp/ into lisp/ before compilation and remove them when cleanlisp is called.
2012-08-22 02:04:56 -04:00
$(info ========= Additional files from contrib/lisp)
$(info ORG_FROM_CONTRIB =)
$(info $(ORG_TO_LISP:lisp/%=%))
Add configuration checks to build system * targets.mk: Add targets "config", "config-test", "config-exe", "config-cmd", "config-all" and "config-eol" (all .PHONY). These echo various configuration dependent variables so they can be more easily checked for correctness. * Makefile: Document the new targets, "config" with "help" and the rest with "helpall".
2012-06-02 07:32:53 -04:00
config-test config-all::
$(info )
$(info ========= Test configuration)
$(foreach var,$(CONF_TEST),$(info $(var) = $($(var))$(EOL)))
config-exe config-all::
$(info )
$(info ========= Executables used by make)
$(foreach var,$(CONF_EXEC),$(info $(var) = $($(var))$(EOL)))
config-cmd config-all::
$(info )
$(info ========= Commands used by make)
$(foreach var,$(CONF_CALL),$(info $(var) = $($(var))$(EOL)))
config config-test config-exe config-all::
Makefile: fix some errors * targets.mk: Repair .PHONY target. Correctly group ORed parameters in find calls. Introduce $(CLEANDIRS) and use variable instead of literals. Have a command succeed at the end of `config-*´ so that no spurious warning is given by make.
2012-08-19 12:54:15 -04:00
@echo ""
Introduce compatibility and convenience targets, local.mk template, add "helpall" * Makefile: new target "helpall" to document all targets, while "help" continues to show a brief subset. * default.mk: add cutlines for sed to produce local.mk with. * targets.mk: add target "local.mk" to produce an (empty) local.mk configuration template when it isn't already present. Ignore any error when making this target since sed might not be present on all systems. Redefine target "update" to not include testing, similarly add target "update2" to additionally install without test. Add targets "up0" to stop after git pull and "up1" to stop after test, while "up2" continues to do everything and then installs. Complete .PHONY target list. Add "refcard" target for compatibility with old make. Clean contrib in "cleanall", too.
2012-04-23 15:20:58 -04:00
clean up Makefile some more, keep autoloads around * lisp/Makefile: remove stop targets, make autoloads depend on source files again (not .PHONY). Keep autoload files around after compile, but make sure to re-create them before installation and compile. Remove autoload files before re-creating them to avoid errors from Emacs when saving the buffer. * targets.mk: remove stop targets and the mess that was necessary to support them. * default.mk: must use $(CURDIR) not $(PWD), $(PWD) is not well defined when using sudo.
2012-04-30 00:49:23 -04:00
oldorg: compile info # what the old makefile did when no target was specified
Improve compatibility with old Makefile * targets.mk: change the "local.mk" template so that "oldorg" will be the default target for maximum compatibility. Admonish info message with a reminder to use "make help" for more information on targets and that "oldorg" is the default target for now. Add new convenience target "uncompiled" that will keep the lisp directory free from *.elc files and the autoload files up-to-date. * Makefile: make "targets" and "helpall" depend on "help" so that only "help::" or "helpall::" needs to be written for adding more help messages. Useful when users want to add their own messages to "make help" et al.
2012-04-25 13:04:29 -04:00
uncompiled: cleanlisp autoloads # for developing
Introduce compatibility and convenience targets, local.mk template, add "helpall" * Makefile: new target "helpall" to document all targets, while "help" continues to show a brief subset. * default.mk: add cutlines for sed to produce local.mk with. * targets.mk: add target "local.mk" to produce an (empty) local.mk configuration template when it isn't already present. Ignore any error when making this target since sed might not be present on all systems. Redefine target "update" to not include testing, similarly add target "update2" to additionally install without test. Add targets "up0" to stop after git pull and "up1" to stop after test, while "up2" continues to do everything and then installs. Complete .PHONY target list. Add "refcard" target for compatibility with old make. Clean contrib in "cleanall", too.
2012-04-23 15:20:58 -04:00
refcard: card
update update2:: up0 all
Makefile: implement different compilation methods, rename _COMPILE_ to ORGCM * default.mk, targets.mk, lisp/Makefile: Rename _COMPILE_ to ORGCM. * default.mk: Define ORGCM=dirall, show other possible values as comments * targets.mk: Implement target `single´, temporarily set ORGCM (overriding configuration). Show newly introduced configuration variables with `check-*´. * lisp/Makefile: Implement dispatch for compile based on ORGCM. Output header that contains the target for easier debugging. * Makefile: Document target `single´.
2012-08-19 06:21:33 -04:00
single: ORGCM=single
single: compile
Introduce compatibility and convenience targets, local.mk template, add "helpall" * Makefile: new target "helpall" to document all targets, while "help" continues to show a brief subset. * default.mk: add cutlines for sed to produce local.mk with. * targets.mk: add target "local.mk" to produce an (empty) local.mk configuration template when it isn't already present. Ignore any error when making this target since sed might not be present on all systems. Redefine target "update" to not include testing, similarly add target "update2" to additionally install without test. Add targets "up0" to stop after git pull and "up1" to stop after test, while "up2" continues to do everything and then installs. Complete .PHONY target list. Add "refcard" target for compatibility with old make. Clean contrib in "cleanall", too.
2012-04-23 15:20:58 -04:00
.PRECIOUS: local.mk
local.mk:
Improve compatibility with old Makefile * targets.mk: change the "local.mk" template so that "oldorg" will be the default target for maximum compatibility. Admonish info message with a reminder to use "make help" for more information on targets and that "oldorg" is the default target for now. Add new convenience target "uncompiled" that will keep the lisp directory free from *.elc files and the autoload files up-to-date. * Makefile: make "targets" and "helpall" depend on "help" so that only "help::" or "helpall::" needs to be written for adding more help messages. Useful when users want to add their own messages to "make help" et al.
2012-04-25 13:04:29 -04:00
$(info ======================================================)
$(info = Invoke "make help" for a synopsis of make targets. =)
$(info = Created a default local.mk template. =)
$(info = Setting "oldorg" as the default target. =)
$(info = Please adapt local.mk to your local setup! =)
$(info ======================================================)
replace the remaining occurences of sed with emacs scripts, implement mkdir with install * UTILITIES/org-fixup.el (org-make-local-mk): New function to create a local.mk template from default.mk. * UTILITIES/org-fixup.el (org-make-letterformat): New function to replace the format string for A4 with one for Letter. * default.mk: Few cosmetic changes to the template section. Add definition MAKE_LOCAL_MK for call to org-make-local-mk. Remove definition for SED, which is not used anymore. Implement MKDIR with 'install -d' by default. Since both CP and MKDIR are now implemented with install, this reduces the number of external dependencies. Add mode settings to both invocations of install to keep the modes of installed files sane even if umask is set to a strange value. * targets.mk: Remove sed script and use $(MAKE_LOCAL_MK) instead. * doc/Makefile: Remove sed script and replace with emacs script. This script can not be placed into a variable since it would expand $< and $@ in the context of the "card" target rather than the pattern rule.
2012-05-26 16:32:21 -04:00
-@$(MAKE_LOCAL_MK)
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.
2012-04-21 11:25:35 -04:00
corrections to build system * targets.mk: Only the first dependecy was used, remove them entirely and replace with explicit foreach. Change "check" to only depend on "compile", so it does not re-make documentation.
2012-05-18 11:43:46 -04:00
all compile::
Makefile: adding files from contrib * default.mk: Add customizatin variable ORG_ADD_CONTRIB with descriptiona and commented example. * targets.mk: Strip leading path and trailing suffix from all elements of ORG_ADD_CONTRIB, then prefix with contrib/lisp and do wildcard expansion (this will also remove any invalid names); store the result in ORG_FROM_CONTRIB. Strip /contrib from ORG_FROM_CONTRIB and store the result in ORG_TO_LISP. If these are non-empty, copy the files from contrib/lisp/ into lisp/ before compilation and remove them when cleanlisp is called.
2012-08-22 02:04:56 -04:00
ifneq ($(ORG_FROM_CONTRIB),)
$(CP) $(ORG_FROM_CONTRIB) lisp/
endif
corrections to build system * targets.mk: Only the first dependecy was used, remove them entirely and replace with explicit foreach. Change "check" to only depend on "compile", so it does not re-make documentation.
2012-05-18 11:43:46 -04:00
$(foreach dir, doc lisp, $(MAKE) -C $(dir) clean;)
Revert "Revert "Makefile: allow for different compilation methods"" This reverts commit 510f6464b06932406051fd0983586f6c1680e098.
2012-08-19 06:20:47 -04:00
compile compile-dirty::
corrections to build system * targets.mk: Only the first dependecy was used, remove them entirely and replace with explicit foreach. Change "check" to only depend on "compile", so it does not re-make documentation.
2012-05-18 11:43:46 -04:00
$(MAKE) -C lisp $@
cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition * UTILITIES/org-fixup.el: new file, has functions to create org-version.el and org-install.el, now use by the build system. * lisp/Makefile: delete said definitions, now sourced from toplevel make. "clean" and "cleanall" should do the same thing here, make them aliases, ditto for "all" and "compile". Both autoload files must be .PHONY and depend only on each other for correct ordering. Make "compile-dirty" actually do that again (i.e. no implied "clean", but "cleanauto"). Remove autoload files directly after install, so that they will only be present when explicitly requested by "autoloads". Create "org-version.el" before compilation as it is mandatory. Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION), source from default.mk/local.mk. * default.mk: move definitions for $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION) here so that they can be more easily configured. Remove definition of "org-release" from $(BATCH) and $(BTEST), now sourced from "org-version.el". * targets.mk: target reorganization, introduce "stop" targets to prevent cleaning of org-version.el. Use new targets for "oldorg" to make it more robust in case of errors. New target "cleanutils" to remove any "*.elc" files that may have been produced there and add this target to "cleanall". Do the same in cleancontrib.
2012-04-28 13:24:39 -04:00
all clean-install::
fix bug introduced with aliasing target "doc" to "docs" * targets.mk: $(SUBDIRS) must not be used as a dependency since "doc" is both an existing directory and a phony target
2012-04-22 02:05:51 -04:00
$(foreach dir, $(SUBDIRS), $(MAKE) -C $(dir) $@;)
Split off Makefile into several parts, included from master Makefile * Makefile: just keep help target (now also default for no target) and include all other parts from here. * default.mk: user editable variables with their default values * maint.mk: definitions by maintainer, should not be touched by user * targets.mk: user callable targets * maint-targets.mk: targets for maintenance, should not be called by user * dependencies.mk: keep order during compile (could become auto-generated) This is the first in a series of patches that restructures the Makefile to achieve easier customization and separation of different concerns (mainly user vs. maintenance of the distribution). This first patch simply establishes a set of files without changing anything else to provide a clean starting point. It uses GNU make extensions since Makefile already depends on GNU make anyway.
2011-07-12 13:45:59 -04:00
corrections to build system * targets.mk: Only the first dependecy was used, remove them entirely and replace with explicit foreach. Change "check" to only depend on "compile", so it does not re-make documentation.
2012-05-18 11:43:46 -04:00
check test:: compile
cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition * UTILITIES/org-fixup.el: new file, has functions to create org-version.el and org-install.el, now use by the build system. * lisp/Makefile: delete said definitions, now sourced from toplevel make. "clean" and "cleanall" should do the same thing here, make them aliases, ditto for "all" and "compile". Both autoload files must be .PHONY and depend only on each other for correct ordering. Make "compile-dirty" actually do that again (i.e. no implied "clean", but "cleanauto"). Remove autoload files directly after install, so that they will only be present when explicitly requested by "autoloads". Create "org-version.el" before compilation as it is mandatory. Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION), source from default.mk/local.mk. * default.mk: move definitions for $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION) here so that they can be more easily configured. Remove definition of "org-release" from $(BATCH) and $(BTEST), now sourced from "org-version.el". * targets.mk: target reorganization, introduce "stop" targets to prevent cleaning of org-version.el. Use new targets for "oldorg" to make it more robust in case of errors. New target "cleanutils" to remove any "*.elc" files that may have been produced there and add this target to "cleanall". Do the same in cleancontrib.
2012-04-28 13:24:39 -04:00
check test test-dirty::
add cleaning of temporary test files (with option to keep them) default.mk: add $(testdir) definition based on $(TMPDIR), which defaults to "/tmp" if not already defined targets.mk(check): call test suite with TMPDIR=$(testdir) and remove direactory after successful run of testsuite. Do not remove temporary test files if $(TEST_NO_AUTOCLEAN) is set to a non-empty value. targets.mk(cleandirs): refactor the first part of what cleanall had been doing. targets.mk(cleanall): run cleantest and cleandirs, then remove backup files. targets.mk(cleanlisp): remove backup files. targets.mk(cleandoc): remove backup files. targets.mk(cleanall): run cleantest and cleandirs, then remove backup files. targets.mk(cleantest): removal of temporary test files.
2012-02-16 15:24:51 -05:00
-$(MKDIR) $(testdir)
TMPDIR=$(testdir) $(BTEST)
ifeq ($(TEST_NO_AUTOCLEAN),) # define this variable to leave $(testdir) around for inspection
$(MAKE) cleantest
endif
introduce new make target "test" Makefile: add help for target "test" default.mk: more sane location for local data, add $(BTEST) that will run the test in batch mode. Some tests require non-standard packages, introduce $(BTEST_EXTRA) in order to add options so they can be found. targets.mk: new target "test" that implies "all" and then runs all test. Hidden target "test-dirty" runs tests without doing compilation.
2012-01-04 15:02:14 -05:00
Introduce compatibility and convenience targets, local.mk template, add "helpall" * Makefile: new target "helpall" to document all targets, while "help" continues to show a brief subset. * default.mk: add cutlines for sed to produce local.mk with. * targets.mk: add target "local.mk" to produce an (empty) local.mk configuration template when it isn't already present. Ignore any error when making this target since sed might not be present on all systems. Redefine target "update" to not include testing, similarly add target "update2" to additionally install without test. Add targets "up0" to stop after git pull and "up1" to stop after test, while "up2" continues to do everything and then installs. Complete .PHONY target list. Add "refcard" target for compatibility with old make. Clean contrib in "cleanall", too.
2012-04-23 15:20:58 -04:00
up0 up1 up2::
ignore *.t2d directories in doc/, adapt some comments, implement missing targets .gitignore: also ignore *.t2d directories in doc/ that texi2pdf might produce when run in tidy mode default.mk: correct some comments targets.mk: implement missing clean targets and add aliases for them
2012-01-05 14:54:52 -05:00
git remote update
Split off Makefile into several parts, included from master Makefile * Makefile: just keep help target (now also default for no target) and include all other parts from here. * default.mk: user editable variables with their default values * maint.mk: definitions by maintainer, should not be touched by user * targets.mk: user callable targets * maint-targets.mk: targets for maintenance, should not be called by user * dependencies.mk: keep order during compile (could become auto-generated) This is the first in a series of patches that restructures the Makefile to achieve easier customization and separation of different concerns (mainly user vs. maintenance of the distribution). This first patch simply establishes a set of files without changing anything else to provide a clean starting point. It uses GNU make extensions since Makefile already depends on GNU make anyway.
2011-07-12 13:45:59 -04:00
git pull
Introduce compatibility and convenience targets, local.mk template, add "helpall" * Makefile: new target "helpall" to document all targets, while "help" continues to show a brief subset. * default.mk: add cutlines for sed to produce local.mk with. * targets.mk: add target "local.mk" to produce an (empty) local.mk configuration template when it isn't already present. Ignore any error when making this target since sed might not be present on all systems. Redefine target "update" to not include testing, similarly add target "update2" to additionally install without test. Add targets "up0" to stop after git pull and "up1" to stop after test, while "up2" continues to do everything and then installs. Complete .PHONY target list. Add "refcard" target for compatibility with old make. Clean contrib in "cleanall", too.
2012-04-23 15:20:58 -04:00
up1 up2:: all
$(MAKE) test-dirty
up2 update2::
clean up Makefile some more, keep autoloads around * lisp/Makefile: remove stop targets, make autoloads depend on source files again (not .PHONY). Keep autoload files around after compile, but make sure to re-create them before installation and compile. Remove autoload files before re-creating them to avoid errors from Emacs when saving the buffer. * targets.mk: remove stop targets and the mess that was necessary to support them. * default.mk: must use $(CURDIR) not $(PWD), $(PWD) is not well defined when using sudo.
2012-04-30 00:49:23 -04:00
$(SUDO) $(MAKE) install
Split off Makefile into several parts, included from master Makefile * Makefile: just keep help target (now also default for no target) and include all other parts from here. * default.mk: user editable variables with their default values * maint.mk: definitions by maintainer, should not be touched by user * targets.mk: user callable targets * maint-targets.mk: targets for maintenance, should not be called by user * dependencies.mk: keep order during compile (could become auto-generated) This is the first in a series of patches that restructures the Makefile to achieve easier customization and separation of different concerns (mainly user vs. maintenance of the distribution). This first patch simply establishes a set of files without changing anything else to provide a clean starting point. It uses GNU make extensions since Makefile already depends on GNU make anyway.
2011-07-12 13:45:59 -04:00
prepare for additional subdirs for "install" * targets.mk: modify install target to be based on pattern match so that additional SUBDIRS will be automatically processed
2011-07-19 14:05:14 -04:00
install: $(INSTSUB)
install-info: install-doc
Split off Makefile into several parts, included from master Makefile * Makefile: just keep help target (now also default for no target) and include all other parts from here. * default.mk: user editable variables with their default values * maint.mk: definitions by maintainer, should not be touched by user * targets.mk: user callable targets * maint-targets.mk: targets for maintenance, should not be called by user * dependencies.mk: keep order during compile (could become auto-generated) This is the first in a series of patches that restructures the Makefile to achieve easier customization and separation of different concerns (mainly user vs. maintenance of the distribution). This first patch simply establishes a set of files without changing anything else to provide a clean starting point. It uses GNU make extensions since Makefile already depends on GNU make anyway.
2011-07-12 13:45:59 -04:00
allow customization of the "doc" target to skip certain types of documentation * doc/Makefile: read targets to make for "doc" from $(ORG_MAKE_DOC), defaults to "info html pdf"; can be overridden by the user in local.mk. * targets.mk: read targets to make for "doc" and "docs" from $(ORG_MAKE_DOC), defaults to "info html pdf"; can be overridden by the user in local.mk. * default.mk: document ORG_MAKE_DOC and provide a (commented) example of how to have make only produce info documentation.
2012-04-22 02:22:31 -04:00
doc docs: $(ORG_MAKE_DOC)
Split off Makefile into several parts, included from master Makefile * Makefile: just keep help target (now also default for no target) and include all other parts from here. * default.mk: user editable variables with their default values * maint.mk: definitions by maintainer, should not be touched by user * targets.mk: user callable targets * maint-targets.mk: targets for maintenance, should not be called by user * dependencies.mk: keep order during compile (could become auto-generated) This is the first in a series of patches that restructures the Makefile to achieve easier customization and separation of different concerns (mainly user vs. maintenance of the distribution). This first patch simply establishes a set of files without changing anything else to provide a clean starting point. It uses GNU make extensions since Makefile already depends on GNU make anyway.
2011-07-12 13:45:59 -04:00
hand off ./doc to sub-make * Makefile: use info function for output and call shell only once * default.mk: add PDFTEX and RMR variables for customization * lisp/Makefile: add target 'all' and create $(lispdir) if necessary * maint-targets.mk: invoke sub-make for HTML manuals * maint.mk: remove unsused VARIABLES * targets.mk: invoke sub-make for ./doc and clean up some targets
2011-07-17 08:49:43 -04:00
info html pdf card:
$(MAKE) -C doc $@
shuffle targets to their correct place, harden recipes * Makefile: declare phony targets, remove help text for install-info-debian * default.mk: add variable for FIND and RM * targets.mk, maint-targets.mk: shuffle targets to where they belong, declare phony targets, work around a texi2dvi bug, use pattern rules, use targets for dependencies instead of repeating them verbatim
2011-07-12 16:31:41 -04:00
prepare for additional subdirs for "install" * targets.mk: modify install target to be based on pattern match so that additional SUBDIRS will be automatically processed
2011-07-19 14:05:14 -04:00
$(INSTSUB):
$(MAKE) -C $(@:install-%=%) install
Split off Makefile into several parts, included from master Makefile * Makefile: just keep help target (now also default for no target) and include all other parts from here. * default.mk: user editable variables with their default values * maint.mk: definitions by maintainer, should not be touched by user * targets.mk: user callable targets * maint-targets.mk: targets for maintenance, should not be called by user * dependencies.mk: keep order during compile (could become auto-generated) This is the first in a series of patches that restructures the Makefile to achieve easier customization and separation of different concerns (mainly user vs. maintenance of the distribution). This first patch simply establishes a set of files without changing anything else to provide a clean starting point. It uses GNU make extensions since Makefile already depends on GNU make anyway.
2011-07-12 13:45:59 -04:00
ignore *.t2d directories in doc/, adapt some comments, implement missing targets .gitignore: also ignore *.t2d directories in doc/ that texi2pdf might produce when run in tidy mode default.mk: correct some comments targets.mk: implement missing clean targets and add aliases for them
2012-01-05 14:54:52 -05:00
autoloads: lisp
hand off ./doc to sub-make * Makefile: use info function for output and call shell only once * default.mk: add PDFTEX and RMR variables for customization * lisp/Makefile: add target 'all' and create $(lispdir) if necessary * maint-targets.mk: invoke sub-make for HTML manuals * maint.mk: remove unsused VARIABLES * targets.mk: invoke sub-make for ./doc and clean up some targets
2011-07-17 08:49:43 -04:00
$(MAKE) -C $< $@
Split off Makefile into several parts, included from master Makefile * Makefile: just keep help target (now also default for no target) and include all other parts from here. * default.mk: user editable variables with their default values * maint.mk: definitions by maintainer, should not be touched by user * targets.mk: user callable targets * maint-targets.mk: targets for maintenance, should not be called by user * dependencies.mk: keep order during compile (could become auto-generated) This is the first in a series of patches that restructures the Makefile to achieve easier customization and separation of different concerns (mainly user vs. maintenance of the distribution). This first patch simply establishes a set of files without changing anything else to provide a clean starting point. It uses GNU make extensions since Makefile already depends on GNU make anyway.
2011-07-12 13:45:59 -04:00
fix bug introduced with aliasing target "doc" to "docs" * targets.mk: $(SUBDIRS) must not be used as a dependency since "doc" is both an existing directory and a phony target
2012-04-22 02:05:51 -04:00
cleandirs:
$(foreach dir, $(SUBDIRS), $(MAKE) -C $(dir) cleanall;)
shuffle targets to their correct place, harden recipes * Makefile: declare phony targets, remove help text for install-info-debian * default.mk: add variable for FIND and RM * targets.mk, maint-targets.mk: shuffle targets to where they belong, declare phony targets, work around a texi2dvi bug, use pattern rules, use targets for dependencies instead of repeating them verbatim
2011-07-12 16:31:41 -04:00
Revert "server.mk: implement `cleanrel´ here" This reverts commit ddcf4f851154e8b13065cb8de162470827b04ca1.
2012-08-23 06:31:44 -04:00
clean: cleanrel cleanlisp cleandoc
add cleaning of temporary test files (with option to keep them) default.mk: add $(testdir) definition based on $(TMPDIR), which defaults to "/tmp" if not already defined targets.mk(check): call test suite with TMPDIR=$(testdir) and remove direactory after successful run of testsuite. Do not remove temporary test files if $(TEST_NO_AUTOCLEAN) is set to a non-empty value. targets.mk(cleandirs): refactor the first part of what cleanall had been doing. targets.mk(cleanall): run cleantest and cleandirs, then remove backup files. targets.mk(cleanlisp): remove backup files. targets.mk(cleandoc): remove backup files. targets.mk(cleanall): run cleantest and cleandirs, then remove backup files. targets.mk(cleantest): removal of temporary test files.
2012-02-16 15:24:51 -05:00
Revert "Revert "Makefile: allow for different compilation methods"" This reverts commit 510f6464b06932406051fd0983586f6c1680e098.
2012-08-19 06:20:47 -04:00
cleanall: cleandirs cleantest
Makefile: fix some errors * targets.mk: Repair .PHONY target. Correctly group ORed parameters in find calls. Introduce $(CLEANDIRS) and use variable instead of literals. Have a command succeed at the end of `config-*´ so that no spurious warning is given by make.
2012-08-19 12:54:15 -04:00
-$(FIND) . \( -name \*~ -o -name \*# -o -name .#\* \) -exec $(RM) {} \;
-$(FIND) $(CLEANDIRS) \( -name \*~ -o -name \*.elc \) -exec $(RM) {} \;
shuffle targets to their correct place, harden recipes * Makefile: declare phony targets, remove help text for install-info-debian * default.mk: add variable for FIND and RM * targets.mk, maint-targets.mk: shuffle targets to where they belong, declare phony targets, work around a texi2dvi bug, use pattern rules, use targets for dependencies instead of repeating them verbatim
2011-07-12 16:31:41 -04:00
Makefile: fix some errors * targets.mk: Repair .PHONY target. Correctly group ORed parameters in find calls. Introduce $(CLEANDIRS) and use variable instead of literals. Have a command succeed at the end of `config-*´ so that no spurious warning is given by make.
2012-08-19 12:54:15 -04:00
$(CLEANDIRS:%=clean%):
-$(FIND) $(@:clean%=%) \( -name \*~ -o -name \*.elc \) -exec $(RM) {} \;
cleanup in lisp/Makefile, targets; create org-fixup.el, remove version definition * UTILITIES/org-fixup.el: new file, has functions to create org-version.el and org-install.el, now use by the build system. * lisp/Makefile: delete said definitions, now sourced from toplevel make. "clean" and "cleanall" should do the same thing here, make them aliases, ditto for "all" and "compile". Both autoload files must be .PHONY and depend only on each other for correct ordering. Make "compile-dirty" actually do that again (i.e. no implied "clean", but "cleanauto"). Remove autoload files directly after install, so that they will only be present when explicitly requested by "autoloads". Create "org-version.el" before compilation as it is mandatory. Remove $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION), source from default.mk/local.mk. * default.mk: move definitions for $(ORG_MAKE_INSTALL) and $(ORG_MAKE_VERSION) here so that they can be more easily configured. Remove definition of "org-release" from $(BATCH) and $(BTEST), now sourced from "org-version.el". * targets.mk: target reorganization, introduce "stop" targets to prevent cleaning of org-version.el. Use new targets for "oldorg" to make it more robust in case of errors. New target "cleanutils" to remove any "*.elc" files that may have been produced there and add this target to "cleanall". Do the same in cleancontrib.
2012-04-28 13:24:39 -04:00
Makefile: adding files from contrib * default.mk: Add customizatin variable ORG_ADD_CONTRIB with descriptiona and commented example. * targets.mk: Strip leading path and trailing suffix from all elements of ORG_ADD_CONTRIB, then prefix with contrib/lisp and do wildcard expansion (this will also remove any invalid names); store the result in ORG_FROM_CONTRIB. Strip /contrib from ORG_FROM_CONTRIB and store the result in ORG_TO_LISP. If these are non-empty, copy the files from contrib/lisp/ into lisp/ before compilation and remove them when cleanlisp is called.
2012-08-22 02:04:56 -04:00
ifneq ($(ORG_TO_LISP),)
cleanlisp: cleanaddcontrib
cleanaddcontrib:
$(RM) $(ORG_TO_LISP)
endif
Revert "Revert "Makefile: allow for different compilation methods"" This reverts commit 510f6464b06932406051fd0983586f6c1680e098.
2012-08-19 06:20:47 -04:00
cleanutils: cleanUTILITIES
shuffle targets to their correct place, harden recipes * Makefile: declare phony targets, remove help text for install-info-debian * default.mk: add variable for FIND and RM * targets.mk, maint-targets.mk: shuffle targets to where they belong, declare phony targets, work around a texi2dvi bug, use pattern rules, use targets for dependencies instead of repeating them verbatim
2011-07-12 16:31:41 -04:00
Revert "server.mk: implement `cleanrel´ here" This reverts commit ddcf4f851154e8b13065cb8de162470827b04ca1.
2012-08-23 06:31:44 -04:00
cleanrel:
$(RMR) RELEASEDIR
$(RMR) org-7.*
$(RMR) org-7*zip org-7*tar.gz
Revert "Revert "Makefile: allow for different compilation methods"" This reverts commit 510f6464b06932406051fd0983586f6c1680e098.
2012-08-19 06:20:47 -04:00
cleanelc:
$(MAKE) -C lisp $@
Makefile: fix some errors * targets.mk: Repair .PHONY target. Correctly group ORed parameters in find calls. Introduce $(CLEANDIRS) and use variable instead of literals. Have a command succeed at the end of `config-*´ so that no spurious warning is given by make.
2012-08-19 12:54:15 -04:00
cleanlisp cleandoc:
$(MAKE) -C $(@:clean%=%) clean
ignore *.t2d directories in doc/, adapt some comments, implement missing targets .gitignore: also ignore *.t2d directories in doc/ that texi2pdf might produce when run in tidy mode default.mk: correct some comments targets.mk: implement missing clean targets and add aliases for them
2012-01-05 14:54:52 -05:00
Makefile: fix some errors * targets.mk: Repair .PHONY target. Correctly group ORed parameters in find calls. Introduce $(CLEANDIRS) and use variable instead of literals. Have a command succeed at the end of `config-*´ so that no spurious warning is given by make.
2012-08-19 12:54:15 -04:00
cleandocs:
ignore *.t2d directories in doc/, adapt some comments, implement missing targets .gitignore: also ignore *.t2d directories in doc/ that texi2pdf might produce when run in tidy mode default.mk: correct some comments targets.mk: implement missing clean targets and add aliases for them
2012-01-05 14:54:52 -05:00
$(MAKE) -C doc clean
add cleaning of temporary test files (with option to keep them) default.mk: add $(testdir) definition based on $(TMPDIR), which defaults to "/tmp" if not already defined targets.mk(check): call test suite with TMPDIR=$(testdir) and remove direactory after successful run of testsuite. Do not remove temporary test files if $(TEST_NO_AUTOCLEAN) is set to a non-empty value. targets.mk(cleandirs): refactor the first part of what cleanall had been doing. targets.mk(cleanall): run cleantest and cleandirs, then remove backup files. targets.mk(cleanlisp): remove backup files. targets.mk(cleandoc): remove backup files. targets.mk(cleanall): run cleantest and cleandirs, then remove backup files. targets.mk(cleantest): removal of temporary test files.
2012-02-16 15:24:51 -05:00
-$(FIND) doc -name \*~ -exec $(RM) {} \;
cleantest:
$(RMR) $(testdir)