Mercurial > emacs
view nt/makefile.w32-in @ 106168:83924fb4f59c
2009-11-20 Carsten Dominik <carsten.dominik@gmail.com>
* org-agenda.el (org-agenda-diary-entry-in-org-file): Rebuild
agenda after adding new entry.
* org-datetree.el (org-datetree-find-day-create): Fix regular
expression.
* org.el (org-display-outline-path): Use a format specifier for
message, to avoid problems with heading containing `%'.
* org-agenda.el (org-agenda-hide-tags-regexp): New option.
(org-format-agenda-item): Call `org-agenda-fix-displayed-tags'.
(org-agenda-fix-displayed-tags): New function.
(org-agenda-do-context-action): Just call
`org-display-outline-path', without piping the result through
`message'.
* org-latex.el (org-export-latex-preprocess): Protect secondary
footnote references.
* org-indent.el (org-indent-initialize): Avoid empty strings as
line prefixes.
* org-agenda.el (org-agenda-diary-entry-in-org-file): Make sure
hat checking for the mark does not throw an error.
(org-agenda-diary-entry-in-org-file): Catch the case that there is
not `day' text property in the cursor line.
* org.el (org-sort-entries-or-items): Make sure that the final
entry has a newline before doing the sorting.
* org-agenda.el (org-agenda-diary-entry-in-org-file): Get the text
property at the beginning of the line.
* org.el (org-make-link-string): Don't allow a description with
only white space.
* org-agenda.el (org-agenda-insert-diary-strategy): New variable.
(org-agenda-insert-diary-as-top-level): New function.
(org-agenda-add-entry-to-org-agenda-diary-file): Call
`org-agenda-insert-diary-as-top-level'.
* org.el (org-occur-in-agenda-files): Make sure none of the
buffers is narrowed.
(org-activate-plain-links): Add the face property here.
(org-set-font-lock-defaults): Do not add the face to plain links,
the activator function does this.
* org-habit.el (org-is-habit-p): Add doc string.
* org-archive.el (org-archive-subtree-default-with-confirmation):
Autoload.
* org-latex.el (org-export-latex-fontify): Fix regexp to make char
after match optional (happens at the end of a line...).
* org.el (org-fontify-meta-lines-and-blocks): Apply special faces
for special blocks.
* org-faces.el (org-copy-face): Set lisp indentation.
(org-quote, org-verse): New faces.
* org-agenda.el (org-agenda-remove-date): Remove variable.
* org-freemind.el (org-freemind-escape-str-from-org): Fix encoding.
* org-html.el (org-export-as-html): Move the home/up link into
the content div.
* org.el (org-export-latex-packages-alist): Option definition
moved here from org-latex.el.
* org-html.el (org-export-html-home/up-format): Add an ID to the
up/home div.
* org-wl.el (org-wl-store-link): Handle the case that
`wl-use-petname' is set.
* org.el (org-set-effort): Improve prompt.
(org-get-outline-path): Widen to get full path.
(org-compact-display-after-subtree-move): Function removed.
2009-11-20 Eric Schulte <schulte.eric@gmail.com>
* org-exp-blocks.el (org-export-blocks-format-ditaa): Use sha1
hash keys to cache and re-use images generated by the
org-exp-blocks interface to ditaa and dot.
* org.el (org-format-latex): Latex images are now saved to files
named by the sha1 hash of the latex source text avoiding
regeneration of identical images.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Fri, 20 Nov 2009 20:50:32 +0000 |
parents | 8abf39c667b5 |
children | 1d1d5d9bd884 |
line wrap: on
line source
# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, # 2008, 2009 Free Software Foundation, Inc. # # Top level makefile for building GNU Emacs on Windows NT # # This file is part of GNU Emacs. # GNU Emacs is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # GNU Emacs is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out # (and remove or replace this comment). TRES = $(BLD)/emacs.res CLIENTRES = $(BLD)/emacsclient.res XMFLAGS = ALL = addpm ddeclient runemacs cmdproxy addsection preprep .PHONY: $(ALL) addpm: stamp_BLD $(BLD)/addpm.exe $(BLD)/addpm.exe: $(BLD)/addpm.$(O) $(LINK) $(LINK_OUT)$@ \ $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) \ $(USER32) $(OLE32) $(UUID) $(SHELL32) ddeclient: stamp_BLD $(BLD)/ddeclient.exe $(BLD)/ddeclient.exe: $(BLD)/ddeclient.$(O) $(LINK) $(LINK_OUT)$@ \ $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32) cmdproxy: stamp_BLD $(BLD)/cmdproxy.exe $(BLD)/cmdproxy.exe: $(BLD)/cmdproxy.$(O) $(LINK) $(LINK_OUT)$@ \ $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32) addsection: stamp_BLD $(BLD)/addsection.exe $(BLD)/addsection.exe: $(BLD)/addsection.$(O) $(LINK) $(LINK_OUT)$@ \ $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32) preprep: stamp_BLD $(BLD)/preprep.exe $(BLD)/preprep.exe: $(BLD)/preprep.$(O) $(LINK) $(LINK_OUT)$@ \ $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) # # The resource file. NT 3.10 requires the use of cvtres; even though # it is not necessary on later versions, it is still ok to use it. # $(TRES): emacs.rc icons/emacs.ico emacs.manifest stamp_BLD $(RC) $(RC_OUT)$(TRES) emacs.rc $(CLIENTRES): emacsclient.rc stamp_BLD $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc runemacs: stamp_BLD $(BLD)/runemacs.exe $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES) $(LINK) $(LINK_OUT)$@ $(SUBSYSTEM_WINDOWS) \ $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32) which-sh: @echo Using $(THE_SHELL) as shell. # These depend on stamp_BLD to make sure the $(BLD) directory is created # before the compilation begins, even if Make runs several commands # in parallel under "make -j". # $(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O) $(BLD)/addsection.$(O) $(BLD)/preprep.$(O): stamp_BLD # # Build emacs # all: which-sh stamp_BLD $(ALL) $(CLIENTRES) maybe-bootstrap all-other-dirs-$(MAKETYPE) all-other-dirs-nmake: addsection cd ..\lib-src $(MAKE) $(MFLAGS) all cd ..\src $(MAKE) $(MFLAGS) all cd ..\lisp $(MAKE) $(MFLAGS) all cd ..\leim $(MAKE) $(MFLAGS) all cd ..\nt all-other-dirs-gmake: addsection $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp all $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim all recompile: recompile-$(MAKETYPE) recompile-nmake: cd ..\lisp $(MAKE) $(MFLAGS) recompile cd ..\nt recompile-gmake: $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp recompile #### Bootstrapping. ### This is meant for Emacs maintainers only. It first cleans the ### lisp subdirectory, removing all compiled Lisp files. Then a ### special emacs executable is built from Lisp sources, which is then ### used to compile Lisp files. The last step is a "normal" make. maybe-bootstrap: maybe-bootstrap-$(SHELLTYPE) # dummy target to force other targets to be evaluated. doit: maybe-bootstrap-CMD: doit @echo . @if not EXIST ..\lisp\abbrev.elc echo Essential Lisp files seem to be missing. You should either @if not EXIST ..\lisp\abbrev.elc echo do 'make bootstrap' or create 'lisp/abbrev.elc' somehow @echo . @if not EXIST ..\lisp\abbrev.elc exit -1 maybe-bootstrap-SH: doit @if [ ! -f ../lisp/abbrev.elc ] ; then \ echo; \ echo "Essential Lisp files seem to be missing. You should either"; \ echo "do \`make bootstrap' or create \`lisp/abbrev.elc' somehow."; \ echo; \ exit -1; \ fi # Bootstrap depends on cmdproxy because some Lisp functions # loaded during bootstrap may need to run shell commands. bootstrap: addsection cmdproxy bootstrap-$(MAKETYPE) $(MAKE) $(MFLAGS) $(XMFLAGS) all bootstrap-nmake: addsection cmdproxy cd ..\lisp $(MAKE) $(MFLAGS) bootstrap-clean cd ..\src $(MAKE) $(MFLAGS) clean cd ..\lib-src $(MAKE) $(MFLAGS) clean cd ..\src $(MAKE) $(MFLAGS) bootstrap $(MAKE) $(MFLAGS) bootstrap-clean cd ..\nt $(CP) $(BLD)/cmdproxy.exe ../bin cd ..\lisp $(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap cd ..\lib-src $(MAKE) $(MFLAGS) DOC cd ..\nt bootstrap-gmake: addsection cmdproxy $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean $(CP) $(BLD)/cmdproxy.exe ../bin $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src DOC bootstrap-clean: bootstrap-clean-$(MAKETYPE) bootstrap-clean-nmake: cd ..\src $(MAKE) $(MFLAGS) bootstrap-clean cd ..\lisp $(MAKE) $(MFLAGS) bootstrap-clean bootstrap-clean-gmake: $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean $(INSTALL_DIR): - mkdir "$(INSTALL_DIR)" $(INSTALL_DIR)/bin: $(INSTALL_DIR) - mkdir "$(INSTALL_DIR)/bin" # # Build and install emacs in INSTALL_DIR # install: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE) - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin - "$(INSTALL_DIR)/bin/addpm" -q - $(DEL) ../same-dir.tst - $(DEL) $(INSTALL_DIR)/same-dir.tst echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst" - mkdir "$(INSTALL_DIR)/etc" - mkdir "$(INSTALL_DIR)/info" - mkdir "$(INSTALL_DIR)/lock" - mkdir "$(INSTALL_DIR)/data" - mkdir "$(INSTALL_DIR)/site-lisp" - mkdir "$(INSTALL_DIR)/etc/icons" $(IFNOTSAMEDIR) $(CP) ../site-lisp/subdirs.el $(INSTALL_DIR)/site-lisp $(ENDIF) $(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR) $(ENDIF) - $(CP_DIR) icons $(INSTALL_DIR)/etc $(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR) $(ENDIF) $(IFNOTSAMEDIR) $(CP) ../COPYING $(INSTALL_DIR) $(ENDIF) - $(CP) ../COPYING $(INSTALL_DIR)/bin - $(DEL) ../same-dir.tst - $(DEL) $(INSTALL_DIR)/same-dir.tst install-other-dirs-nmake: cd ..\lib-src $(MAKE) $(MFLAGS) install cd ..\src $(MAKE) $(MFLAGS) install cd ..\lisp $(MAKE) $(MFLAGS) install cd ..\leim $(MAKE) $(MFLAGS) install cd ..\nt install-other-dirs-gmake: $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src install $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src install $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install force-info: # Note that doc/emacs/makefile knows how to # put the info files in $(infodir), # so we can do ok running make in the build dir. info: force-info info-$(MAKETYPE) info-nmake: cd ..\doc\emacs $(MAKE) $(MFLAGS) info cd ..\misc $(MAKE) $(MFLAGS) info cd ..\lispref $(MAKE) $(MFLAGS) info cd ..\lispintro $(MAKE) $(MFLAGS) info cd $(MAKEDIR) info-gmake: $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs info $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc info $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref info $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro info # # Maintenance # clean: clean-other-dirs-$(MAKETYPE) - $(DEL) $(COMPILER_TEMP_FILES) - $(DEL_TREE) $(OBJDIR) - $(DEL) stamp_BLD - $(DEL) ../etc/DOC ../etc/DOC-X clean-other-dirs-nmake: cd ..\lib-src $(MAKE) $(MFLAGS) clean cd ..\src $(MAKE) $(MFLAGS) clean cd ..\doc\lispintro $(MAKE) $(MFLAGS) clean cd ..\doc\lispref $(MAKE) $(MFLAGS) clean cd ..\leim $(MAKE) $(MFLAGS) clean cd ..\doc\emacs $(MAKE) $(MFLAGS) clean cd ..\doc\misc $(MAKE) $(MFLAGS) clean cd ..\nt clean-other-dirs-gmake: $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref clean cleanall-other-dirs-nmake: cd ..\lib-src $(MAKE) $(MFLAGS) cleanall cd ..\src $(MAKE) $(MFLAGS) cleanall cd ..\nt cleanall-other-dirs-gmake: $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src cleanall $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src cleanall # We used to delete *~ here, but that might inadvertently remove # precious files if it happens to match their short 8+3 aliases. cleanall: clean cleanall-other-dirs-$(MAKETYPE) - $(DEL_TREE) obj - $(DEL_TREE) obj-spd - $(DEL_TREE) oo - $(DEL_TREE) oo-spd top-distclean: - $(DEL) $(COMPILER_TEMP_FILES) - $(DEL_TREE) obj - $(DEL_TREE) obj-spd - $(DEL_TREE) oo - $(DEL_TREE) oo-spd - $(DEL) stamp_BLD - $(DEL) ../etc/DOC ../etc/DOC-X - $(DEL) config.log Makefile distclean: distclean-other-dirs-$(MAKETYPE) top-distclean distclean-other-dirs-nmake: cd ..\lib-src $(MAKE) $(MFLAGS) distclean cd ..\src $(MAKE) $(MFLAGS) distclean cd ..\lisp $(MAKE) $(MFLAGS) distclean cd ..\leim $(MAKE) $(MFLAGS) distclean cd ..\doc\emacs $(MAKE) $(MFLAGS) distclean cd ..\doc\misc $(MAKE) $(MFLAGS) distclean cd ..\doc\lispintro $(MAKE) $(MFLAGS) distclean cd ..\doc\lispref $(MAKE) $(MFLAGS) distclean cd ..\nt distclean-other-dirs-gmake: $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src distclean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src distclean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp distclean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim distclean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs distclean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc distclean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro distclean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref distclean maintainer-clean: maintainer-clean-other-dirs-$(MAKETYPE) top-distclean maintainer-clean-other-dirs-nmake: cd ..\lib-src $(MAKE) $(MFLAGS) maintainer-clean cd ..\src $(MAKE) $(MFLAGS) maintainer-clean cd ..\lisp $(MAKE) $(MFLAGS) maintainer-clean cd ..\leim $(MAKE) $(MFLAGS) maintainer-clean cd ..\doc\emacs $(MAKE) $(MFLAGS) maintainer-clean cd ..\doc\misc $(MAKE) $(MFLAGS) maintainer-clean cd ..\doc\lispintro $(MAKE) $(MFLAGS) maintainer-clean cd ..\doc\lispref $(MAKE) $(MFLAGS) maintainer-clean cd ..\nt maintainer-clean-other-dirs-gmake: $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src maintainer-clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src maintainer-clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp maintainer-clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim maintainer-clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs maintainer-clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc maintainer-clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro maintainer-clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref maintainer-clean realclean: cleanall - $(DEL_TREE) ../bin