nt/nmake.defs,gmake.defs (CHECKING_FLAGS): Remove XASSERTS.

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

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 3dbb97f..223b0fe 100644 (file)
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
-# Copyright (C) 2000-2011 Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -95,7 +95,7 @@ THISDIR               = .
 ifdef USING_SH
 sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2)
 sh_output := $(shell echo foo")
-# This single quote " is to fix fintification due to previous line
+# This single quote " is to fix fontification due to previous line
 ifeq "$(sh_output)" ""
 NEW_CYGWIN = 1
 endif
@@ -149,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
@@ -193,6 +193,11 @@ OLE32              = -lole32
 UNISCRIBE      = -lusp10
 UUID           = -luuid
 
+# Used by src/makefile.w32-in, since Nmake barfs on $(func SOMETHING)
+OBJ0_c         = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ0))
+OBJ1_c         = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1))
+OBJ2_c         = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ2))
+
 ifdef NOOPT
 DEBUG_CFLAGS   = -DEMACSDEBUG
 else
@@ -200,12 +205,15 @@ DEBUG_CFLAGS      =
 endif
 
 ifdef ENABLECHECKS
-CHECKING_CFLAGS        = -DENABLE_CHECKING -DXASSERTS -fno-crossjumping
+CHECKING_CFLAGS        = -DENABLE_CHECKING -fno-crossjumping
 else
 CHECKING_CFLAGS        =
 endif
 
+MWINDOWS        = -mwindows
+
 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
@@ -239,9 +247,11 @@ CP_DIR             = cp -rf
 DEL            = rm
 DEL_TREE       = rm -r
 
+DIRNAME                = $(notdir $(CURDIR))
+
 ifdef USING_SH
 
-IFNOTSAMEDIR   = if [ ! -s ../same-dir.tst ] ; then
+IFNOTSAMEDIR   = if [ ! -s ../$(DIRNAME)_same-dir.tst ] ; then
 FOREACH                = for f in
 FORVAR         = $${f}
 FORDO          = ; do
@@ -256,7 +266,7 @@ endif
 
 else
 
-IFNOTSAMEDIR   = if not exist ../same-dir.tst
+IFNOTSAMEDIR   = if not exist ../$(DIRNAME)_same-dir.tst
 FOREACH                = for %%f in (
 FORVAR         = %%f
 FORDO          = ) do
@@ -279,6 +289,12 @@ ifdef NOCYGWIN
 NOCYGWIN = -mno-cygwin
 endif
 
+ifdef USER_LIBS
+USER_LIBS := $(patsubst %,-l%,$(USER_LIBS))
+endif
+
+PRAGMA_SYSTEM_HEADER = \#pragma GCC system_header
+
 ifeq "$(ARCH)" "i386"
 ifdef NOOPT
 ARCH_CFLAGS     = -c $(DEBUG_FLAG) $(NOCYGWIN)
@@ -301,4 +317,3 @@ export XMFLAGS
 
 $(BLD)/%.o: %.c
                $(CC) $(CFLAGS) $(CC_OUT)$@ $<
-