annotate nt/gmake.defs @ 99501:e3acb52d33e1

2008-11-12 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-yank): Make any prefix force normal yanking. Suppress folding if text would be swallowed into a folded subtree. (org-yank-folded-subtrees, org-yank): Docstring updates. * org-agenda.el (org-agenda-compare-effort): Treat no effort defined as 0. * org-exp.el (org-export-language-setup): Add Catalan and Esperanto language entries. 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-refile): Allow refiling of entire regions. * org-clock.el (org-clock-time%): New function. * org.el (org-entry-get, org-entry-delete): Use safer regexps to retrieve property values. 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-list): Handle the value `only' of org-agenda-show-log'. (org-agenda-log-mode): Interpret a double prefix arg. 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-html-footnotes-section): New variable. (org-export-as-html): Use `org-export-html-footnotes-section' to insert the footnotes. (org-export-language-setup): Add "Footnotes" to language words. 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-yank): Fix bug when not inserting a subtree. 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com> * org-vm.el (org-vm-follow-link): Call `vm-preview-current-message' instead of `vm-beginning-of-message'. * org.el (org-make-link-regexps): Make sure that links to gnus can contain brackets. 2008-11-12 Carsten Dominik <carsten.dominik@gmail.com> * org-attach.el (org-attach-dir): Remove duplicate ID creation code. * org-id.el (org-id-new): Use `org-trim' to extract the uuid from shell output. * org.el (org-link-abbrev-alist): Improve customization type. * org-attach.el (org-attach-expand-link, org-attach-expand): New functions. * org-agenda.el (org-agenda-get-progress): Renamed from `org-get-closed'. Implement searching for state changes as well. (org-agenda-log-mode-items): New option. (org-agenda-log-mode): New option prefix argument, interpreted as request to show all possible progress info. (org-agenda-get-day-entries): Call `org-get-progress' instead of `org-get-closed'. (org-agenda-set-mode-name): Handle the more complex log mode settings. (org-get-closed): New alias, pointing to `org-get-progress'. 2008-11-12 Carsten Dominik <dominik@science.uva.nl> * org.el (org-file-apps-defaults-gnu) (org-file-apps-defaults-macosx) (org-file-apps-defaults-windowsnt): Add an entry defining the system command. (org-file-apps): Allow `system' as key and value. (org-open-at-point): Explain the effect of a double prefix arg. (org-open-file): If the argument `in-emacs' is (16), i.e. corresponding to a double prefix argument, try to open the file externally. 2008-11-12 Carsten Dominik <dominik@science.uva.nl> * org.el (org-insert-link): Abbreviate absolute files names in links. Also, fix a bug in which the double C-u prefix would not be honored. 2008-11-12 Carsten Dominik <dominik@science.uva.nl> * org.el (org-insert-heading): If buffer does not end with a newline, add one if necessary to insert headline correctly. * org-exp.el (org-export-as-html): Make sure that <hr/> is between paragraphs, not inside. * org.el (org-todo): Quote `org-agenda-headline-snapshot-before-repeat'. * org-exp.el (org-export-as-html): Fully process link descriptions. (org-export-html-format-desc): New function. (org-export-as-html): Collect footnotes into the correct basket. (org-html-protect): No longer protect quotations marks here, this goes wrong. * org-agenda.el (org-agenda-remove-marked-text): Bind variable BEG. * org-compat.el (org-fit-window-to-buffer): New function (not really, a preliminary and incomplete version was present earlier, but not used). * org.el (org-fast-todo-selection, org-fast-tag-selection): Use `org-fit-window-to-buffer'. * org-exp.el (org-export): Use `org-fit-window-to-buffer'. * org-agenda.el (org-agenda-get-restriction-and-command) (org-fit-agenda-window, org-agenda-convert-date): Use `org-fit-window-to-buffer'. * org-exp.el (org-export-as-html): Process href links through `org-export-html-format-href'. (org-export-html-format-href): New function. * org-agenda.el (org-agenda-todo): Update only the current headline if this is a repeated TODO, marked done for today. (org-agenda-change-all-lines): New argument JUST-THIS, to change only the current line. * org.el (org-todo): Take a snapshot of the headline if the repeater might change it. 2008-11-12 Carsten Dominik <dominik@science.uva.nl> * org-publish.el (org-publish-find-title): Remove buffers visited only for extracting the title. * org-exp.el (org-export-html-style) (org-export-html-style-default): Mark style definitions as unparsed CDATA. * org-publish.el (org-publish-validate-link): Function re-introduced. 2008-11-12 Charles Sebold <csebold@gmail.com> * org-plot.el (org-plot/add-options-to-plist): Supports timefmt property. (org-plot-quote-timestamp-field): New function. (org-plot-quote-tsv-field): Call timestamp field function when necessary rather than just quoting as a string. (org-plot/gnuplot-to-data): Pass in timefmt property. (org-plot/gnuplot-script): Supports timefmt property. (org-plot/gnuplot): Checks for timestamp column before checking for text index column. 2008-11-12 Carsten Dominik <dominik@science.uva.nl> * org.el (org-insert-heading): Improve behavior with hidden subtrees. * org-publish.el (org-publish-org-index): Create a section in the index file. (org-publish-org-index): Stop linking to directories. * org.el (org-emphasis-alist): Use span instead of <u> to underline text. * org-exp.el (org-export-as-html): Make sure <p> is closed before <pre> sections. 2008-11-12 Sebastian Rose <sebastian_rose@gmx.de> * org-jsinfo.el (org-infojs-template): Remove language attribute from script tag. 2008-11-12 Carsten Dominik <dominik@science.uva.nl> * org-agenda.el (org-agenda-remove-marked-text): New function. (org-agenda-mark-filtered-text) (org-agenda-unmark-filtered-text): New functions. (org-write-agenda): Remove fltered text. * org.el (org-make-tags-matcher): Give access to TODO "property" without speed penalty. 2008-11-12 Carsten Dominik <dominik@science.uva.nl> * org.el (org-link-frame-setup): Add `org-gnus-no-new-news' as an option. (org-store-link-props): Make sure adding to the plist works correctly. * org-gnus.el (org-gnus-no-new-news): New function. (org-gnus-follow-link): Allow the article ID to be a message-id, in addition to allowing article numbers. Message IDs make much more roubust links. (org-gnus-store-link): Use message-id to create link. 2008-11-12 Carsten Dominik <dominik@science.uva.nl> * org.el (org-emphasize): Reverse the selection array. (org-emphasis-alist): Set <code> tags for the verbatim environment. * org-remember.el (org-remember-handler): Fix bug with prefix-related changing of the note storage target. * org-exp.el (org-print-icalendar-entries): Make the exported priorities compatible with RFC 2445. * org-clock.el (org-clock-save): Insert time stamp without dependence on time-stamp.el. 2008-11-12 Carsten Dominik <dominik@science.uva.nl> * org.el ("saveplace"): If saveplace puts point into an invisible location, make it visible. (org-make-tags-matcher): Allow inactive time stamps in time comparisons. (org-yank-adjusted-subtrees): New option. (org-yank): Incorporate adjusting trees. (org-paste-subtree): New argument FOR-YANK which will cause insertion at point without backing up over white lines, and leave point at the end of the inserted text. Also if the cursor is at the beginning of a headline, use the same level or the inserted tree. * org-publish.el (org-publish-get-base-files-1): Deal correctly with broken symlinks 2008-11-12 Carsten Dominik <dominik@science.uva.nl> * org-exp.el (org-export-select-tags, org-get-current-options): Fix typo.
author Carsten Dominik <dominik@science.uva.nl>
date Wed, 12 Nov 2008 08:01:06 +0000
parents beacc13fd3df
children aeceb2460b39
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
55092
9077e3f7cd49 Add "-*- makefile -*-" mode tag.
Juanma Barranquero <lekktu@gmail.com>
parents: 53738
diff changeset
1 # -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
94795
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
2 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
3 # 2008 Free Software Foundation, Inc.
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
4
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
5 # This file is part of GNU Emacs.
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
6
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
7 # GNU Emacs is free software: you can redistribute it and/or modify
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
8 # it under the terms of the GNU General Public License as published by
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
9 # the Free Software Foundation, either version 3 of the License, or
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
10 # (at your option) any later version.
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
11
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
12 # GNU Emacs is distributed in the hope that it will be useful,
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
15 # GNU General Public License for more details.
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
16
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
17 # You should have received a copy of the GNU General Public License
188974bfdea0 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93591
diff changeset
18 # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
19
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
20 # Ensure 'all' is the default target
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
21 all:
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
22
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
23 # NOTES
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49525
diff changeset
24 #
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
25 # I tried to force gmake to use the native shell for simplicity, by
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
26 # setting SHELL as below, but this didn't work reliably because of
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
27 # various case sensitivity niggles. Specifically, COMSPEC (which is in
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
28 # fact usually spelled ComSpec on NT, to make life difficult) typically
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
29 # references "cmd.exe" (on NT) when the file is actually called
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
30 # "CMD.EXE" on disk for hysterical raisons. As a result, GNU make
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
31 # thinks it doesn't exist (unless compiled with a switch to ignore
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
32 # case), and so doesn't change which shell it will invoke to execute
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
33 # commands.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49525
diff changeset
34 #
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
35 # It would be possible, though very tedious using just gmake facilities,
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
36 # to convert the COMSPEC value to uppercase to solve this problem, but
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
37 # it isn't worth it. That is partly because, even when using the native
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
38 # shell, gmake tends to not be happy with backslashes in command
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
39 # strings. The obvious solution is to use forward slashes as much as
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
40 # possible, which can be made to work most of the time (putting
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
41 # filenames in quotes often helps), but there are still some internal
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
42 # cmd.exe commands like `del' and `copy' that won't work with them.
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
43 # Although it is possible to convert slashes to backslashes when
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
44 # necessary, gmake requires explicitly calling its subst function, which
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
45 # nmake does not understand). For this reason, it is simplest to
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
46 # mandate that rm and cp be available, so we can use Unix-format file
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
47 # names everywhere. (Fortunately both MS and GNU make, and the
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
48 # respective compilers, are happy with Unix-format names.)
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49525
diff changeset
49 #
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
50 # Since we cannot easily force the choice of a particular shell, we must
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
51 # make the effort to cope with whichever shell is being used.
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
52 # Fortunately, the only command we need to use that is shell specific is
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
53 # the testing of a file's existence for the purpose of working out when
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
54 # we are copying files to their original location. That particular
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
55 # requirement is abstracted easily enough.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49525
diff changeset
56 #
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
57 # The only other problem area was the change of directory when running
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
58 # temacs to dump emacs.exe (where gmake doesn't support cd foo in any
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
59 # useful way), but that has been resolved by modifying the Windows
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
60 # unexec function slightly to not require the directory change while
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
61 # still allowing objects and binaries to be in subdirectories.
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
62
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
63 # This doesn't work.
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
64 #SHELL:=$(COMSPEC)
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
65
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
66 # Determine whether make is using sh or cmd/command as shell; cmd.exe
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
67 # will output "ECHO is on" when echo is given by itself, while sh will
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
68 # not produce any output.
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
69 sh_output := $(shell echo)
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
70 ifeq "$(findstring ECHO, $(sh_output))" "ECHO"
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
71 THE_SHELL = $(COMSPEC)$(ComSpec)
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
72 SHELLTYPE=CMD
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
73 else
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
74 USING_SH = 1
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
75 THE_SHELL = $(SHELL)
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
76 SHELLTYPE=SH
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
77 endif
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
78
35103
2ed117dc79cf (EMACS_ICON_PATH): Delete definition.
Andrew Innes <andrewi@gnu.org>
parents: 34276
diff changeset
79 MAKETYPE=gmake
2ed117dc79cf (EMACS_ICON_PATH): Delete definition.
Andrew Innes <andrewi@gnu.org>
parents: 34276
diff changeset
80
49525
7dcad50a6b3e Disable cygpath kludge.
Jason Rumney <jasonr@gnu.org>
parents: 49258
diff changeset
81 # The following "ifeq" does not appear to DTRT, and therefore breaks
7dcad50a6b3e Disable cygpath kludge.
Jason Rumney <jasonr@gnu.org>
parents: 49258
diff changeset
82 # the build on mingw32. Also the -m option does not exist in many
7dcad50a6b3e Disable cygpath kludge.
Jason Rumney <jasonr@gnu.org>
parents: 49258
diff changeset
83 # (reasonably recent even) versions of Cygwin. These issues need to be
7dcad50a6b3e Disable cygpath kludge.
Jason Rumney <jasonr@gnu.org>
parents: 49258
diff changeset
84 # remedied before putting this cygpath kludge back in.
7dcad50a6b3e Disable cygpath kludge.
Jason Rumney <jasonr@gnu.org>
parents: 49258
diff changeset
85
49258
eea4a0604c4a (CURDIR): Convert to native Windows format (with
Andrew Innes <andrewi@gnu.org>
parents: 48375
diff changeset
86 # Convert CURDIR to native file name, if in Cygwin format
49525
7dcad50a6b3e Disable cygpath kludge.
Jason Rumney <jasonr@gnu.org>
parents: 49258
diff changeset
87 #ifeq "$(shell cygpath $(CURDIR))" "$(CURDIR)"
7dcad50a6b3e Disable cygpath kludge.
Jason Rumney <jasonr@gnu.org>
parents: 49258
diff changeset
88 #CURDIR := $(shell cygpath -m $(CURDIR))
7dcad50a6b3e Disable cygpath kludge.
Jason Rumney <jasonr@gnu.org>
parents: 49258
diff changeset
89 #endif
7dcad50a6b3e Disable cygpath kludge.
Jason Rumney <jasonr@gnu.org>
parents: 49258
diff changeset
90
35899
0158865560da (THISDIR): New definition.
Andrew Innes <andrewi@gnu.org>
parents: 35103
diff changeset
91 THISDIR = .
0158865560da (THISDIR): New definition.
Andrew Innes <andrewi@gnu.org>
parents: 35103
diff changeset
92
34257
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
93 # Cygwin has changed quoting rules somewhat since b20, in a way that
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
94 # affects makefiles using sh as the command processor, so we need to
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
95 # detect which rules to use.
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
96 ifdef USING_SH
37972
84ecffb66da7 (sh_output): Don't use $(warning ...) to output
Andrew Innes <andrewi@gnu.org>
parents: 37778
diff changeset
97 sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2)
34257
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
98 sh_output := $(shell echo foo")
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
99 ifeq "$(sh_output)" ""
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
100 NEW_CYGWIN = 1
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
101 endif
79893
98745918608f (CYGWIN) [USING_SH]: Disable mapping of file permissions to NTFS ACLs.
Jason Rumney <jasonr@gnu.org>
parents: 79730
diff changeset
102
98745918608f (CYGWIN) [USING_SH]: Disable mapping of file permissions to NTFS ACLs.
Jason Rumney <jasonr@gnu.org>
parents: 79730
diff changeset
103 # By default, newer versions of Cygwin mess with NTFS ACLs in an
98745918608f (CYGWIN) [USING_SH]: Disable mapping of file permissions to NTFS ACLs.
Jason Rumney <jasonr@gnu.org>
parents: 79730
diff changeset
104 # attempt to emulate traditional posix file permissions. This can
98745918608f (CYGWIN) [USING_SH]: Disable mapping of file permissions to NTFS ACLs.
Jason Rumney <jasonr@gnu.org>
parents: 79730
diff changeset
105 # cause bad effects, such as .exe files that are missing the
98745918608f (CYGWIN) [USING_SH]: Disable mapping of file permissions to NTFS ACLs.
Jason Rumney <jasonr@gnu.org>
parents: 79730
diff changeset
106 # FILE_EXECUTE/FILE_GENERIC_EXECUTE permissions when they are created
98745918608f (CYGWIN) [USING_SH]: Disable mapping of file permissions to NTFS ACLs.
Jason Rumney <jasonr@gnu.org>
parents: 79730
diff changeset
107 # with Cygwin commands that don't expect to be creating executable
98745918608f (CYGWIN) [USING_SH]: Disable mapping of file permissions to NTFS ACLs.
Jason Rumney <jasonr@gnu.org>
parents: 79730
diff changeset
108 # files. Then when we later use a non-Cygwin program to create the
98745918608f (CYGWIN) [USING_SH]: Disable mapping of file permissions to NTFS ACLs.
Jason Rumney <jasonr@gnu.org>
parents: 79730
diff changeset
109 # real .exe, the previous Cygwin defined ACL sticks.
98745918608f (CYGWIN) [USING_SH]: Disable mapping of file permissions to NTFS ACLs.
Jason Rumney <jasonr@gnu.org>
parents: 79730
diff changeset
110 CYGWIN=nontsec
98745918608f (CYGWIN) [USING_SH]: Disable mapping of file permissions to NTFS ACLs.
Jason Rumney <jasonr@gnu.org>
parents: 79730
diff changeset
111 export CYGWIN
34257
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
112 endif
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
113
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
114 ALL_DEPS = $^
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
115 EMPTY =
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
116 SPACE = $(EMPTY) $(EMPTY)
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
117
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
118 SUBSYSTEM_WINDOWS=-Wl,-subsystem,windows
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
119 SUBSYSTEM_CONSOLE=-Wl,-subsystem,console
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
120
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
121 # INSTALL_DIR is the directory into which emacs will be installed.
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
122 #
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
123 ifndef INSTALL_DIR
34276
1e1283190fbc (SETLOADPATH): Set EMACSLOADPATH to an absolute directory,
Andrew Innes <andrewi@gnu.org>
parents: 34257
diff changeset
124 INSTALL_DIR = $(CURDIR)/..
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
125 endif
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
126
37381
fa2805c46667 (SETLOADPATH): Remove definition.
Andrew Innes <andrewi@gnu.org>
parents: 36859
diff changeset
127 export EMACSLOADPATH
fa2805c46667 (SETLOADPATH): Remove definition.
Andrew Innes <andrewi@gnu.org>
parents: 36859
diff changeset
128
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
129 # Determine the architecture we're running on.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49525
diff changeset
130 # Define ARCH for our purposes;
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
131 # Define CPU for use by ntwin32.mak;
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
132 # Define CONFIG_H to the appropriate config.h for the system;
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
133 #
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
134 ifdef PROCESSOR_ARCHITECTURE
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
135 # We're on Windows NT
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
136 CPU = $(PROCESSOR_ARCHITECTURE)
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
137 CONFIG_H = config.nt
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
138 OS_TYPE = windowsnt
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
139 ifeq "$(PROCESSOR_ARCHITECTURE)" "x86"
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
140 ARCH = i386
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
141 CPU = i386
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
142 else
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
143 ifeq "$(PROCESSOR_ARCHITECTURE)" "MIPS"
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
144 ARCH = mips
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
145 else
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
146 ifeq "$(PROCESSOR_ARCHITECTURE)" "ALPHA"
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
147 ARCH = alpha
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
148 else
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
149 ifeq "$(PROCESSOR_ARCHITECTURE)" "PPC"
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
150 ARCH = ppc
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
151 else
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
152 error Unknown architecture type "$(PROCESSOR_ARCHITECTURE)"
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
153 endif
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
154 endif
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
155 endif
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
156 endif
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
157 else
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
158 # We're on Windows 95
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
159 ARCH = i386
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
160 CPU = i386
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
161 CONFIG_H = config.nt
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
162 OS_TYPE = windows95
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
163 endif
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
164
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
165 AR = ar -rsc
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
166 AR_OUT =
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
167 CC = gcc
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
168 CC_OUT = -o$(SPACE)
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
169 LINK = gcc
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
170 LINK_OUT = -o$(SPACE)
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
171 RC = windres -O coff
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
172 RC_OUT = -o$(SPACE)
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
173 RC_INCLUDE = --include-dir$(SPACE)
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
174
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49525
diff changeset
175 libc =
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49525
diff changeset
176 baselibs =
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
177 O = o
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
178 A = a
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
179
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
180 BASE_LIBS = $(libc) $(baselibs)
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
181
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
182 ADVAPI32 = -ladvapi32
78901
49b3874a608d (COMCTL32): New system library.
Jason Rumney <jasonr@gnu.org>
parents: 78246
diff changeset
183 COMCTL32 = -lcomctl32
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
184 COMDLG32 = -lcomdlg32
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
185 GDI32 = -lgdi32
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
186 MPR = -lmpr
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
187 SHELL32 = -lshell32
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
188 USER32 = -luser32
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
189 WSOCK32 = -lwsock32
78102
713ed3402287 (OLE32): New library to link.
Jason Rumney <jasonr@gnu.org>
parents: 75348
diff changeset
190 WINMM = -lwinmm
53738
db94fc6b4b22 gmake.defs, nmake.defs: Add linking to ``winspool.lib''.
Jason Rumney <jasonr@gnu.org>
parents: 52401
diff changeset
191 WINSPOOL = -lwinspool
78102
713ed3402287 (OLE32): New library to link.
Jason Rumney <jasonr@gnu.org>
parents: 75348
diff changeset
192 OLE32 = -lole32
93591
e106254b75f2 (UNISCRIBE): New variable.
Jason Rumney <jasonr@gnu.org>
parents: 92477
diff changeset
193 UNISCRIBE = -lusp10
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
194
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
195 ifdef NOOPT
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
196 DEBUG_CFLAGS = -DEMACSDEBUG
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
197 else
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49525
diff changeset
198 DEBUG_CFLAGS =
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
199 endif
96938
beacc13fd3df * configure.bat: New option --profile.
Jason Rumney <jasonr@gnu.org>
parents: 96348
diff changeset
200 CFLAGS = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
96348
ecd6143014da Remove unneeded -Defines in the compiler command line (MinGW and MSVC).
Juanma Barranquero <lekktu@gmail.com>
parents: 96211
diff changeset
201 EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
202
96938
beacc13fd3df * configure.bat: New option --profile.
Jason Rumney <jasonr@gnu.org>
parents: 96348
diff changeset
203 ifdef PROFILE
beacc13fd3df * configure.bat: New option --profile.
Jason Rumney <jasonr@gnu.org>
parents: 96348
diff changeset
204 PROFILE_CFLAGS = -pg
beacc13fd3df * configure.bat: New option --profile.
Jason Rumney <jasonr@gnu.org>
parents: 96348
diff changeset
205 PROFILE_LDFLAGS = -pg
beacc13fd3df * configure.bat: New option --profile.
Jason Rumney <jasonr@gnu.org>
parents: 96348
diff changeset
206 else
beacc13fd3df * configure.bat: New option --profile.
Jason Rumney <jasonr@gnu.org>
parents: 96348
diff changeset
207 PROFILE_CFLAGS =
beacc13fd3df * configure.bat: New option --profile.
Jason Rumney <jasonr@gnu.org>
parents: 96348
diff changeset
208 PROFILE_LDFLAGS =
beacc13fd3df * configure.bat: New option --profile.
Jason Rumney <jasonr@gnu.org>
parents: 96348
diff changeset
209 endif
beacc13fd3df * configure.bat: New option --profile.
Jason Rumney <jasonr@gnu.org>
parents: 96348
diff changeset
210
beacc13fd3df * configure.bat: New option --profile.
Jason Rumney <jasonr@gnu.org>
parents: 96348
diff changeset
211
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
212 # see comments in allocate_heap in w32heap.c before changing any of the
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
213 # -stack, -heap, or -image-base settings.
67799
777686a58a18 (TEMACS_EXTRA_LINK): Remove redundant -g.
Eli Zaretskii <eliz@gnu.org>
parents: 64890
diff changeset
214 TEMACS_EXTRA_LINK = -Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 $(SUBSYSTEM_CONSOLE) -Wl,-entry,__start -Wl,-Map,$(BLD)/temacs.map
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
215
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
216 ifdef NOOPT
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
217 OBJDIR = oo
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
218 else
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
219 OBJDIR = oo-spd
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
220 endif
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
221 $(OBJDIR):; -mkdir "$(OBJDIR)"
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
222 BLD = $(OBJDIR)/$(ARCH)
74798
88b3fcab31de (stamp_BLD): Rename from $(BLD). Create a file stamp_BLD after creating the
Eli Zaretskii <eliz@gnu.org>
parents: 68648
diff changeset
223 stamp_BLD: $(OBJDIR)
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
224 -mkdir "$(BLD)"
74798
88b3fcab31de (stamp_BLD): Rename from $(BLD). Create a file stamp_BLD after creating the
Eli Zaretskii <eliz@gnu.org>
parents: 68648
diff changeset
225 echo $(BLD) > $@
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
226
35103
2ed117dc79cf (EMACS_ICON_PATH): Delete definition.
Andrew Innes <andrewi@gnu.org>
parents: 34276
diff changeset
227 COMPILER_TEMP_FILES =
2ed117dc79cf (EMACS_ICON_PATH): Delete definition.
Andrew Innes <andrewi@gnu.org>
parents: 34276
diff changeset
228
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
229 CP = cp -f
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
230 CP_DIR = cp -rf
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
231 DEL = rm
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
232 DEL_TREE = rm -r
34257
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
233
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
234 ifdef USING_SH
34257
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
235
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
236 IFNOTSAMEDIR = if [ ! -s ../same-dir.tst ] ; then
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
237 FOREACH = for f in
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
238 FORVAR = $${f}
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
239 FORDO = ; do
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
240 ENDFOR = ; done
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
241 ENDIF = ; fi
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
242 ARGQUOTE = '
34257
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
243 ifdef NEW_CYGWIN
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
244 DQUOTE = "
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
245 else
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
246 DQUOTE = ""
34257
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
247 endif
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
248
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
249 else
34257
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
250
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
251 IFNOTSAMEDIR = if not exist ../same-dir.tst
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
252 FOREACH = for %%f in (
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
253 FORVAR = %%f
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
254 FORDO = ) do
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
255 ENDFOR =
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
256 ENDIF =
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
257 ARGQUOTE = "
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
258 DQUOTE = \"
34257
8f4d667d32c2 (NEW_CYGWIN): New define.
Andrew Innes <andrewi@gnu.org>
parents: 31679
diff changeset
259
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
260 endif
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
261
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
262 ifdef NODEBUG
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49525
diff changeset
263 DEBUG_FLAG =
36859
d4c0b7a5bc48 (DEBUG_LINK): New macro.
Andrew Innes <andrewi@gnu.org>
parents: 36375
diff changeset
264 DEBUG_LINK =
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
265 else
96211
fde585d63804 * gmake.defs (DEBUG_FLAG, DEBUG_LINK) [!NODEBUG]:
Juanma Barranquero <lekktu@gmail.com>
parents: 94795
diff changeset
266 DEBUG_FLAG = $(DEBUG_INFO)
fde585d63804 * gmake.defs (DEBUG_FLAG, DEBUG_LINK) [!NODEBUG]:
Juanma Barranquero <lekktu@gmail.com>
parents: 94795
diff changeset
267 DEBUG_LINK = $(DEBUG_INFO)
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
268 endif
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
269
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
270 ifdef NOCYGWIN
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
271 NOCYGWIN = -mno-cygwin
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
272 endif
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
273
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
274 ifeq "$(ARCH)" "i386"
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
275 ifdef NOOPT
96348
ecd6143014da Remove unneeded -Defines in the compiler command line (MinGW and MSVC).
Juanma Barranquero <lekktu@gmail.com>
parents: 96211
diff changeset
276 ARCH_CFLAGS = -c $(DEBUG_FLAG) $(NOCYGWIN)
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
277 else
96348
ecd6143014da Remove unneeded -Defines in the compiler command line (MinGW and MSVC).
Juanma Barranquero <lekktu@gmail.com>
parents: 96211
diff changeset
278 ARCH_CFLAGS = -c $(DEBUG_FLAG) $(NOCYGWIN) $(MCPU_FLAG) -O2 \
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
279 # -fbuiltin \
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
280 # -finline-functions \
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
281 # -fomit-frame-pointer
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
282 endif
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
283 ARCH_LDFLAGS = $(SYS_LDFLAGS)
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
284 else
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
285 ERROR Unknown architecture type "$(ARCH)".
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
286 endif
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
287
96938
beacc13fd3df * configure.bat: New option --profile.
Jason Rumney <jasonr@gnu.org>
parents: 96348
diff changeset
288 LINK_FLAGS = $(ARCH_LDFLAGS) $(DEBUG_LINK) $(PROFILE_LDFLAGS) $(NOCYGWIN) $(USER_LDFLAGS)
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
289
74843
e6d566316abc Export XMFLAGS.
Eli Zaretskii <eliz@gnu.org>
parents: 74798
diff changeset
290 export XMFLAGS
e6d566316abc Export XMFLAGS.
Eli Zaretskii <eliz@gnu.org>
parents: 74798
diff changeset
291
31679
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
292 .DEFAULT:
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
293
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
294 $(BLD)/%.o: %.c
7e706d145fab Revert to Unix line endings.
Andrew Innes <andrewi@gnu.org>
parents: 31627
diff changeset
295 $(CC) $(CFLAGS) $(CC_OUT)$@ $<
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
296
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
297 # arch-tag: 35eb9662-8534-4bcf-b891-0730a09d657f