Sanitize processing of display specifiers; new option frame-auto-delete.

[bpt/emacs.git] / nt / gmake.defs

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 2265841..bbb5602 100644 (file)
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -1,6 +1,5 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
-#  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-#    2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2000-2011 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -150,7 +149,7 @@ ARCH                = alpha
     ifeq "$(PROCESSOR_ARCHITECTURE)" "PPC"
 ARCH           = ppc
     else
-error Unknown architecture type "$(PROCESSOR_ARCHITECTURE)"
+     $(error Unknown architecture type "$(PROCESSOR_ARCHITECTURE)")
     endif
    endif
   endif
@@ -207,6 +206,7 @@ CHECKING_CFLAGS     =
 endif
 
 CFLAGS          = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
+ESC_CFLAGS      = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)
 EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1
 
 ifdef PROFILE
@@ -280,6 +280,10 @@ ifdef NOCYGWIN
 NOCYGWIN = -mno-cygwin
 endif
 
+ifdef USER_LIBS
+USER_LIBS := $(patsubst %,-l%,$(USER_LIBS))
+endif
+
 ifeq "$(ARCH)" "i386"
 ifdef NOOPT
 ARCH_CFLAGS     = -c $(DEBUG_FLAG) $(NOCYGWIN)
@@ -303,4 +307,3 @@ export XMFLAGS
 $(BLD)/%.o: %.c
                $(CC) $(CFLAGS) $(CC_OUT)$@ $<
 
-# arch-tag: 35eb9662-8534-4bcf-b891-0730a09d657f