Landing the rest of the win32 gmake changes:

* Adds Makefile.ins to win32 specific dirs
* Adds WINNT ifdefs to Makefile.ins
* Causes NSPR to be compiled with --with-mozilla
* Misc general Makefile.in cleanup

Bug #58981 r=mcafee


git-svn-id: svn://10.0.0.236/trunk@110703 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/content/xml/document/public/Makefile.in

@@ -33,7 +33,5 @@ EXPORTS		= \
 		nsIXMLDocument.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 

mozilla/content/xml/document/src/Makefile.in

@@ -64,7 +64,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../xsl/document/src \
 		-I$(srcdir)/../../../html/base/src \