Add REQUIRES to many modules for win32 support, bug 98372 r=cls

2001-09-12 21:32:10 +00:00 · 2001-09-12 21:32:10 +00:00 · 187d526fcd
--- a/extensions/cookie/makefile.win
+++ b/extensions/cookie/makefile.win
@ -20,12 +20,12 @@
 # Contributor(s): 

 DEPTH=..\..
-include <$(DEPTH)/config/config.mak>

 DEFINES=-D_IMPL_NS_COOKIE -DWIN32_LEAN_AND_MEAN
 MODULE=cookie 
 LIBRARY_NAME=cookie
 MODULE_NAME=nsCookieModule
+REQUIRES	= xpcom string necko dom widget layout pref intl uriloader windowwatcher content

 EXPORTS = nsCookieHTTPNotify.h

--- a/extensions/cookie/tests/makefile.win
+++ b/extensions/cookie/tests/makefile.win
@ -23,6 +23,7 @@
 DEPTH	= ..\..\..
 DEFINES=-D_IMPL_NS_COOKIE -DWIN32_LEAN_AND_MEAN
 MODULE=cookie 
+REQUIRES	= xpcom string cookie necko intl

 MAKE_OBJ_TYPE = EXE

--- a/extensions/transformiix/build/makefile.win
+++ b/extensions/transformiix/build/makefile.win
@ -20,9 +20,10 @@
 # Contributor(s): 

 DEPTH=..\..\..
+MODULE=transformiix
+REQUIRES	= xpcom string dom layout widget xsl_doc necko content
 include <$(DEPTH)/config/config.mak>

-MODULE=transformiix
 LIBRARY_NAME=transformiix
 MODULE_NAME=TransformiixModule

--- a/extensions/transformiix/public/makefile.win
+++ b/extensions/transformiix/public/makefile.win
@ -22,7 +22,6 @@
 #    -- original author.

 DEPTH=..\..\..
-include <$(DEPTH)/config/config.mak>

 XPIDLSRCS = .\nsIXPathNodeSelector.idl  \
            .\nsISyncLoader.idl         \
--- a/extensions/transformiix/source/base/makefile.win
+++ b/extensions/transformiix/source/base/makefile.win
@ -20,6 +20,8 @@
 # Contributor(s): 

 DEPTH=..\..\..\..
+REQUIRES = string xpcom
+
 include <$(DEPTH)/config/config.mak>

 !if defined(TX_EXE)
--- a/extensions/transformiix/source/net/makefile.win
+++ b/extensions/transformiix/source/net/makefile.win
@ -20,6 +20,7 @@
 # Contributor(s): 

 DEPTH=..\..\..\..
+REQUIRES = string xpcom necko
 include <$(DEPTH)/config/config.mak>

 !if defined(TX_EXE)
--- a/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
+++ b/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
@ -20,6 +20,8 @@
 # Contributor(s): 

 DEPTH=..\..\..\..\..\..
+REQUIRES = string xpcom dom layout widget necko content
+
 include <$(DEPTH)/config/config.mak>

 CPPSRCS=				\
@ -67,7 +69,7 @@ CPP_OBJS=					\
 EXPORTS = 					\
 	$(NULL)

-LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\..\..\base -I..\..\dom \
+LINCS= -I..\..\..\base -I..\..\dom \
 	-I..\.. -I..\..\..\net

 LCFLAGS = \
--- a/extensions/transformiix/source/xml/makefile.win
+++ b/extensions/transformiix/source/xml/makefile.win
@ -20,6 +20,8 @@
 # Contributor(s): 

 DEPTH=..\..\..\..
+MODULE = transformiix
+REQUIRES = string xpcom dom layout widget content
 include <$(DEPTH)/config/config.mak>

 DIRS=dom parser util
--- a/extensions/transformiix/source/xml/parser/makefile.win
+++ b/extensions/transformiix/source/xml/parser/makefile.win
@ -20,6 +20,9 @@
 # Contributor(s): 

 DEPTH=..\..\..\..\..
+MODULE=transformiix
+REQUIRES = string xpcom necko dom layout widget js appshell xpconnect caps raptor content
+
 include <$(DEPTH)/config/config.mak>

 !ifndef TX_EXE
--- a/extensions/transformiix/source/xml/util/makefile.win
+++ b/extensions/transformiix/source/xml/util/makefile.win
@ -20,6 +20,9 @@
 # Contributor(s): 

 DEPTH=..\..\..\..\..
+MODULE=transformiix
+REQUIRES = xpcom string dom layout widget content
+
 include <$(DEPTH)/config/config.mak>

 !if defined(TX_EXE)
--- a/extensions/transformiix/source/xpath/makefile.win
+++ b/extensions/transformiix/source/xpath/makefile.win
@ -20,6 +20,8 @@
 # Contributor(s): 

 DEPTH=..\..\..\..
+MODULE = transformiix
+REQUIRES = string xpcom dom layout widget content
 include <$(DEPTH)/config/config.mak>

 !if defined(TX_EXE)
--- a/extensions/transformiix/source/xslt/functions/makefile.win
+++ b/extensions/transformiix/source/xslt/functions/makefile.win
@ -20,6 +20,8 @@
 # Contributor(s): 

 DEPTH=..\..\..\..\..
+MODULE = transformiix
+REQUIRES = string xpcom dom layout widget content
 include <$(DEPTH)/config/config.mak>

 !if defined(TX_EXE)
--- a/extensions/transformiix/source/xslt/makefile.win
+++ b/extensions/transformiix/source/xslt/makefile.win
@ -20,6 +20,8 @@
 # Contributor(s): 

 DEPTH=..\..\..\..
+MODULE = transformiix
+REQUIRES = string xpcom dom layout widget necko xsl_doc content
 include <$(DEPTH)/config/config.mak>

 DIRS=util functions
--- a/extensions/transformiix/source/xslt/util/makefile.win
+++ b/extensions/transformiix/source/xslt/util/makefile.win
@ -20,6 +20,8 @@
 # Contributor(s): 

 DEPTH=..\..\..\..\..
+MODULE = transformiix
+REQUIRES = string xpcom dom layout widget content
 include <$(DEPTH)/config/config.mak>

 !if defined(TX_EXE)
--- a/extensions/universalchardet/src/makefile.win
+++ b/extensions/universalchardet/src/makefile.win
@ -23,9 +23,11 @@ DEPTH=..\..\..
 MOZ_DEPTH=$(DEPTH)\..\mozilla\intl\chardet\src

 LCFLAGS= $(LCFLAGS) -D__STDC__
+REQUIRES	= xpcom string uconv chardet

 DEFINES= -DWIN32_LEAN_AND_MEAN 
 LIBRARY_NAME= universalchardet
+MODULE=$(LIBRARY_NAME)

 OBJS= \
 	$(NULL)
@ -57,9 +59,6 @@ CPP_OBJS= \
        .\$(OBJDIR)\LangHungarianModel.obj \
 	$(NULL)

-MODULE=$(LIBRARY_NAME)
-
-REQUIRES=xpcom

 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\chardet  \
     -I$(DEPTH)\public 
@ -72,7 +71,8 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll

 LLIBS= \
 	$(DIST)\lib\xpcom.lib \
-  	$(LIBNSPR)	
+	$(LIBNSPR)
+
 include <$(DEPTH)\config\rules.mak>

 install:: $(DLL)
--- a/extensions/universalchardet/tests/makefile.win
+++ b/extensions/universalchardet/tests/makefile.win
@ -19,6 +19,7 @@
 #
 # Contributor(s): 
 DEPTH = ..\..\..
+REQUIRES	= xpcom chardet
 include <$(DEPTH)\config\config.mak>

 MAKE_OBJ_TYPE = EXE
@ -28,8 +29,6 @@ PROGRAM = $(PROG1)

 LCFLAGS=-DUSE_NSREG

-LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\unicharutil -I$(PUBLIC)\raptor
-
 LLIBS= \
 $(DIST)\lib\xpcom.lib \
 $(LIBNSPR)
--- a/extensions/wallet/build/makefile.win
+++ b/extensions/wallet/build/makefile.win
@ -25,6 +25,7 @@ DEPTH=..\..\..
 MODULE = walletviewers
 LIBRARY_NAME = wlltvwrs
 MODULE_NAME = nsWalletViewerModule
+REQUIRES	= xpcom walleteditor signonviewer walletpreview

 LINCS = \
        -I..\editor             \
--- a/extensions/wallet/editor/makefile.win
+++ b/extensions/wallet/editor/makefile.win
@ -21,6 +21,7 @@

 DEPTH=..\..\..
 MODULE=walleteditor
+REQUIRES	= xpcom string wallet dom docshell necko widget

 #MAKE_OBJ_TYPE=DLL
 #DLLNAME=$(MODULE)
--- a/extensions/wallet/signonviewer/makefile.win
+++ b/extensions/wallet/signonviewer/makefile.win
@ -21,6 +21,7 @@

 DEPTH=..\..\..
 MODULE=signonviewer
+REQUIRES	= xpcom string wallet dom widget necko

 #MAKE_OBJ_TYPE=DLL
 #DLLNAME=$(MODULE)
--- a/extensions/wallet/src/makefile.win
+++ b/extensions/wallet/src/makefile.win
@ -20,9 +20,11 @@
 # Contributor(s): 

 DEPTH=..\..\..
+MODULE=wallet
+REQUIRES	= xpcom string necko dom layout widget uriloader pref webshell docshell appshell intl windowwatcher gfx content raptor
+
 include <$(DEPTH)/config/config.mak>

-MODULE=wallet
 LIBRARY_NAME=wallet
 MODULE_NAME=nsWalletModule

--- a/extensions/wallet/walletpreview/makefile.win
+++ b/extensions/wallet/walletpreview/makefile.win
@ -21,6 +21,7 @@

 DEPTH=..\..\..
 MODULE=walletpreview
+REQUIRES	= xpcom string wallet dom widget necko docshell

 #MAKE_OBJ_TYPE=DLL
 #DLLNAME=$(MODULE)
--- a/extensions/xmlextras/base/src/makefile.win
+++ b/extensions/xmlextras/base/src/makefile.win
@ -23,6 +23,7 @@ DEPTH=..\..\..\..

 LIBRARY_NAME=xmlextrasbase_s 
 MODULE=xmlextras
+REQUIRES	= xpcom string dom js layout widget caps uconv necko docshell xpconnect webBrowser_core content raptor gfx

 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN

--- a/extensions/xmlextras/build/src/makefile.win
+++ b/extensions/xmlextras/build/src/makefile.win
@ -19,6 +19,7 @@

 DEPTH=..\..\..\..
 MODULE=xmlextras
+REQUIRES	= xpcom string dom js layout widget caps necko webBrowser_core embedcomponents content
 LIBRARY_NAME=xmlextras
 MODULE_NAME=nsXMLExtrasModule

--- a/modules/libreg/include/makefile.win
+++ b/modules/libreg/include/makefile.win
@ -1,38 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-
-
-# 
-
-#//------------------------------------------------------------------------
-#//
-#// Makefile to install MODULES/LIBREG/INCLUDE header files into the distribution
-#// directory.
-#//
-#//------------------------------------------------------------------------
-
-MODULE=libreg 
-DEPTH=..\..\.. 
-EXPORTS=VerReg.h NSReg.h 
-
-include <$(DEPTH)/config/rules.mak>
-
--- a/modules/libreg/standalone/makefile.win
+++ b/modules/libreg/standalone/makefile.win
@ -63,7 +63,7 @@ OBJS=                                       \
 #//
 #//------------------------------------------------------------------------

-
+REQUIRES=mozreg
 LIBNAME=nsreg
 DLL=$(OBJDIR)\$(LIBNAME).dll
 LIBRARY=$(OBJDIR)\$(LIBNAME)_s.lib