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/Makefile.in

@@ -119,8 +119,8 @@ ifndef MOZ_NATIVE_ZLIB
 tier_9_dirs	+= modules/zlib
 endif
 
-# Linux and Solaris installer needs standalone libjar, hence standalone zlib
+# Installer needs standalone libjar, hence standalone zlib
-ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
+ifneq (,$(filter Linux SunOS WINNT,$(OS_ARCH)))
 tier_9_dirs	+= modules/zlib/standalone
 endif
 

mozilla/accessible/build/Makefile.in

@@ -53,13 +53,13 @@ endif
 
 EXTRA_DSO_LIBS = \
     gkconshared_s \
+    gkgfx \
     $(NULL)
 
 EXTRA_DSO_LDOPTS =           \
-    $(MOZ_COMPONENT_LIBS)    \
+    $(LIBS_DIR)              \
-    -L$(DIST)/lib            \
     $(EXTRA_DSO_LIBS)        \
-    -lgkgfx                  \
+    $(MOZ_COMPONENT_LIBS)    \
     $(NULL)
 
 include $(topsrcdir)/config/rules.mk

mozilla/allmakefiles.sh

@@ -136,6 +136,7 @@ gfx/src/qt/Makefile
 gfx/src/xlib/Makefile
 gfx/src/os2/Makefile
 gfx/src/xlibrgb/Makefile
+gfx/src/windows/Makefile
 gfx/tests/Makefile
 "
 
@@ -174,6 +175,7 @@ intl/locale/idl/Makefile
 intl/locale/src/Makefile
 intl/locale/src/unix/Makefile
 intl/locale/src/os2/Makefile
+intl/locale/src/windows/Makefile
 intl/locale/tests/Makefile
 intl/lwbrk/Makefile
 intl/lwbrk/src/Makefile
@@ -505,6 +507,7 @@ webshell/tests/viewer/unix/gtk/Makefile
 webshell/tests/viewer/unix/qt/Makefile
 webshell/tests/viewer/unix/xlib/Makefile
 webshell/embed/Makefile
+webshell/embed/ngprefs/win/Makefile
 "
 
 MAKEFILES_widget="
@@ -523,6 +526,10 @@ widget/src/os2/Makefile
 widget/src/os2/res/Makefile
 widget/src/os2/tests/Makefile
 widget/src/qt/Makefile
+widget/src/windows/Makefile
+widget/src/windows/expose/Makefile
+widget/src/windows/expose/ISimpleDOMNode/Makefile
+widget/src/windows/expose/ISimpleDOMDocument/Makefile
 widget/src/xlibxtbin/Makefile
 widget/src/xpwidgets/Makefile
 widget/src/support/Makefile
@@ -584,6 +591,7 @@ MAKEFILES_xpcom_tests="
 xpcom/tests/Makefile
 xpcom/tests/dynamic/Makefile
 xpcom/tests/services/Makefile
+xpcom/tests/windows/Makefile
 "
 
 MAKEFILES_string="$MAKEFILES_xpcom"
@@ -599,6 +607,14 @@ xpinstall/wizard/libxpnet/Makefile
 xpinstall/wizard/libxpnet/src/Makefile
 xpinstall/wizard/libxpnet/test/Makefile
 xpinstall/wizard/unix/src2/Makefile
+xpinstall/wizard/windows/nsinstall/Makefile
+xpinstall/wizard/windows/nsztool/Makefile
+xpinstall/wizard/windows/uninstall/Makefile
+xpinstall/wizard/windows/setup/Makefile
+xpinstall/wizard/windows/setuprsc/Makefile
+xpinstall/wizard/windows/ren8dot3/Makefile
+xpinstall/wizard/windows/ds32/Makefile
+xpinstall/wizard/windows/GetShortPathName/Makefile
 "
 
 MAKEFILES_xpfe="
@@ -632,6 +648,7 @@ xpfe/components/prefwindow/Makefile
 xpfe/components/prefwindow/resources/Makefile
 xpfe/components/prefwindow/resources/content/Makefile
 xpfe/components/prefwindow/resources/content/unix/Makefile
+xpfe/components/prefwindow/resources/content/win/Makefile
 xpfe/components/prefwindow/resources/locale/Makefile
 xpfe/components/prefwindow/resources/locale/en-US/Makefile
 xpfe/components/prefwindow/resources/locale/en-US/unix/Makefile
@@ -658,6 +675,8 @@ xpfe/components/autocomplete/src/Makefile
 xpfe/components/urlbarhistory/Makefile
 xpfe/components/urlbarhistory/public/Makefile
 xpfe/components/urlbarhistory/src/Makefile
+xpfe/components/urlwidget/Makefile
+xpfe/components/winhooks/Makefile
 xpfe/components/console/Makefile
 xpfe/components/build/Makefile
 xpfe/appshell/Makefile
@@ -697,6 +716,9 @@ MAKEFILES_embedding="
 embedding/Makefile
 embedding/base/Makefile
 embedding/browser/Makefile
+embedding/browser/activex/src/Makefile
+embedding/browser/activex/src/control/Makefile
+embedding/browser/activex/src/control_kicker/Makefile
 embedding/browser/build/Makefile
 embedding/browser/chrome/Makefile
 embedding/browser/webBrowser/Makefile
@@ -714,6 +736,10 @@ embedding/components/windowwatcher/src/Makefile
 embedding/components/ui/Makefile
 embedding/components/ui/helperAppDlg/Makefile
 embedding/config/Makefile
+embedding/tests/Makefile
+embedding/tests/winEmbed/Makefile
+embedding/tests/mfcEmbed/Makefile
+embedding/tests/mfcEmbed/components/Makefile
 "
 
 MAKEFILES_psm2="
@@ -757,6 +783,7 @@ extensions/inspector/Makefile
 extensions/inspector/base/Makefile
 extensions/inspector/base/public/Makefile
 extensions/inspector/base/src/Makefile
+extensions/inspector/base/src/win/Makefile
 extensions/inspector/build/Makefile
 extensions/inspector/build/src/Makefile
 extensions/inspector/resources/Makefile
@@ -804,6 +831,8 @@ fi
         modules/libpr0n/decoders/jpeg/Makefile
         modules/libpr0n/decoders/bmp/Makefile
         modules/libpr0n/decoders/mng/Makefile
+        modules/libpr0n/decoders/icon/Makefile
+        modules/libpr0n/decoders/icon/win/Makefile
 "
 
     MAKEFILES_gfx2="

mozilla/caps/include/Makefile.in

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

mozilla/caps/src/Makefile.in

@@ -59,12 +59,10 @@ CPPSRCS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
-		-L$(DIST)/lib \
 		$(ZLIB_LIBS) \
-		$(XPCOM_LIBS) \
 		$(MOZ_JS_LIBS) \
-		$(NSPR_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 CHROME_DIR = locales/en-US

mozilla/config/config.mk

@@ -162,23 +162,20 @@ FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names
 # NSS libs needed for final link in static build
 # 
 NSS_LIBS	= \
-	$(DIST)/lib/libsmime.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)smime.$(LIB_SUFFIX) \
-	$(DIST)/lib/libcrmf.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-	$(DIST)/lib/libssl.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
-	$(DIST)/lib/libnss.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)nss.$(LIB_SUFFIX) \
-	$(DIST)/lib/libssl.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)certhi.$(LIB_SUFFIX) \
-	$(DIST)/lib/libpkcs12.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)cryptohi.$(LIB_SUFFIX) \
-	$(DIST)/lib/libpkcs7.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)pk11wrap.$(LIB_SUFFIX) \
-	$(DIST)/lib/libcerthi.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)certdb.$(LIB_SUFFIX) \
-	$(DIST)/lib/libpk11wrap.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)softoken.$(LIB_SUFFIX) \
-	$(DIST)/lib/libcryptohi.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)pkcs12.$(LIB_SUFFIX) \
-	$(DIST)/lib/libcerthi.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)pkcs7.$(LIB_SUFFIX) \
-	$(DIST)/lib/libpk11wrap.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)freebl.$(LIB_SUFFIX) \
-	$(DIST)/lib/libsoftoken.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-	$(DIST)/lib/libcertdb.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) \
-	$(DIST)/lib/libfreebl.$(LIB_SUFFIX) \
-	$(DIST)/lib/libsecutil.$(LIB_SUFFIX) \
-	$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
 	$(NULL)
 
 MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
@@ -563,8 +560,6 @@ endif
 endif
 endif
 
-ifneq ($(OS_ARCH),WINNT)
-
 ifdef MOZ_NATIVE_MAKEDEPEND
 MKDEPEND_DIR	=
 MKDEPEND	= $(MOZ_NATIVE_MAKEDEPEND)
@@ -578,8 +573,6 @@ endif
 endif
 endif
 
-endif
-
 #
 # Include any personal overrides the user might think are needed.
 #

mozilla/config/rules.mk

@@ -188,19 +188,11 @@ endif
 
 ifeq ($(OS_ARCH),WINNT)
 
-ifdef LIBRARY_NAME
-PDBFILE=$(LIBRARY_NAME).pdb
-ifdef MOZ_DEBUG
-MAPFILE=$(LIBRARY_NAME).map
-CODFILE=$(LIBRARY_NAME).cod
-endif
-else
 PDBFILE=$*.pdb
 ifdef MOZ_DEBUG
 MAPFILE=$*.map
 CODFILE=$*.cod
 endif
-endif # LIBRARY_NAME
 
 ifdef DEFFILE
 CFLAGS += /DEF:$(DEFFILE)
@@ -830,7 +822,7 @@ ifneq ($(OS_ARCH),OS2)
 # that are built using other static libraries.  Confused...?
 #
 ifdef SHARED_LIBRARY_LIBS
-ifneq (,$(filter OSF1 BSD_OS FreeBSD NetBSD OpenBSD SunOS Darwin,$(OS_ARCH)))
+ifneq (,$(filter OSF1 BSD_OS FreeBSD NetBSD OpenBSD SunOS Darwin WINNT,$(OS_ARCH)))
 CLEANUP1	:= | egrep -v '(________64ELEL_|__.SYMDEF)'
 CLEANUP2	:= rm -f ________64ELEL_ __.SYMDEF
 else
@@ -839,6 +831,12 @@ endif
 SUB_LOBJS	= $(shell for lib in $(SHARED_LIBRARY_LIBS); do $(AR_LIST) $${lib} $(CLEANUP1); done;)
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+ifdef SHARED_LIBRARY_LIBS
+SUB_LOBJS	= $(SHARED_LIBRARY_LIBS)
+endif
+endif
+
 $(LIBRARY): $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS) Makefile Makefile.in
 	rm -f $@
 ifdef SHARED_LIBRARY_LIBS
@@ -1358,9 +1356,13 @@ else
 _JAR_REGCHROME_DISABLE_JAR=0
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+_NO_FLOCK=-l
+endif
+
 libs:: $(CHROME_DEPS)
-	@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(srcdir) < $(JAR_MANIFEST); fi
+	@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl $(_NO_FLOCK) -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(srcdir) < $(JAR_MANIFEST); fi
-	@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl $(DIST)/bin/chrome $(JAR_MANIFEST); fi
+	@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl $(DIST)/bin/chrome $(JAR_MANIFEST) $(_NO_FLOCK); fi
 
 REGCHROME = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl $(DIST)/bin/chrome/installed-chrome.txt $(_JAR_REGCHROME_DISABLE_JAR)
 
@@ -1425,7 +1427,9 @@ else # ! COMPILER_DEPEND
 
 ifndef MOZ_NATIVE_MAKEDEPEND
 $(MKDEPEND_BUILTIN):
+ifneq ($(OS_ARCH),WINNT)
 	$(MAKE) -C $(DEPTH)/config nsinstall$(BIN_SUFFIX)
+endif
 	$(MAKE) -C $(MKDEPEND_DIR) mkdepend
 endif
 
@@ -1439,13 +1443,16 @@ define MAKE_DEPS_NOAUTO
 endef
 
 $(MDDEPDIR)/%.pp: %.c
-	$(MAKE_DEPS_NOAUTO)
+	$(REPORT_BUILD)
+	@$(MAKE_DEPS_NOAUTO)
 
 $(MDDEPDIR)/%.pp: %.cpp
-	$(MAKE_DEPS_NOAUTO)
+	$(REPORT_BUILD)
+	@$(MAKE_DEPS_NOAUTO)
 
 $(MDDEPDIR)/%.pp: %.s
-	$(MAKE_DEPS_NOAUTO)
+	$(REPORT_BUILD)
+	@$(MAKE_DEPS_NOAUTO)
 
 ifneq (,$(OBJS))
 depend:: $(SUBMAKEFILES) $(MAKE_DIRS) $(MKDEPEND_BUILTIN) $(MDDEPFILES)

mozilla/configure.in

@@ -928,7 +928,7 @@ case "$target" in
         MOZ_DEBUG_LDFLAGS='/DEBUG /DEBUGTYPE:CV'
     	MOZ_OPTIMIZE_FLAGS='-O1'
         MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.lib'
-        MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib'
+        MOZ_ZLIB_LIBS='$(DIST)/lib/zlib.lib'
         MOZ_PNG_LIBS='$(DIST)/lib/mozpng.lib'
         MOZ_MNG_LIBS='$(DIST)/lib/mozmng.lib'
         MOZ_JS_LIBS='$(DIST)/lib/mozjs.lib'
@@ -954,6 +954,7 @@ case "$target" in
     dnl Hardcode to win95 for now - cls
     TARGET_NSPR_MDCPUCFG='\"md/_win95.cfg\"'
     no_x=yes
+    AC_DEFINE(NO_X11)
 
     dnl Remove cygwinism from MOZ_BUILD_ROOT
     if test `echo $MOZ_BUILD_ROOT | grep -c ^/cygdrive/` != 0; then
@@ -1594,8 +1595,9 @@ dnl Checks for X libraries.
 dnl Ordering is important.
 dnl Xt is dependent upon SM as of X11R6
 dnl ========================================================
-if test "$no_x" != "yes"
+if test "$no_x" = "yes"; then
-then
+    AC_DEFINE(NO_X11)
+else
     AC_DEFINE_UNQUOTED(FUNCPROTO,15)
 	XLIBS="-lX11 $XLIBS"
 	_SAVE_LDFLAGS="$LDFLAGS"
@@ -2391,7 +2393,7 @@ if test -z "$MOZ_NATIVE_NSPR"; then
     if test "$VACPP" = "yes"; then
         NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '$_PTHREAD_LDFLAGS''
     elif test "$_WIN32_MSVC"; then
-            NSPR_LIBS='$(DIST)/lib/libnspr'$NSPR_VERSION'.lib $(DIST)/lib/libplc'$NSPR_VERSION'.lib $(DIST)/lib/libplds'$NSPR_VERSION'.lib '
+            NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '
             NSPR_CFLAGS='-I$(DIST)/include/nspr'
     else
         NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`'
@@ -3058,6 +3060,13 @@ dnl http://bugzilla.mozilla.org/show_bug.cgi?id=18352
 MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help transformiix venkman inspector"
 MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin ctl" 
 
+dnl universalchardet is only built on win32 (bug XXXXXX)
+case "$target_os" in
+msvc*|mksnt*|mingw*|cygwin*)
+    MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT universalchardet irc"
+    ;;
+esac
+
 dnl Check if Thai Rendering Extension needs to be enabled
 if test -n "$SUNCTL"; then
   MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl"
@@ -4059,7 +4068,14 @@ if test "$MOZ_SVG"; then
     dnl libart's configure hasn't been run yet, but we know what the
     dnl answer should be anyway
     MOZ_LIBART_CFLAGS='-I${DIST}/include/libart_lgpl'
-    MOZ_LIBART_LIBS='-lmoz_art_lgpl -lm'
+    case "$target_os" in
+    msvc*|mksnt*|cygwin*|mingw*)
+        MOZ_LIBART_LIBS='$(DIST)/lib/$(LIB_PREFIX)moz_art_lgpl.$(LIB_SUFFIX)' 
+        ;;
+    *)
+        MOZ_LIBART_LIBS='-lmoz_art_lgpl -lm'
+        ;;
+    esac
   else
 dnl Disable system libart until the pixel format changes are merged upstream
     AC_MSG_ERROR([SVG requires a modified version of libart. To pull and build
@@ -4473,7 +4489,7 @@ unset MAKEFILES
 unset CONFIG_FILES
 
 if test -z "$MOZ_NATIVE_NSPR" || test "$MOZ_LDAP_XPCOM"; then
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist"
+    ac_configure_args="$_SUBDIR_CONFIG_ARGS --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-mozilla"
     if test -n "$HAVE_64BIT_OS"; then
         ac_configure_args="$ac_configure_args --enable-64bit"
     fi

mozilla/content/base/public/Makefile.in

@@ -70,7 +70,5 @@ XPIDLSRCS	= \
 		nsIScriptLoaderObserver.idl  \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 

mozilla/content/base/src/Makefile.in

@@ -100,6 +100,14 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_LAYOUT
 
+ifdef XP_NEW_SELECTION
+DEFINES		+= -DXP_NEW_SELECTION
+endif
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
 INCLUDES	+= \
 		-I$(srcdir)/../../events/src \
 		-I$(srcdir)/../../html/base/src \

mozilla/content/build/Makefile.in

@@ -35,6 +35,9 @@ SHORT_LIBNAME	= gkcontnt
 IS_COMPONENT	= 1
 MODULE_NAME	= nsContentModule
 EXTRA_DSO_LIBS	= gkgfx
+ifdef MOZ_PERF_METRICS
+EXTRA_DSO_LIBS += mozutil_s
+endif
 REQUIRES	= xpcom \
 		  string \
 		  gfx \
@@ -90,14 +93,8 @@ SHARED_LIBRARY_LIBS += \
 		$(NULL)
 endif
 
-ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS += \
-		$(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
-		$(NULL)
-endif
-
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
 		$(EXTRA_DSO_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
@@ -118,7 +115,7 @@ endif
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= -I$(srcdir)/../base/src \
+LOCAL_INCLUDES	= -I$(srcdir)/../base/src \
 		   -I$(srcdir)/../html/base/src \
 		   -I$(srcdir)/../html/style/src \
 		   -I$(srcdir)/../xul/content/src \
@@ -137,3 +134,4 @@ $(BUILD_DATE): gbdate.pl
 	$(RM) $@
 	$(PERL) $(srcdir)/gbdate.pl > $@
 
+

mozilla/content/events/public/Makefile.in

@@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= content
 
 EXPORTS		= \
-    nsMutationEvent.h \
+		nsMutationEvent.h \
 		nsIEventListenerManager.h \
 		nsIEventStateManager.h \
 		nsIPrivateDOMEvent.h \
@@ -38,7 +38,5 @@ EXPORTS		= \
 		nsIPrivateCompositionEvent.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 

mozilla/content/events/src/Makefile.in

@@ -56,8 +56,6 @@ CPPSRCS		= \
 		nsPrivateTextRange.cpp \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
@@ -65,7 +63,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= -I$(srcdir)/../../html/base/src \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+LOCAL_INCLUDES	= -I$(srcdir)/../../html/base/src \
              -I$(srcdir)/../../xul/content/src \
              $(NULL)
 

mozilla/content/html/content/public/Makefile.in

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

mozilla/content/html/content/src/Makefile.in

@@ -129,6 +129,14 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+ifdef XP_NEW_SELECTION
+DEFINES		+= -DXP_NEW_SELECTION
+endif
+
 INCLUDES	+= \
 		-I$(srcdir)/../../style/src \
 		-I$(srcdir)/../../../base/src \

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

@@ -73,8 +73,6 @@ EXPORTS		= \
 		nsIHTMLContentContainer.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
@@ -82,6 +80,14 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+ifdef XP_NEW_SELECTION
+DEFINES		+= -DXP_NEW_SELECTION
+endif
+
 INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../../base/src \

mozilla/content/html/style/public/Makefile.in

@@ -35,10 +35,8 @@ EXPORTS		= \
 		nsICSSStyleSheet.h \
 		nsICSSLoaderObserver.h \
 		nsIComputedDOMStyle.h \
-    nsIMediaList.h \
+		nsIMediaList.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 

mozilla/content/html/style/src/Makefile.in

@@ -85,8 +85,6 @@ EXPORTS		= \
 		nsIHTMLAttributes.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
@@ -94,7 +92,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)/../../base/src \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../content/src \
@@ -104,13 +106,13 @@ INCLUDES	+= \
 		$(NULL)
 
 ifdef MOZ_MATHML
-INCLUDES += \
+LOCAL_INCLUDES += \
         -I$(srcdir)/../../../mathml/content/src \
         -I$(srcdir)/../../../mathml/base/src
 endif
 
 ifdef MOZ_SVG
-INCLUDES += \
+LOCAL_INCLUDES += \
         -I$(srcdir)/../../../svg/content/src \
         -I$(srcdir)/../../../svg/base/src
 endif

mozilla/content/shared/public/Makefile.in

@@ -58,7 +58,5 @@ ifdef MOZ_SVG
 EXPORTS += nsSVGAtomList.h nsSVGAtoms.h
 endif
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 

mozilla/content/shared/src/Makefile.in

@@ -70,3 +70,11 @@ FORCE_STATIC_LIB = 1
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_LAYOUT
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+ifdef XP_NEW_SELECTION
+DEFINES		+= -DXP_NEW_SELECTION
+endif

mozilla/content/xbl/builtin/Makefile.in

@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(OS_ARCH),OS2)
+ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 DIRS		= win
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
@@ -38,5 +38,16 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-libs:: $(TARGETS)
+_BUILTINS = htmlBindings.xml
-	$(INSTALL) $(srcdir)/htmlBindings.xml $(DIST)/bin/res/builtin
+
+ifeq ($(OS_ARCH),WINNT)
+_BUILTINS += \
+	buttonBindings.xml \
+	selectBindings.xml \
+	checkboxBindings.xml \
+	fieldsetBindings.xml \
+	$(NULL)
+endif
+
+libs:: $(_BUILTINS)
+	$(INSTALL) $^ $(DIST)/bin/res/builtin

mozilla/content/xbl/public/Makefile.in

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

mozilla/content/xbl/src/Makefile.in

@@ -96,13 +96,17 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/style/src \
 		-I$(srcdir)/../../html/base/src \
-    -I$(srcdir)/../../html/document/src \
+		-I$(srcdir)/../../html/document/src \
-    -I$(srcdir)/../../xml/document/src \
+		-I$(srcdir)/../../xml/document/src \
-    -I$(srcdir)/../../xsl/document/src \
+		-I$(srcdir)/../../xsl/document/src \
-    -I$(srcdir)/../../xul/content/src \
+		-I$(srcdir)/../../xul/content/src \
 		$(NULL)
 

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

@@ -29,7 +29,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= content
 
 EXPORTS		= nsIXMLContent.h
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
 include $(topsrcdir)/config/rules.mk
 

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 \

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

@@ -40,6 +40,10 @@ include $(topsrcdir)/config/config.mk
 
 DEFINES += -D_IMPL_NS_HTML
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES	+= -DWIN32_LEAN_AND_MEAN
+endif
+
 XPIDLSRCS=				\
 	nsIDocumentTransformer.idl 	\
        $(NULL)
@@ -53,15 +57,12 @@ EXPORTS = \
 	nsITransformMediator.h			\
 	$(NULL)
 
-EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
-
 LOCAL_INCLUDES = 				\
 	-I$(srcdir)/../../../xml/document/src	\
 	$(NULL)
 
-MKSHLIB :=
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+

mozilla/content/xul/content/public/Makefile.in

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

mozilla/content/xul/content/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)/../../document/src \
 	-I$(srcdir)/../../../xml/content/src \

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

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

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

@@ -75,7 +75,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
-INCLUDES	+= -I$(srcdir)/../../../base/src \
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
+LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		   -I$(srcdir)/../../content/src \
 		   -I$(srcdir)/../../templates/src \
 		   $(NULL)

mozilla/content/xul/templates/public/Makefile.in

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

mozilla/content/xul/templates/src/Makefile.in

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

mozilla/db/mork/build/Makefile.in

@@ -44,8 +44,7 @@ EXPORTS		= \
 SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)msgmork_s.$(LIB_SUFFIX)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
-		-L$(DIST)/lib \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 

mozilla/db/mork/src/Makefile.in

@@ -77,11 +77,5 @@ CPPSRCS		= \
 		morkZone.cpp \
 		$(NULL)
 
-EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
-		$(NSPR_LIBS) \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 

mozilla/dbm/src/Makefile.in

@@ -44,13 +44,17 @@ CSRCS		= \
 		nsres.c \
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+CSRCS		+= memmove.c snprintf.c
+else
 ifeq (,$(filter -DHAVE_MEMMOVE=1,$(DEFS)))
-CSRC += memmove.c
+CSRCS += memmove.c
 endif
 
 ifeq (,$(filter -DHAVE_SNPRINTF=1,$(DEFS)))
-CSRC += snprintf.c
+CSRCS += snprintf.c
 endif
+endif # WINNT
 
 LOCAL_INCLUDES	= -I$(srcdir)/../include
 

mozilla/docshell/build/Makefile.in

@@ -59,15 +59,14 @@ SHARED_LIBRARY_LIBS= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS= \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= \
+LOCAL_INCLUDES	= \
 		-I$(srcdir)			\
 		-I$(srcdir)/../base		\
 		$(NULL)

mozilla/dom/src/base/Makefile.in

@@ -92,3 +92,7 @@ ifdef NS_TRACE_MALLOC
 DEFINES		+= -DNS_TRACE_MALLOC
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+

mozilla/dom/src/events/Makefile.in

@@ -49,3 +49,9 @@ include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../base
 
+DEFINES		+= -D_IMPL_NS_DOM
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+

mozilla/dom/src/jsurl/Makefile.in

@@ -52,7 +52,14 @@ CPPSRCS		= nsJSProtocolHandler.cpp
 
 EXPORTS		= $(srcdir)/nsJSProtocolHandler.h
 
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(MOZ_JS_LIBS)
+EXTRA_DSO_LDOPTS = \
+		$(MOZ_COMPONENT_LIBS) \
+		$(MOZ_JS_LIBS) \
+		$(NULL)
+
+ifdef BUILD_DEBUG_GC
+DEFINES		+= -DDEBUG_GC
+endif
 
 include $(topsrcdir)/config/rules.mk
 

mozilla/editor/libeditor/build/Makefile.in

@@ -35,7 +35,6 @@ IS_COMPONENT	= 1
 MODULE_NAME	= nsEditorModule
 
 EXTRA_DSO_LDOPTS = \
-		$(MOZ_NECKO_UTIL_LIBS)   \
 		$(MOZ_UNICHARUTIL_LIBS)  \
 		$(MOZ_COMPONENT_LIBS)    \
 		$(MOZ_JS_LIBS)           \

mozilla/editor/txmgr/public/Makefile.in

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

mozilla/editor/txmgr/src/Makefile.in

@@ -44,8 +44,7 @@ CPPSRCS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(XPCOM_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
-		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

mozilla/editor/txmgr/tests/Makefile.in

@@ -36,5 +36,7 @@ CPPSRCS		= TestTXMgr.cpp
 
 LIBS		= $(MOZ_COMPONENT_LIBS)
 
+DEFINES		+= -DUSE_NSREG
+
 include $(topsrcdir)/config/rules.mk
 

mozilla/editor/txtsvc/public/Makefile.in

@@ -39,7 +39,5 @@ XPIDLSRCS	= \
 		nsIFindAndReplace.idl \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 

mozilla/editor/txtsvc/src/Makefile.in

@@ -51,11 +51,8 @@ CPPSRCS		= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
-		-L$(DIST)/lib \
 		$(MOZ_UNICHARUTIL_LIBS) \
-		$(XPCOM_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
-		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

mozilla/embedding/Makefile.in

@@ -27,4 +27,10 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS = base components browser
 
+ifeq ($(OS_ARCH),WINNT)
+ifneq (,$(ENABLE_TESTS)$(MOZILLA_OFFICIAL))
+DIRS += tests
+endif
+endif
+
 include $(topsrcdir)/config/rules.mk

mozilla/embedding/base/Makefile.in

@@ -38,6 +38,7 @@ REQUIRES	= xpcom \
 		  gfx \
 		  intl \
 		  embedcomponents \
+		  timer \
 		  $(NULL)
 
 EXPORTS         = \
@@ -52,6 +53,10 @@ CPPSRCS         = \
                 nsEmbedAPI.cpp \
                 $(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS		+= nsEmbedWin32.cpp
+endif
+
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1

mozilla/embedding/browser/Makefile.in

@@ -35,5 +35,10 @@ ifdef MOZ_ENABLE_PHOTON
 DIRS += photon
 endif
 
+ifeq ($(OS_ARCH),WINNT)
+ifndef MOZ_NO_ACTIVEX_SUPPORT
+DIRS += activex/src
+endif
+endif
 
 include $(topsrcdir)/config/rules.mk

mozilla/embedding/browser/activex/src/Makefile.in

@@ -0,0 +1,29 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS=control control_kicker
+
+include $(topsrcdir)/config/rules.mk

mozilla/embedding/browser/activex/src/control/Makefile.in

@@ -0,0 +1,141 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME	= mozctl
+RESFILE		= MozillaControl.res
+DEFFILE		= L_mozctl.def
+EXPORT_LIBRARY	= 1
+
+REQUIRES = \
+	xpcom \
+	string \
+	js \
+	widget \
+	gfx \
+	view \
+	cookie \
+	necko \
+	pref \
+	webbrwsr \
+	docshell \
+	dom \
+	uriloader \
+	layout \
+	content \
+	editor \
+	webshell \
+	profile \
+	embed_base \
+	necko \
+	windowwatcher \
+        webbrowserpersist \
+	$(NULL)
+
+CPPSRCS =                              \
+    StdAfx.cpp             \
+    ControlSite.cpp        \
+    ControlSiteIPFrame.cpp \
+    ItemContainer.cpp      \
+    PropertyBag.cpp        \
+    MozillaControl.cpp     \
+    MozillaBrowser.cpp     \
+    WebBrowserContainer.cpp  \
+    IEHtmlNode.cpp         \
+    IEHtmlElementCollection.cpp \
+    IEHtmlElement.cpp      \
+    IEHtmlDocument.cpp     \
+    DropTarget.cpp         \
+    PropertyDlg.cpp        \
+    PromptService.cpp      \
+    WindowCreator.cpp      \
+    guids.cpp              \
+    $(NULL)
+
+EXTRA_DSO_LDOPTS = \
+	$(DIST)/lib/$(LIB_PREFIX)embed_base_s.$(LIB_SUFFIX) \
+	$(XPCOM_LIBS) \
+	$(NSPR_LIBS) \
+	$(NULL)
+
+OS_LIBS	+= \
+	comdlg32.lib \
+	ole32.lib \
+	oleaut32.lib \
+	uuid.lib \
+	shell32.lib \
+	$(NULL)
+
+GARBAGE	+= $(DEFFILE)
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS += /D "WIN32" /GX /U "ClientWallet"
+LDFLAGS += -SUBSYSTEM:windows /DLL
+
+ifdef MOZ_NO_DEBUG_RTL
+DEFINES	+= -DMOZ_NO_DEBUG_RTL
+endif
+
+DEFINES += -DMOZ_ACTIVEX_CONTROL_SUPPORT
+
+libs:: MozillaControl.html
+	$(INSTALL) $^ $(DIST)/bin/res
+
+export:: $(DEFFILE)
+
+$(DEFFILE): mkctldef.bat
+	$(srcdir)/mkctldef.bat $@
+
+MozillaControl_i.c MozillaControl.h: MozillaControl.idl
+	midl /Oicf /h MozillaControl.h /iid MozillaControl_i.c MozillaControl.idl
+
+PropertyDlg.cpp: StdAfx.h resource.h
+
+ControlSite.cpp \
+ControlSiteIPFrame.cpp \
+PropertyBag.cpp : StdAfx.h PropertyBag.h ControlSite.h ControlSiteIPFrame.h
+
+ItemContainer.cpp: StdAfx.h ItemContainer.h
+
+MozillaControl.cpp \
+StdAfx.cpp: StdAfx.h MozillaControl_i.c MozillaControl.h MozillaBrowser.h WebBrowserContainer.h
+
+IEHtmlNode.cpp : StdAfx.h IEHtmlNode.h
+
+IEHtmlElementCollection.cpp : StdAfx.h IEHtmlElementCollection.h
+
+IEHtmlElement.cpp : StdAfx.h IEHtmlNode.h IEHtmlElement.h
+
+IEHtmlDocument.cpp : StdAfx.h IEHtmlNode.h IEHtmlDocument.h
+
+DropTarget.cpp: StdAfx.h DropTarget.h
+
+MozillaControl.cpp \
+MozillaBrowser.cpp \
+WebBrowserContainer.cpp \
+StdAfx.cpp: StdAfx.h MozillaControl.h MozillaBrowser.h WebBrowserContainer.h IOleCommandTargetImpl.h
+
+guids.cpp: StdAfx.h guids.h

mozilla/embedding/browser/activex/src/control_kicker/Makefile.in

@@ -0,0 +1,59 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME	= mozctlx
+DEFFILE		= $(srcdir)/mozctlx.def
+EXPORT_LIBRARY	= 1
+
+
+CPPSRCS = \
+	StdAfx.cpp \
+	control_kicker.cpp \
+	$(NULL)
+
+OS_LIBS	+= \
+	comdlg32.lib \
+	ole32.lib \
+	oleaut32.lib \
+	uuid.lib \
+	shell32.lib \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS += /D "WIN32" /GX /GF /MT /O1
+
+libs::
+ifdef MOZ_ACTIVEX_REGISTRATION
+ifneq ($(OS_TARGET),WIN98)
+	-regsvr32 /s /c $(DIST)/bin/$(SHARED_LIBRARY)
+endif
+endif
+
+clean clobber clobber_all realclean distclean::
+	-regsvr32 /s /c /u $(DIST)/bin/$(SHARED_LIBRARY)
+
+control_kicker.cpp StdAfx.cpp: StdAfx.h

mozilla/embedding/browser/build/Makefile.in

@@ -56,8 +56,7 @@ SHARED_LIBRARY_LIBS= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS= \
-		-L$(DIST)/bin \
+		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)

mozilla/embedding/components/build/Makefile.in

@@ -29,6 +29,10 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= embedcmp
 IS_COMPONENT	= 1
 MODULE_NAME	= embedcomponents
+ifdef MOZ_PERF_METRICS
+EXTRA_DSO_LIBS	= mozutil_s
+endif
+
 REQUIRES	= js \
 		  xpcom \
 		  string \
@@ -55,10 +59,6 @@ SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)webbrowserpersist_s.$(LIB_SUFFIX) \
 	$(NULL)
 
-ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS	+= $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
-endif
-
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../windowwatcher/src  \
 	-I$(srcdir)/../appstartup/src  \
@@ -75,3 +75,6 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES	+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/embedding/tests/Makefile.in

@@ -0,0 +1,33 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = winEmbed
+
+ifndef NO_MFC
+DIRS += mfcembed/components mfcembed
+endif
+
+include $(topsrcdir)/config/rules.mk

mozilla/embedding/tests/mfcembed/Makefile.in

@@ -0,0 +1,95 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+PROGRAM		= mfcEmbed$(BIN_SUFFIX)
+RESFILE		= mfcEmbed.res
+
+REQUIRES = \
+	xpcom \
+	string \
+	necko \
+	webbrwsr \
+	widget \
+	docshell \
+	dom \
+	uriloader \
+	embed_base \
+	webshell \
+	shistory \
+	pref \
+	profile \
+	find \
+	gfx \
+	windowwatcher \
+	layout \
+	webbrowserpersist \
+	$(NULL)
+
+CPPSRCS		= \
+		MfcEmbed.cpp     \
+		BrowserFrm.cpp   \
+		BrowserFrameGlue.cpp   \
+		BrowserView.cpp \
+		BrowserImpl.cpp \
+		BrowserImplWebPrgrsLstnr.cpp \
+		BrowserImplCtxMenuLstnr.cpp \
+		Dialogs.cpp       \
+		ProfileMgr.cpp \
+		ProfilesDlg.cpp \
+		winEmbedFileLocProvider.cpp \
+		MostRecentUrls.cpp \
+		PrintProgressDialog.cpp       \
+		Preferences.cpp \
+		nsPrintSettingsImpl.cpp       \
+		PrintSetupDialog.cpp       \
+		StdAfx.cpp       \
+		$(NULL)
+
+EXTRA_DSO_LIBS	= embed_base_s gkgfx mfcEmbedComponents
+
+LIBS		= \
+		$(EXTRA_DSO_LIBS) \
+		$(XPCOM_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
+
+OS_LIBS		+= \
+		ole32.lib \
+		comdlg32.lib \
+		shell32.lib \
+		version.lib \
+		$(NULL)
+
+LOCAL_INCLUDES	= -I$(srcdir)/components
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS	+= /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON"
+LDFLAGS		+= -SUBSYSTEM:windows
+
+libs:: mfcembed.htm
+	$(INSTALL) $^ $(DIST)/bin

mozilla/embedding/tests/mfcembed/components/Makefile.in

@@ -0,0 +1,61 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+LIBRARY_NAME	= mfcEmbedComponents
+RESFILE		= Dialogs.res
+
+REQUIRES = \
+	xpcom \
+	string \
+	dom \
+	webbrwsr \
+	windowwatcher \
+	exthandler \
+	helperAppDlg \
+	uriloader \
+	necko \
+	mimetype \
+	$(NULL)
+
+CPPSRCS	= \
+	Dialogs.cpp \
+	PromptService.cpp \
+	HelperAppDlg.cpp \
+	$(NULL)
+
+EXTRA_DSO_LDOPTS += \
+	$(EXTRA_DSO_LIBS) \
+	$(XPCOM_LIBS) \
+	$(NSPR_LIBS) \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+CXXFLAGS	+= /D "WIN32_LEAN_AND_MEAN" /D "_AFXDLL" /D "USE_SINGLE_SIGN_ON" /D "_USRDLL" /D "_WINDLL"
+LDFLAGS		+= -SUBSYSTEM:windows
+
+Dialogs.res: Dialogs.rc resource.h
+

mozilla/embedding/tests/winEmbed/Makefile.in

@@ -0,0 +1,69 @@
+# 
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is the Mozilla browser.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications, Inc.  Portions created by Netscape are
+# Copyright (C) 2001, Mozilla.  All Rights Reserved.
+# 
+# Contributor(s):
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+PROGRAM		= winEmbed$(BIN_SUFFIX)
+RESFILE		= winEmbed.res
+
+REQUIRES	= xpcom \
+		  string \
+		  embed_base \
+		  webbrwsr \
+		  webshell \
+		  windowwatcher \
+		  profile \
+		  necko \
+		  docshell \
+		  dom \
+		  widget \
+		  layout \
+		  uriloader \
+		  shistory \
+		  webbrowserpersist \
+		  $(NULL)
+
+CPPSRCS		= \
+		winEmbed.cpp \
+		WebBrowserChrome.cpp \
+		WindowCreator.cpp \
+		StdAfx.cpp \
+		$(NULL)
+
+EXTRA_DSO_LIBS	= embed_base_s gkgfx
+
+LIBS		= \
+		$(EXTRA_DSO_LIBS) \
+		$(XPCOM_LIBS) \
+		$(NSPR_LIBS) \
+		$(NULL)
+
+OS_LIBS		+= \
+		ole32.lib \
+		comdlg32.lib \
+		shell32.lib \
+		version.lib \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk

mozilla/expat/xmlparse/Makefile.in

@@ -51,8 +51,6 @@ CSRCS		= \
 
 EXPORTS		= xmlparse.h
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 LOCAL_INCLUDES	= -I$(srcdir)/../xmltok
 
 # We want only the static lib, not the shared lib

mozilla/extensions/access-builtin/accessproxy/Makefile.in

@@ -59,16 +59,7 @@ CPPSRCS =   \
 
 XPIDLSRCS	= nsIAccessProxy.idl
 
-include $(topsrcdir)/config/config.mk
-
-LIBS += \
-  $(XPCOM_LIBS) \
-  $(NSPR_LIBS) \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
-libs:: $(TARGETS)
-

mozilla/extensions/cookie/Makefile.in

@@ -75,16 +75,18 @@ EXPORTS		= \
 		nsCookieHTTPNotify.h \
 		$(NULL)
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(MOZ_COMPONENT_LIBS) \
-		$(XPCOM_LIBS) \
-		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_COOKIE
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+
 libs::
 	@$(REGCHROME) content cookie comm.jar
 	@$(REGCHROME) locale en-US/cookie en-US.jar

mozilla/extensions/cookie/tests/Makefile.in

@@ -38,5 +38,15 @@ CPPSRCS		= TestCookie.cpp
 
 LIBS		= $(XPCOM_LIBS) $(NSPR_LIBS)
 
+ifeq ($(OS_ARCH),WINNT)
+MAPFILE		= TestCookie.map
+endif
+
 include $(topsrcdir)/config/rules.mk
 
+DEFINES		+= -D_IMPL_NS_COOKIE
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+

mozilla/extensions/datetime/Makefile.in

@@ -43,3 +43,8 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/extensions/finger/Makefile.in

@@ -43,3 +43,8 @@ CPPSRCS		= \
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_NET
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/extensions/inspector/Makefile.in

@@ -35,6 +35,9 @@ libs::
 	$(INSTALL) $(srcdir)/resources/content/res/viewer-registry.rdf $(DIST)/bin/res/inspector
 	$(INSTALL) $(srcdir)/resources/content/res/search-registry.rdf $(DIST)/bin/res/inspector
 	$(INSTALL) $(srcdir)/resources/content/prefs/inspector.js $(DIST)/bin/defaults/pref
+ifeq ($(OS_ARCH),WINNT)
+	$(INSTALL) $(srcdir)/resources/content/res/winInspectorMain.ico $(DIST)/bin/chrome/icons/default
+endif
 
 libs::
 	$(REGCHROME) content inspector inspector.jar

mozilla/extensions/inspector/base/src/Makefile.in

@@ -65,6 +65,16 @@ CPPSRCS= \
   inPNGEncoder.cpp \
 	$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+DIRS		+= win
+endif
+
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/extensions/inspector/base/src/win/Makefile.in

@@ -0,0 +1,55 @@
+
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH=../../../../..
+topsrcdir=@top_srcdir@
+srcdir=@srcdir@
+VPATH=@srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE=inspector
+LIBRARY_NAME=inscreencap_s
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  layout \
+		  widget \
+		  content \
+		  locale \
+		  dom \
+		  necko \
+		  $(NULL)
+
+CPPSRCS = inScreenCapturer.cpp 
+
+LOCAL_INCLUDES	= -I$(srcdir)/..
+
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/extensions/inspector/build/src/Makefile.in

@@ -49,19 +49,23 @@ CPPSRCS 	= \
 		nsInspectorModule.cpp \
 		$(NULL)
 
-LOCAL_INCLUDES += -I$(srcdir)/../../base/src
+LOCAL_INCLUDES = -I$(srcdir)/../../base/src
 
 # Linking against a part of another library is evil.  It also currently
 # prevents building on Mac OS X (DARWIN).
 EXTRA_DSO_LIBS = rdfutil_s gkgfx gkconshared_s
 
+ifeq ($(OS_ARCH),WINNT)
+LOCAL_INCLUDES += -I$(srcdir)/../../base/src/win
+EXTRA_DSO_LIBS += inscreencap_s
+endif
+
 SHARED_LIBRARY_LIBS = \
 		$(DIST)/lib/$(LIB_PREFIX)inspector_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS += \
-	-L$(DIST)/bin \
+	$(LIBS_DIR) \
-	-L$(DIST)/lib \
 	$(EXTRA_DSO_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(PNG_LIBS) \

mozilla/extensions/transformiix/build/Makefile.in

@@ -144,6 +144,7 @@ LOBJS =../source/base/ArrayList.$(OBJ_SUFFIX) \
 EXTRA_DSO_LDOPTS += \
   $(MOZ_UNICHARUTIL_LIBS) \
   $(MOZ_COMPONENT_LIBS) \
+  $(MOZ_UNICHARUTIL_LIBS) \
   $(MOZ_JS_LIBS) \
   $(NULL)
 

mozilla/extensions/universalchardet/src/Makefile.in

@@ -45,7 +45,6 @@ CPPSRCS = \
 		LangCyrillicModel.cpp \
 		LangGreekModel.cpp \
 		LangHungarianModel.cpp \
-		LangThaiModel.cpp \
 		nsBig5Prober.cpp \
 		nsEUCJPProber.cpp \
 		nsEUCKRProber.cpp \
@@ -63,9 +62,17 @@ CPPSRCS = \
 		nsUniversalDetector.cpp \
 		$(NULL)
 
+# Not built on win32. Not sure why not
+ifneq ($(OS_ARCH),WINNT)
+CPPSRCS	+= LangThaiModel.cpp
+endif
+
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN -D__STDC__
+endif

mozilla/extensions/universalchardet/tests/Makefile.in

@@ -37,10 +37,14 @@ CPPSRCS		= \
 
 SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
+DEFINES		+= -DUSE_NSREG
+
 include $(topsrcdir)/config/config.mk
 
 LIBS		+= \
-		$(MOZ_COMPONENT_LIBS) \
+		$(LIBS_DIR) \
+		$(XPCOM_LIBS) \
+		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

mozilla/extensions/wallet/build/Makefile.in

@@ -53,5 +53,10 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+OS_LIBS		+= shell32.lib
+endif
+
 include $(topsrcdir)/config/rules.mk
 
+

mozilla/extensions/wallet/src/Makefile.in

@@ -70,8 +70,7 @@ DEFAULTS_FILES	= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		-L$(DIST)/bin \
+		$(LIBS_DIRS) \
-		-L$(DIST)/lib \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)

mozilla/extensions/webservices/schema/src/Makefile.in

@@ -57,5 +57,8 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= \
+DEFINES		+= -D_IMPL_NS_HTML
-		$(NULL)
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/extensions/webservices/soap/src/Makefile.in

@@ -47,7 +47,11 @@ CPPSRCS	= 				\
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
-#override NO_SHARED_LIB=1
-#override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/extensions/webservices/wsdl/src/Makefile.in

@@ -45,12 +45,22 @@ CPPSRCS	= 				\
 		nsWSDLDefinitions.cpp	\
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS	+=	nsWSDLInterfaceInfo.cpp 
+endif
+
+LOCAL_INCLUDES	= \
+		-I$(srcdir)/../../schema/src \
+		$(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= \
+DEFINES		+= -D_IMPL_NS_HTML
-		-I$(srcdir)/../../schema/src \
+
-		$(NULL)
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/extensions/xmlextras/Makefile.in

@@ -32,7 +32,7 @@ ifdef MOZ_SOAP
 DIRS += schema soap wsdl
 endif
 
-DIRS += build
+DIRS += build/src
 
 ifdef ENABLE_TESTS
 DIRS += tests

mozilla/extensions/xmlextras/base/src/Makefile.in

@@ -57,3 +57,9 @@ CPPSRCS	= 				\
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/extensions/xmlextras/build/src/Makefile.in

@@ -52,8 +52,12 @@ SHARED_LIBRARY_LIBS = \
 
 
 ifdef MOZ_SOAP
-SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)xmlextrasschema_s.$(LIB_SUFFIX) $(DIST)/lib/$(LIB_PREFIX)xmlextraswsdl_s.$(LIB_SUFFIX) $(DIST)/lib/$(LIB_PREFIX)xmlextrassoap_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS += \
-DEFINES = -DMOZ_SOAP
+	$(DIST)/lib/$(LIB_PREFIX)xmlextrasschema_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)xmlextraswsdl_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)xmlextrassoap_s.$(LIB_SUFFIX) \
+	$(NULL)
+DEFINES += -DMOZ_SOAP
 endif
 
 LOCAL_INCLUDES	= \
@@ -64,6 +68,7 @@ LOCAL_INCLUDES	= \
 		$(NULL)
 
 EXTRA_DSO_LDOPTS = \
+		$(LIBS_DIR) \
 		$(MOZ_COMPONENT_LIBS) \
 		$(ZLIB_LIBS) \
 		$(MOZ_JS_LIBS) \

mozilla/extensions/xmlextras/schema/src/Makefile.in

@@ -57,5 +57,8 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= \
+DEFINES		+= -D_IMPL_NS_HTML
-		$(NULL)
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/extensions/xmlextras/soap/src/Makefile.in

@@ -47,7 +47,11 @@ CPPSRCS	= 				\
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
-#override NO_SHARED_LIB=1
-#override NO_STATIC_LIB=
 
 include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_HTML
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/extensions/xmlextras/tests/Makefile.in

@@ -44,6 +44,7 @@ SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 include $(topsrcdir)/config/config.mk
 
 LIBS		= \
+		$(LIBS_DIR) \
 		$(MOZ_JS_LIBS) \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
@@ -52,3 +53,8 @@ LIBS		= \
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG
+
+ifeq ($(OS_ARCH),WINNT)
+CXXFLAGS	+= -GX
+endif
+

mozilla/extensions/xmlextras/wsdl/src/Makefile.in

@@ -45,12 +45,22 @@ CPPSRCS	= 				\
 		nsWSDLDefinitions.cpp	\
 		$(NULL)
 
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS	+=	nsWSDLInterfaceInfo.cpp 
+endif
+
+LOCAL_INCLUDES	= \
+		-I$(srcdir)/../../schema/src \
+		$(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= \
+DEFINES		+= -D_IMPL_NS_HTML
-		-I$(srcdir)/../../schema/src \
+
-		$(NULL)
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/gfx/public/Makefile.in

@@ -43,7 +43,7 @@ EXPORTS		= \
 		nsMargin.h \
 		nsTransform2D.h \
 		nsIRenderingContext.h \
-        nsRenderingContextImpl.h \
+		nsRenderingContextImpl.h \
 		nsIFontMetrics.h \
 		nsIDeviceContext.h \
 		nsIImage.h \
@@ -62,7 +62,5 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),mac)
 EXPORTS		+= nsIPrintingContext.h
 endif
 
-EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
-
 include $(topsrcdir)/config/rules.mk
 

mozilla/gfx/src/Makefile.in

@@ -42,13 +42,13 @@ REQUIRES    = xpcom \
           unicharutil \
           $(NULL)
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+ifneq (,$(filter os2 windows,$(MOZ_WIDGET_TOOLKIT)))
 DIRS        =
 else
 DIRS        = ps
 endif
 
-ifneq (,$(filter beos os2 mac,$(MOZ_GFX_TOOLKIT)))
+ifneq (,$(filter beos os2 mac windows,$(MOZ_GFX_TOOLKIT)))
 DIRS        += $(MOZ_GFX_TOOLKIT)
 endif
 
@@ -82,7 +82,6 @@ CPPSRCS = \
         nsBlender.cpp \
         nsColor.cpp \
         nsColorNames.cpp \
-        nsCompressedCharMap.cpp \
         nsDeviceContext.cpp \
         nsFont.cpp \
         nsFontList.cpp \
@@ -94,6 +93,10 @@ CPPSRCS = \
         nsPrintOptionsImpl.cpp \
         $(NULL)
 
+ifeq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
+CPPSRCS += nsCompressedCharMap.cpp
+endif
+
 ifneq (,$(filter gtk xlib os2,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += \
         nsRegion.cpp \
@@ -111,11 +114,8 @@ CPPSRCS += \
         $(NULL)
 endif
 
-SHARED_LIBRARY_LIBS = \
-        $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
-        $(NULL)
-
 EXTRA_DSO_LDOPTS = \
+        $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
         $(MOZ_UNICHARUTIL_LIBS) \
         $(MOZ_COMPONENT_LIBS) \
         $(NULL)
@@ -129,6 +129,9 @@ endif
 include $(topsrcdir)/config/rules.mk
 
 DEFINES     += -D_IMPL_NS_GFX
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
 
 libs:: icon_0.gif icon_1.gif
 	$(INSTALL) -m 555 $^ $(DIST)/bin/res/gfx

mozilla/gfx/src/windows/Makefile.in

@@ -0,0 +1,104 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= gfxwin
+LIBRARY_NAME	= gfxwin
+EXPORT_LIBRARY = 1
+IS_COMPONENT	= 1
+MODULE_NAME	= nsGfxModule
+REQUIRES	= xpcom \
+		  string \
+		  gfx \
+		  widget \
+		  intl \
+		  view \
+		  pref \
+		  uconv \
+		  unicharutil \
+		  locale \
+		  necko \
+		  $(NULL)
+
+CPPSRCS		= \
+		nsDeviceContextWin.cpp \
+		nsDrawingSurfaceWin.cpp \
+		nsRenderingContextWin.cpp \
+		nsFontMetricsWin.cpp \
+		nsImageWin.cpp \
+		nsRegionWin.cpp \
+		nsDeviceContextSpecWin.cpp \
+		nsDeviceContextSpecFactoryW.cpp \
+		nsScreenWin.cpp \
+		nsScreenManagerWin.cpp \
+		nsPrintOptionsWin.cpp \
+		nsGfxFactoryWin.cpp \
+		nsCompressedCharMap.cpp \
+		$(NULL)
+
+EXPORTS	= nsIRenderingContextWin.h nsIDrawingSurfaceWin.h
+
+EXTRA_DSO_LIBS	= gkgfx mozutil_s
+
+LOCAL_INCLUDES	= \
+		-I$(srcdir)/. \
+		-I$(srcdir)/.. \
+		$(NULL)
+
+OS_LIBS		+= comdlg32.lib
+
+GARBAGE		+= nsCompressedCharMap.cpp
+
+include $(topsrcdir)/config/rules.mk
+
+export:: ../nsCompressedCharMap.cpp
+	$(INSTALL) $(srcdir)/../nsCompressedCharMap.cpp .
+
+libs:: fontEncoding.properties
+	$(INSTALL) $^ $(DIST)/bin/res/fonts
+
+DEFINES	+= -D_IMPL_NS_GFXNONXP -DWIN32_LEAN_AND_MEAN -DSTRICT 
+
+EXTRA_DSO_LDOPTS += \
+		$(EXTRA_DSO_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(MOZ_UNICHARUTIL_LIBS) \
+		$(MOZ_JS_LIBS) \
+		$(NULL)
+
+ifdef NGLAYOUT_DDRAW
+DEFINES	+= DNGLAYOUT_DDRAW
+ifeq ($(MOZ_VCVER),50)
+LOCAL_INCLUDES += -I$(NGLAYOUT_DDRAW)/include
+else
+LOCAL_INCLUDES += -I$(NGLAYOUT_DDRAW)/inc
+endif
+EXTRA_DSO_LDOPTS += $(NGLAYOUT_DDRAW/lib/ddraw.lib
+OS_LIBS	+= ole32.lib
+endif
+
+

mozilla/gfx2/src/Makefile.in

@@ -52,3 +52,7 @@ EXTRA_DSO_LDOPTS = \
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif
+

mozilla/htmlparser/robot/test/Makefile.in

@@ -53,3 +53,10 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DUSE_NSREG
 
+ifdef ($(OS_ARCH),WINNT)
+ifdef GNU_CC
+LDFLAGS		+= -SUBSYSTEM:CONSOLE
+OS_LIBS		+= shell32.lib
+endif
+endif
+

mozilla/htmlparser/src/Makefile.in

@@ -52,7 +52,7 @@ SHARED_LIBRARY_LIBS = \
 		$(NULL)
 
 ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
+EXTRA_DSO_LIBS	+= mozutil_s
 endif
 
 CPPSRCS = \
@@ -84,12 +84,17 @@ CPPSRCS += \
 		$(NULL)
 endif
 
-EXPORTS  := $(addprefix $(srcdir)/, $(EXPORTS))
+EXTRA_DSO_LDOPTS += \
-
+		$(LIBS_DIR) \
-
+		$(EXTRA_DSO_LIBS) \
-EXTRA_DSO_LDOPTS += $(MOZ_UNICHARUTIL_LIBS) $(MOZ_COMPONENT_LIBS)
+		$(MOZ_UNICHARUTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTMLPARS -DXML_DTD
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/htmlparser/tests/outsinks/Makefile.in

@@ -43,7 +43,6 @@ CPPSRCS		= \
 
 LIBS		= \
 		$(XPCOM_LIBS) \
-		$(MOZ_JS_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
@@ -75,3 +74,8 @@ libs::
 	$(INSTALL) -m 555 $(srcdir)/TestOutSinks.pl $(DIST)/bin
 	$(INSTALL) $(addprefix $(srcdir)/, $(TEST_FILES)) $(DIST)/bin/OutTestData
 
+ifeq ($(OS_ARCH),WINNT)
+ifndef GNU_CC
+LDFLAGS		+= -SUBSYSTEM:CONSOLE
+endif
+endif

mozilla/intl/Makefile.in

@@ -28,5 +28,9 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= unicharutil uconv locale strres lwbrk chardet
 
+ifeq ($(OS_ARCH),WINNT)
+DIRS		+= compatibility
+endif
+
 include $(topsrcdir)/config/rules.mk
 

mozilla/intl/chardet/Makefile.in

@@ -28,5 +28,11 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= public src
 
+ifeq ($(OS_ARCH),WINNT)
+ifdef ENABLE_TESTS
+DIRS		+= tests
+endif
+endif
+
 include $(topsrcdir)/config/rules.mk
 

mozilla/intl/chardet/public/Makefile.in

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

mozilla/intl/chardet/src/Makefile.in

@@ -60,3 +60,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(MOZ_UNICHARUTIL_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -D__STDC__ -DWIN32_LEAN_AND_MEAN
+endif

mozilla/intl/chardet/tests/Makefile.in

@@ -26,7 +26,13 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-PROGRAM		= DetectCharset
+REQUIRES	= \
+		xpcom \
+		string \
+		chardet \
+		$(NULL)
+
+PROGRAM		= DetectCharset$(BIN_SUFFIX)
 
 CPPSRCS		= DetectCharset.cpp
 
@@ -34,5 +40,7 @@ LIBS		= $(XPCOM_LIBS) $(NSPR_LIBS)
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES	+= -I$(srcdir)/../public -I$(PUBLIC)
+DEFINES		+= -DUSE_NSREG
+INCLUDES	+= -I$(srcdir)/../public
+
 

mozilla/intl/compatibility/src/Makefile.in

@@ -32,12 +32,22 @@ EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= I18nCompatibility
 
+REQUIRES	= \
+		xpcom \
+		string \
+		$(NULL)
+
 CPPSRCS		= \
 		nsI18nCompatibility.cpp \
 		nsCSIDtoCharsetName.cpp \
 		$(NULL)
 
+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I..
 
+ifeq ($(OS_ARCH),WINNT)
+DEFINES		+= -D__STDC__ -DWIN32_LEAN_AND_MEAN
+endif

mozilla/intl/locale/Makefile.in

@@ -28,9 +28,5 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS		= public idl src
 
-#ifdef ENABLE_TESTS
-#DIRS		+= tests
-#endif
-
 include $(topsrcdir)/config/rules.mk
 

mozilla/intl/locale/public/Makefile.in

@@ -35,6 +35,7 @@ EXPORTS		= \
 		nsIDateTimeFormat.h \
 		nsIPosixLocale.h \
 		nsIOS2Locale.h \
+		nsIWin32Locale.h \
 		nsLocaleCID.h \
 		$(NULL)
 

mozilla/intl/locale/src/Makefile.in

@@ -38,9 +38,12 @@ REQUIRES	= xpcom \
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 DIRS		= os2
 else
+ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+DIRS		= windows
+else
 DIRS		= unix
 endif
-
+endif
 
 CPPSRCS		= \
 		nsCollation.cpp \
@@ -67,3 +70,9 @@ include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(INSTALL) $(EXPORT_RESOURCE) $(DIST)/bin/res
+
+DEFINES	+= -D_IMPL_NS_INTL
+
+ifeq ($(OS_ARCH),WINNT)
+DEFINES	+= -DWIN32_LEAN_AND_MEAN
+endif

mozilla/intl/locale/src/windows/Makefile.in

@@ -0,0 +1,58 @@
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= locale
+LIBRARY_NAME	= nslocale
+EXPORT_LIBRARY = 1
+IS_COMPONENT	= 1
+MODULE_NAME	= nsLocaleModule
+REQUIRES	= xpcom \
+		  string \
+		  unicharutil \
+		  uconv \
+		  $(NULL)
+
+SHARED_LIBRARY_LIBS = ../$(LIB_PREFIX)nslocale_s.$(LIB_SUFFIX)
+
+CPPSRCS		= \
+		nsCollationWin.cpp \
+		nsDateTimeFormatWin.cpp \
+		nsLocaleDLL.cpp \
+		nsIWin32LocaleImpl.cpp \
+		$(NULL)
+
+EXTRA_DSO_LDOPTS += \
+		$(MOZ_UNICHARUTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+= -I$(srcdir)/..
+
+DEFINES		+= -DWIN32_LEAN_AND_MEAN