mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-24 07:20:29 +00:00
Code
806ac1b7f6
org-mode/mk/targets.mk

177 lines
5.2 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 17:24:39 +00: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 20:31:41 +00: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 17:45:59 +00: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 20:24:36 +00: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 17:24:39 +00:00
OTHERDIRS = doc etc
Build process: Do not attempt to clean =contrib/= mk/targets.mk: Remove "contrib" from 'CLEANDIRS'.
2021-05-30 11:18:52 +00:00
CLEANDIRS = testing mk
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 17:24:39 +00: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 20:24:36 +00: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 06:22:31 +00: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 20:24:36 +00:00
ifneq ($(wildcard .git),)
mk/targets.mk: consider only release_* tags for constructing version strings
2014-07-02 18:32:24 +00:00
ORGVERSION ?= $(subst release_,,$(shell git describe --match release\* --abbrev=0 HEAD))
mk/targets.mk: Add version fallback for tag-less repos * mk/targets.mk (ORGVERSION, GITVERSION): Get version from lisp/org.el header if it can't be retrieved from git-describe. As of elpa.git's ee03829f90 (Finalize the new master branch, 2020-12-14), org-release and org-git-version are empty strings in https://elpa.gnu.org/packages/org-*.tar files. This is because the new setup executes `make autoloads info' in an elpa.git worktree with an Org branch checked out, but elpa.git of course doesn't have Org's release tags. Maintaining the org.el version header has been a point of contention in the past [1], but the header has been there for a while now. Use it to avoid the above elpa.git issue. In the case of the master branch, the org-release value generated in a tag-less repo will have a different version than the one from a regular repo because org.el's version header has a "-dev" suffix, but that's still better than an empty version. [1] For example: https://orgmode.org/list/87zj1uhix6.fsf@gmx.us/ Reported-by: Pierre Langlois <pierre.langlois@gmx.com> Ref: https://orgmode.org/list/87y2hi9qev.fsf@gmx.com
2021-02-05 06:20:09 +00:00
ifeq ($(ORGVERSION),)
# In elpa.git, there are no tags available. Fall back to using
# the org.el header.
mk/targets.mk: Fix ORGVERSION in tag-less repos * mk/targets.mk (ORGVERSION, GITVERSION): trim "-dev" suffix from ORGVERSION. 61336f80 uses org.el's Version metadata to generate ORGVERSION when the source repository has no tags. This can result in an org-version of "Major.Minor-dev". The "-dev" suffix is not recognized by `version-to-list' as a valid version syntax because it is not part of `version-regexp-alist'.
2021-09-23 21:13:34 +00:00
ORGVERSION := $(patsubst %-dev,%,$(shell $(BATCH) --eval "(require 'lisp-mnt)" \
--visit lisp/org.el --eval '(princ (lm-header "version"))'))
mk/targets.mk: Add version fallback for tag-less repos * mk/targets.mk (ORGVERSION, GITVERSION): Get version from lisp/org.el header if it can't be retrieved from git-describe. As of elpa.git's ee03829f90 (Finalize the new master branch, 2020-12-14), org-release and org-git-version are empty strings in https://elpa.gnu.org/packages/org-*.tar files. This is because the new setup executes `make autoloads info' in an elpa.git worktree with an Org branch checked out, but elpa.git of course doesn't have Org's release tags. Maintaining the org.el version header has been a point of contention in the past [1], but the header has been there for a while now. Use it to avoid the above elpa.git issue. In the case of the master branch, the org-release value generated in a tag-less repo will have a different version than the one from a regular repo because org.el's version header has a "-dev" suffix, but that's still better than an empty version. [1] For example: https://orgmode.org/list/87zj1uhix6.fsf@gmx.us/ Reported-by: Pierre Langlois <pierre.langlois@gmx.com> Ref: https://orgmode.org/list/87y2hi9qev.fsf@gmx.com
2021-02-05 06:20:09 +00:00
GITVERSION ?= $(ORGVERSION)-g$(shell git rev-parse --short=6 HEAD)
else
GITVERSION ?= $(shell git describe --match release\* --abbrev=6 HEAD)
endif
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 20:24:36 +00:00
GITSTATUS ?= $(shell git status -uno --porcelain)
else
Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout * Makefile: Include default.mk and targets.mk from mk/ where they've been moved to. * README_maintainer: Rename utils to make throughout. * doc/Makefile: Rename utils to make throughout. * doc/org.texi: Remove reference to utils/, x11idle.c is now in contrib/scripts. * mk/make_emacs_changelog: Add mk/ to list of directories not to be reported in Emacs' ChangeLog. Also retain utils/ and re-add UTILITIES; add a comment explaining why these need to stay. * mk/default.mk: Rename utils to make throughout. Include version.mk from mk/ where it's been moved to. * mk/targets.mk: Rename utils to make throughout. * mk/server.mk: Rename utils to make throughout. Only put those files from mk/ into the archives that are needed outside the server: default.mk targets.mk version.mk and org-fixup.el. * lisp/org-compat.el: Rename utils to make throughout. * .gitignore: Rename utils to make throughout.
2012-08-26 12:03:20 +00:00
-include mk/version.mk
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 20:24:36 +00:00
GITVERSION ?= N/A
ORGVERSION ?= N/A
endif
DATE = $(shell date +%Y-%m-%d)
doc/Makefile: Auto-generate org-version.tex for orgcard * doc/Makefile: Add rule to generate org-version.tex. * doc/orgcard.tex: Include org-version.tex rather than explicitly setting version and year. This removes the only instance in the repo where the Org version is hardcoded.
2017-06-23 18:54:02 +00:00
YEAR = $(shell date +%Y)
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 20:24:36 +00:00
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 08:40:54 +00: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 16:53:45 +00: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 10:21:33 +00: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 16:54:15 +00:00
autoloads cleanall clean $(CLEANDIRS:%=clean%) \
Makefile: add contrib files while generating autoloads * mk/targets.mk: Move copy of contrib additions to lisp/Makefile. * lisp/Makefile: Let `autoloads´ in lisp re-generate contrib files by depending on new target `addcontrib´ in the right order.
2012-09-20 20:35:35 +00:00
clean-install cleanelc cleandirs cleanaddcontrib \
Makefile: fix whitespace error * targets.mk: Fix whitespace error.
2012-07-15 16:21:42 +00:00
cleanlisp cleandoc cleandocs cleantest \
Revert "Revert "Makefile: allow for different compilation methods"" This reverts commit 510f6464b06932406051fd0983586f6c1680e098.
2012-08-19 10:20:47 +00:00
compile compile-dirty uncompiled \
make vanilla: run Emacs -Q with *this* Org loaded This change should make it easier to run interactive tests or to reproduce problems with the current Org-mode loaded and without any personal config.
2013-12-13 16:34:35 +00:00
config config-test config-exe config-all config-eol config-version \
vanilla
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 11:32:53 +00:00
Makefile: show ORG_MAKE_DOC in `config´ * mk/targets.mk: Show ORG_MAKE_DOC in `config´. * .gitignore: Add doc/org-version.inc.
2012-08-27 17:14:39 +00:00
CONF_BASE = EMACS DESTDIR ORGCM ORG_MAKE_DOC
show DESTDIR in make config * targets.mk: Show $(DESTDIR) in 'make config'.
2012-07-17 17:54:51 +00:00
CONF_DEST = lispdir infodir datadir testdir
testing: allow to select tests * mk/default.mk: Add default for new variable BTEST_RE to select all tests. (BTEST_OB_LANGUAGES): Remove sh (always needed, as emacs-lisp) and add comment for ruby. (BTEST): Use BTEST_RE to select tests from the test suite. Reorganize pre-loading of Org, Babel, Ox and babel languages into a known clean environment. * mk/targets.mk (CONF_TEST): Add BTEST_RE to the output of config-test. * testing/org-batch-test-init.el: New file. Remove all traces of any Org built into Emacs or otherwise present in the environment so it can not be picked up spuriously during testing or conceal errors in the Org version under test. * testing/org-test.el (org-test-run-batch-tests): Showtest selection in messages. (org-test-run-all-tests): Update ID locations.
2013-11-23 16:46:35 +00:00
CONF_TEST = BTEST_PRE BTEST_POST BTEST_OB_LANGUAGES BTEST_EXTRA BTEST_RE
Makefile: provide CHMOD customization, use it for cleantest * mk/default.mk (CHMOD): Addtional customization variable for chmod (change file permissions). Explain why we need it for git-annex. * mk/targets.mk (cleantest): If the plain $(RMR) fails, try to make directories writable recursively and retry the $(RMR). (cleanall, $(CLEANDIRS:%=clean%)): Use "+" instead of ";" to reduce the number of execs.
2016-02-14 11:44:56 +00:00
CONF_EXEC = CP MKDIR RM RMR FIND CHMOD SUDO PDFTEX TEXI2PDF TEXI2HTML MAKEINFO INSTALL_INFO
Makefile: some refactoring for "make vanilla" * mk/default.mk (BTEST_INIT): Isolate load-path manipulation into BTEST_LOAD and do whitespace cleanup. (EMACSQ): New variable for an Emacs with no configuration files. (NOBATCH, BATCH): Use EMACSQ. * mk/targets.mk (vanilla): Do not echo command line and explicitly say that we don't get a return value. (CONF_CALL): Add NOBATCH to the list of things shown in `make config-all´.
2013-12-14 09:17:53 +00:00
CONF_CALL = BATCH BATCHL ELC ELCDIR NOBATCH 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 11:32:53 +00: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 17:54:51 +00: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 06:04:56 +00:00
$(info ========= Additional files from contrib/lisp)
Makefile: add contrib already for autoloads so that uncompiled can have contrib/, too * mk/targets.mk: Add contrib files already for autoloads so that uncompiled can have contrib/lisp/ added, too. Remove all files from contrib/lisp/ that are found in lisp/ for `cleanlisp´ so that switching between different contrib configurations becomes easier. Remove variable ORG_TO_LISP since it is not needed anymore.
2012-09-15 16:27:56 +00:00
$(info $(notdir \
$(wildcard \
$(addsuffix .el, \
$(addprefix contrib/lisp/, \
$(basename \
$(notdir $(ORG_ADD_CONTRIB))))))))
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 11:32:53 +00: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)))
Makefile: implement target config-version * mk/targets.mk: Implement target `config-version´ to show the version of Org from both make's and Emacs' perspective. Run that target at the end of all `config-*´ targets. * mk/default.mk: Add SHOWVER with the appropriate invocation of emacs to output the Org version. * Makefile: Document new target `config-version´ in `helpall´.
2012-09-29 08:47:40 +00:00
config config-test config-exe config-all config-version::
$(info ========= Org version)
Change Org-mode into Org mode * lisp/ob-core.el (org-babel-result-to-file): * lisp/ob-picolisp.el: * lisp/org-agenda.el (org-check-for-org-mode): (org-search-view): (org-tags-view): (org-agenda-cleanup-fancy-diary): (org-agenda-get-day-entries): * lisp/org-table.el (orgtbl-mode): * lisp/org-w3m.el (org-w3m-copy-for-org-mode): * lisp/org.el (org-modules): (org-startup-options): (org-fontify-meta-lines-and-blocks): * mk/default.mk: * mk/manfull.pl: * mk/org-fixup.el (org-make-org-version): (org-make-org-loaddefs): * mk/orgcard2txt.pl (rep_esc): * mk/targets.mk ($(info): * testing/README: (Example): * testing/examples/no-heading.org: * testing/examples/normal.org: Change Org-mode into Org mode
2017-12-31 14:48:09 +00:00
$(info make: Org mode version $(ORGVERSION) ($(GITVERSION) => $(lispdir)))
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 16:54:15 +00: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 19:20:58 +00: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 04:49:23 +00: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 17:04:29 +00: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 19:20:58 +00: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 10:21:33 +00: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 19:20:58 +00: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 17:04:29 +00: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 20:32:21 +00: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 15:25:35 +00: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 15:43:46 +00:00
all compile::
$(foreach dir, doc lisp, $(MAKE) -C $(dir) clean;)
Revert "Revert "Makefile: allow for different compilation methods"" This reverts commit 510f6464b06932406051fd0983586f6c1680e098.
2012-08-19 10:20:47 +00: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 15:43:46 +00: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 17:24:39 +00: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 06:05:51 +00: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 17:45:59 +00:00
make vanilla: run Emacs -Q with *this* Org loaded This change should make it easier to run interactive tests or to reproduce problems with the current Org-mode loaded and without any personal config.
2013-12-13 16:34:35 +00:00
vanilla:
Makefile: some refactoring for "make vanilla" * mk/default.mk (BTEST_INIT): Isolate load-path manipulation into BTEST_LOAD and do whitespace cleanup. (EMACSQ): New variable for an Emacs with no configuration files. (NOBATCH, BATCH): Use EMACSQ. * mk/targets.mk (vanilla): Do not echo command line and explicitly say that we don't get a return value. (CONF_CALL): Add NOBATCH to the list of things shown in `make config-all´.
2013-12-14 09:17:53 +00:00
-@$(NOBATCH) &
make vanilla: run Emacs -Q with *this* Org loaded This change should make it easier to run interactive tests or to reproduce problems with the current Org-mode loaded and without any personal config.
2013-12-13 16:34:35 +00:00
Revert "added Makefile targets to check single tests" This reverts commit 2c5251f0dab97a5101f15a5b574fdf66bbb71b6a.
2013-11-05 17:50:06 +00: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 17:24:39 +00: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 20:24:51 +00:00
-$(MKDIR) $(testdir)
Revert "added Makefile targets to check single tests" This reverts commit 2c5251f0dab97a5101f15a5b574fdf66bbb71b6a.
2013-11-05 17:50:06 +00:00
TMPDIR=$(testdir) $(BTEST)
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 20:24:51 +00:00
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 20:02:14 +00:00
Remove additions from contrib/ before moving HEAD * mk/targets.mk (up0): Explicitly remove additions from contrib/ before moving HEAD via git since the files might be renamed, deleted or moved by checking out a new version. Thanks to Suvayu Ali for pointing to this problem. The user still has to remember to do this when moving HEAD manually, though.
2013-02-09 07:31:44 +00:00
up0:: cleanaddcontrib
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 19:20:58 +00:00
up0 up1 up2::
Makefile: optionally switch to a specific git branch * mk/default.mk (GIT_BRANCH): New configuration variable to specify a Git branch that is checked out before updating. * mk/targets.mk (up0 up1 up2): Check out the branch in GIT_BRANCH before doing an update. Stays on the current branch if GIT_BRANCH is undefined or empty.
2013-12-14 09:18:59 +00:00
git checkout $(GIT_BRANCH)
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 19:54:52 +00: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 17:45:59 +00: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 19:20:58 +00: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 04:49:23 +00: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 17:45:59 +00: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 18:05:14 +00: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 17:45:59 +00: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 06:22:31 +00: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 17:45:59 +00: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 12:49:43 +00: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 20:31:41 +00: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 18:05:14 +00: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 17:45:59 +00: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 19:54:52 +00: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 12:49:43 +00: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 17:45:59 +00: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 06:05:51 +00: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 20:31:41 +00:00
server.mk: implement `cleanrel´ here * targets.mk: Remove `cleanrel´. * UTILITIES/server.mk: Implement `cleanrel´, use only the names that will be produced by server.mk.
2012-08-22 06:04:56 +00:00
clean: 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 20:24:51 +00:00
Makefile: add contrib already for autoloads so that uncompiled can have contrib/, too * mk/targets.mk: Add contrib files already for autoloads so that uncompiled can have contrib/lisp/ added, too. Remove all files from contrib/lisp/ that are found in lisp/ for `cleanlisp´ so that switching between different contrib configurations becomes easier. Remove variable ORG_TO_LISP since it is not needed anymore.
2012-09-15 16:27:56 +00:00
cleanall: cleandirs cleantest cleanaddcontrib
Makefile: provide CHMOD customization, use it for cleantest * mk/default.mk (CHMOD): Addtional customization variable for chmod (change file permissions). Explain why we need it for git-annex. * mk/targets.mk (cleantest): If the plain $(RMR) fails, try to make directories writable recursively and retry the $(RMR). (cleanall, $(CLEANDIRS:%=clean%)): Use "+" instead of ";" to reduce the number of execs.
2016-02-14 11:44:56 +00: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 20:31:41 +00: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 16:54:15 +00:00
$(CLEANDIRS:%=clean%):
Makefile: provide CHMOD customization, use it for cleantest * mk/default.mk (CHMOD): Addtional customization variable for chmod (change file permissions). Explain why we need it for git-annex. * mk/targets.mk (cleantest): If the plain $(RMR) fails, try to make directories writable recursively and retry the $(RMR). (cleanall, $(CLEANDIRS:%=clean%)): Use "+" instead of ";" to reduce the number of execs.
2016-02-14 11:44:56 +00:00
-$(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 17:24:39 +00:00
Revert "Revert "Makefile: allow for different compilation methods"" This reverts commit 510f6464b06932406051fd0983586f6c1680e098.
2012-08-19 10:20:47 +00:00
cleanelc:
$(MAKE) -C lisp $@
Makefile: add contrib already for autoloads so that uncompiled can have contrib/, too * mk/targets.mk: Add contrib files already for autoloads so that uncompiled can have contrib/lisp/ added, too. Remove all files from contrib/lisp/ that are found in lisp/ for `cleanlisp´ so that switching between different contrib configurations becomes easier. Remove variable ORG_TO_LISP since it is not needed anymore.
2012-09-15 16:27:56 +00:00
cleanaddcontrib:
-$(RM) $(wildcard $(addprefix lisp/,$(notdir $(wildcard contrib/lisp/*.el))))
cleanlisp: cleanaddcontrib
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 16:54:15 +00: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 19:54:52 +00: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 16:54:15 +00: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 19:54:52 +00: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 20:24:51 +00:00
-$(FIND) doc -name \*~ -exec $(RM) {} \;
cleantest:
Makefile: provide CHMOD customization, use it for cleantest * mk/default.mk (CHMOD): Addtional customization variable for chmod (change file permissions). Explain why we need it for git-annex. * mk/targets.mk (cleantest): If the plain $(RMR) fails, try to make directories writable recursively and retry the $(RMR). (cleanall, $(CLEANDIRS:%=clean%)): Use "+" instead of ";" to reduce the number of execs.
2016-02-14 11:44:56 +00:00
# git-annex creates non-writable directories so that the files within
# them can't be removed; if rm fails, try to recover by making all
# directories writable
-$(RMR) $(testdir) || { \
$(FIND) $(testdir) -type d -exec $(CHMOD) u+w {} + && \
$(RMR) $(testdir) ; \
}
Copy Permalink