Mercurial > emacs
view nt/nmake.defs @ 68129:6f5da26b0df1
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-690
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 174-181)
- Update from CVS
- Update from CVS: texi/gnus.texi (RSS): Addition.
2006-01-10 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-wash-html-in-text-plain-parts): New variable.
(nnrss-request-article): Render text/plain parts as HTML.
* lisp/gnus/gnus-art.el (gnus-article-wash-html-with-w3m): No need to narrow
the buffer.
2006-01-08 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-cus.el (gnus-group-parameters): Sync posting-style with
custom definition of `gnus-posting-styles'.
* lisp/gnus/gnus-start.el (gnus-gnus-to-quick-newsrc-format): Bind
print-circle. Suggested by Kalle Olavi Niemitalo <kon@iki.fi>.
2006-01-05 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-group.el (gnus-useful-groups): Use Gmane for ding. Use
nntp for bug archive.
2006-01-05 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-request-article): Fix the way to fill text/plain
parts.
(nnrss-normalize-date): New function converts ISO 8601 date into
RFC822 style. Suggested by Mark Plaksin <happy@mcplaksin.org>.
(nnrss-check-group): Use it.
2006-01-03 Rodrigo Ventura <yoda@isr.ist.utl.pt> (tiny change)
* lisp/gnus/gnus-xmas.el (gnus-xmas-group-startup-message): Typo
gnus-splash-face -> gnus-splash. Fixes starting from a TTY in
XEmacs.
2006-01-01 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-sum.el (gnus-summary-work-articles): Remove useless `min'.
* lisp/gnus/nnrss.el (nnrss-fetch): Make it fail gracefully when it can't
fetch a feed. Suggested by Mark Plaksin <happy@mcplaksin.org>.
(nnrss-insert-w3): Ditto.
2005-12-21 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-request-article): Fix last change; fill
text/plain parts.
2005-12-20 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-request-article): Replace <br />s with newlines
in text/plain part.
(nnrss-check-group): Don't add excessive newline to dc:subject.
2005-12-19 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (gnus-article-delete-text-of-type): Enable it to
remove MIME buttons associated with multipart/alternative parts.
(gnus-mime-display-alternative): Tag buttons using `article-type'
text property.
* lisp/gnus/gnus-msg.el (gnus-copy-article-buffer): Remove MIME buttons
associated with multipart/alternative parts.
2005-12-19 Mark Plaksin <happy@mcplaksin.org> (tiny change)
* lisp/gnus/nnrss.el (nnrss-check-group): Put the RSS dc:subject in the
article.
2005-12-18 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/dns.el (query-dns): Make sure we check the buffer size before
removing tcp headers.
2006-01-10 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (RSS): Document nnrss-wash-html-in-text-plain-parts.
2006-01-06 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (RSS): Addition.
2005-12-22 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Summary Post Commands): Fix function bound to `S O p'.
2005-12-19 Katsumi Yamaoka <yamaoka@jpl.org>
* man/emacs-mime.texi (Display Customization): Add setting example to
mm-discouraged-alternatives.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 11 Jan 2006 02:03:24 +0000 |
parents | 3723093a21fd |
children | 067115a6e738 2d92f5c9d6ae |
line wrap: on
line source
# -*- Makefile -*- definition file for building GNU Emacs on Windows NT. # Copyright (C) 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. # # 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 2, 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; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. # Ensure 'all' is the default target all: THE_SHELL = $(COMSPEC) SHELLTYPE=CMD MAKETYPE=nmake CURDIR = $(MAKEDIR:\=/) THISDIR = $(MAKEDIR) ALL_DEPS = $** SUBSYSTEM_WINDOWS=-subsystem:windows SUBSYSTEM_CONSOLE=-subsystem:console # INSTALL_DIR is the directory into which emacs will be installed. # !ifndef INSTALL_DIR INSTALL_DIR = $(CURDIR)/.. !endif # Ensure EMACSLOADPATH is defined in the environment. # !if [set EMACSLOADPATH=foo] !endif # Allow detection of builds with MSVC 5 or later, so we can # speed up compiles (see rule at end). # _NMAKE_VER_5=162 _NMAKE_VER_4=0 !IFNDEF _NMAKE_VER _NMAKE_VER=$(_NMAKE_VER_4) !ENDIF # Check that the INCLUDE and LIB environment variables are set. # !ifndef INCLUDE !error The INCLUDE environment variable needs to be set. !endif !ifndef LIB !error The LIB environment variable needs to be set. !endif # Determine the architecture we're running on. # Define ARCH for our purposes; # Define CPU for use by ntwin32.mak; # Define CONFIG_H to the appropriate config.h for the system; # !ifdef PROCESSOR_ARCHITECTURE # We're on Windows NT CPU = $(PROCESSOR_ARCHITECTURE) CONFIG_H = config.nt OS_TYPE = windowsnt ! if "$(PROCESSOR_ARCHITECTURE)" == "x86" ARCH = i386 CPU = i386 ! else ! if "$(PROCESSOR_ARCHITECTURE)" == "MIPS" ARCH = mips ! else ! if "$(PROCESSOR_ARCHITECTURE)" == "ALPHA" ARCH = alpha ! else ! if "$(PROCESSOR_ARCHITECTURE)" == "PPC" ARCH = ppc ! else ! error Unknown architecture type "$(PROCESSOR_ARCHITECTURE)" ! endif ! endif ! endif ! endif !else # We're on Windows 95 ARCH = i386 CPU = i386 CONFIG_H = config.nt OS_TYPE = windows95 !endif AR = lib AR_OUT = -out: CC = cl CC_OUT = -Fo LINK = link LINK_OUT = -out: RC = rc RC_OUT = -Fo RC_INCLUDE = -i libc = libc.lib baselibs = O = obj A = lib BASE_LIBS = $(libc) $(baselibs) oldnames.lib ADVAPI32 = advapi32.lib COMDLG32 = comdlg32.lib GDI32 = gdi32.lib MPR = mpr.lib SHELL32 = shell32.lib USER32 = user32.lib WSOCK32 = wsock32.lib WINMM = winmm.lib WINSPOOL = winspool.lib !ifdef NOOPT DEBUG_CFLAGS = -DEMACSDEBUG !else DEBUG_CFLAGS = !endif CFLAGS = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 $(ARCH_CFLAGS) -D$(ARCH) \ -D_CRTAPI1=_cdecl $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS) EMACS_EXTRA_C_FLAGS = SYS_LDFLAGS = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj # see comments in allocate_heap in w32heap.c before changing any of the # -stack, -heap, or -base settings. TEMACS_EXTRA_LINK = -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -debugtype:both -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) $(SUBSYSTEM_CONSOLE) -entry:_start -map:$(BLD)\temacs.map $(EXTRA_LINK) !ifdef NOOPT OBJDIR = obj !else OBJDIR = obj-spd !endif $(OBJDIR):; -mkdir $(OBJDIR) BLD = $(OBJDIR)/$(ARCH) $(BLD): $(OBJDIR) -mkdir "$(BLD)" COMPILER_TEMP_FILES = *.pdb CP = cp -f CP_DIR = cp -rf IFNOTSAMEDIR = if not exist ..\same-dir.tst ENDIF = FOREACH = for %%f in ( FORVAR = %%f FORDO = ) do ENDFOR = ARGQUOTE = " # " DQUOTE = \" DEL = rm DEL_TREE = rm -r !ifdef NODEBUG DEBUG_FLAG = DEBUG_LINK = !else DEBUG_FLAG = -Zi DEBUG_LINK = -debug:full -debugtype:both !endif !if "$(ARCH)" == "i386" !ifdef NOOPT ARCH_CFLAGS = -nologo -D_X86_=1 -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG) !else ARCH_CFLAGS = -nologo -D_X86_=1 -c -Zel -W2 -H63 -Oxsb2 -Oy- -G6dF -Zp8 $(DEBUG_FLAG) !endif ARCH_LDFLAGS = $(SYS_LDFLAGS) !else !if "$(ARCH)" == "mips" ARCH_CFLAGS = -D_MIPS_=1 -c -W2 -Zi -Od -Gt0 ARCH_LDFLAGS = $(SYS_LDFLAGS) !else !if "$(ARCH)" == "alpha" !if "$(BUILD_TYPE)" == "spd" ARCH_CFLAGS = -D_ALPHA_=1 -c -Ze -Zi -W2 -Od -D__stdcall= -D__cdecl= !else ARCH_CFLAGS = -D_ALPHA_=1 -c -Ze -Zi -W2 -O1 -D__stdcall= -D__cdecl= !endif ARCH_LDFLAGS = $(SYS_LDFLAGS) !else !if "$(ARCH)" == "ppc" # These flags are a guess...if they don't work, please send me mail. ARCH_CFLAGS = -D_PPC_=1 -c -Ze -Zi -W2 -Od ARCH_LDFLAGS = $(SYS_LDFLAGS) !else !ERROR Unknown architecture type "$(ARCH)". !endif !endif !endif !endif LINK_FLAGS = $(ARCH_LDFLAGS) $(DEBUG_LINK) $(USER_LDFLAGS) # From MSVC 5.0 onwards, it seem base relocation information is not included, # at least in release builds. We need to ensure the reloc info is included # in order to use the MSVC profiler. !IF ("$(_NMAKE_VER)" == "$(_NMAKE_VER_4)") EXTRA_LINK = !ELSE EXTRA_LINK = -profile !ENDIF # # If the compiler supports compiling multiple .c files to .o files at # one time, use this feature. # !IF ("$(_NMAKE_VER)" == "$(_NMAKE_VER_4)") .c{$(BLD)}.obj: $(CC) $(CFLAGS) -Fo$(BLD)\ $< !ELSE .c{$(BLD)}.obj:: $(CC) $(CFLAGS) -Fo$(BLD)\ $< !ENDIF # arch-tag: fefa49b0-c23c-46c7-9094-cab2a405058e