Final REQUIRES changes for bug 98371, adding support for MOZ_TRACK_MODULE_DEPS to win32. r=cls (and tested by cls!)

This commit is contained in:
alecf%netscape.com 2001-09-17 19:06:35 +00:00
parent 755d374cb0
commit 62424ee7b2
160 changed files with 140 additions and 636 deletions

View File

@ -64,7 +64,7 @@ CPPSRCS = \
$(NULL)
MODULE=content
REQUIRES = xpcom string dom widget view locale timer htmlparser js webshell necko caps lwbrk uconv chrome docshell pref xpconnect util unicharutil xsl_doc raptor layout gfx layout_xul
REQUIRES = xpcom string dom widget view locale timer htmlparser js webshell necko caps lwbrk uconv chrome docshell pref xpconnect util unicharutil layout_xsl layout gfx layout_xul content_xsl
CPP_OBJS= \
.\$(OBJDIR)\nsStyleContext.obj \
@ -101,12 +101,9 @@ CPP_OBJS= \
.\$(OBJDIR)\nsStyleLinkElement.obj \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \
-I$(PUBLIC)\dom -I$(PUBLIC)\js -I$(PUBLIC)\netlib \
-I$(PUBLIC)\pref -I..\..\html\base\src -I..\..\html\style\src \
LINCS=-I..\..\html\base\src -I..\..\html\style\src \
-I..\..\xul\base\src -I..\..\xul\content\src \
-I..\..\events\src \
-I$(PUBLIC)\lwbrk -I$(PUBLIC)\plugin
-I..\..\events\src
LCFLAGS = \
$(LCFLAGS) \

View File

@ -34,7 +34,7 @@ EXPORTS=nsContentCID.h
MODULE=content
LIBRARY_NAME=gkcontent
MODULE_NAME=nsContentModule
REQUIRES = xpcom string widget necko rdf docshell dom htmlparser uriloader webshell locale unicharutil lwbrk js pref xul xuldoc xultmpl timer raptor layout gfx layout_xul
REQUIRES = xpcom string widget necko rdf docshell dom htmlparser uriloader webshell locale unicharutil lwbrk js pref timer layout gfx layout_xul content_xul
LCFLAGS = \
$(LCFLAGS) \

View File

@ -21,6 +21,7 @@
DEPTH=..\..\..
MODULE=content
EXPORTS = \
nsIEventListenerManager.h \
@ -32,7 +33,6 @@ EXPORTS = \
nsMutationEvent.h \
$(NULL)
MODULE=raptor
include <$(DEPTH)\config\rules.mak>

View File

@ -25,7 +25,7 @@ DEPTH=..\..\..
LIBRARY_NAME=contentevents_s
MODULE=content
REQUIRES = xpcom string dom js locale widget timer caps xpconnect docshell webshell pref htmlparser view gfx raptor layout layout_xul
REQUIRES = xpcom string dom js locale widget timer caps xpconnect docshell webshell pref htmlparser view gfx layout layout_xul
include <$(DEPTH)\config\config.mak>

View File

@ -24,7 +24,7 @@ DEPTH=..\..\..\..
EXPORTS=nsIFormControl.h nsIForm.h nsILink.h \
nsISelectElement.h nsIScriptElement.h nsIBodySuper.h
MODULE=raptor
MODULE=content
include <$(DEPTH)\config\rules.mak>

View File

@ -23,7 +23,7 @@ DEPTH=..\..\..\..
LIBRARY_NAME = contenthtmlcontent_s
MODULE=content
REQUIRES = xpcom string widget dom js locale webshell htmlparser necko view pref docshell xpconnect xuldoc caps editor uconv gfx2 imglib2 layout raptor gfx
REQUIRES = xpcom string widget dom js locale webshell htmlparser necko view pref docshell xpconnect caps editor uconv gfx2 imglib2 layout gfx content_xul
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
!if defined(XP_NEW_SELECTION)
DEFINES = $(DEFINES) -DXP_NEW_SELECTION
@ -171,11 +171,8 @@ CPP_OBJS= \
.\$(OBJDIR)\nsHTMLWBRElement.obj \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
-I$(PUBLIC)\dom -I$(PUBLIC)\netlib \
-I..\..\style\src \
LINCS= -I..\..\style\src \
-I..\..\..\base\src -I..\..\base\src \
-I$(PUBLIC)\plugin -I$(PUBLIC)\oji -I$(PUBLIC)\java
LCFLAGS = \
-DENDER_LITE \

View File

@ -24,7 +24,7 @@ DEPTH=..\..\..\..
EXPORTS = \
$(NULL)
MODULE=raptor
MODULE=content
include <$(DEPTH)\config\rules.mak>

View File

@ -23,7 +23,7 @@ DEPTH=..\..\..\..
LIBRARY_NAME=contenthtmldoc_s
MODULE=content
REQUIRES = xpcom string widget dom necko htmlparser locale view js intl webshell docshell cookie caps util timer uconv pref uriloader rdf chardet nkcache appcomps lwbrk gfx2 imglib2 xpconnect unicharutil layout raptor gfx bookmarks
REQUIRES = xpcom string widget dom necko htmlparser locale view js intl webshell docshell cookie caps util timer uconv pref uriloader rdf chardet nkcache appcomps lwbrk gfx2 imglib2 xpconnect unicharutil layout gfx bookmarks
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
!if defined(XP_NEW_SELECTION)
@ -51,15 +51,10 @@ EXPORTS = \
nsIHTMLContentContainer.h \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
-I..\..\base\src \
-I$(PUBLIC)\dom \
LINCS=-I..\..\base\src \
-I..\..\content\src \
-I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref
-I..\..\..\base\src
!ifdef NECKO
LINCS = $(LINCS) -I$(PUBLIC)\necko
!endif
LCFLAGS = \
$(LCFLAGS) \

View File

@ -22,7 +22,7 @@
DEPTH=..\..\..\..
EXPORTS=nsICSSLoader.h nsICSSParser.h nsICSSPseudoComparator.h nsICSSStyleSheet.h nsICSSLoaderObserver.h nsIComputedDOMStyle.h nsIRuleNode.h nsIRuleWalker.h nsIMediaList.h
MODULE=raptor
MODULE=content
include <$(DEPTH)\config\rules.mak>

View File

@ -23,7 +23,7 @@ DEPTH=..\..\..\..
LIBRARY_NAME=contenthtmlstyle_s
MODULE=content
REQUIRES = xpcom string dom widget caps locale js necko webshell xul htmlparser docshell uconv xuldoc xpconnect pref layout raptor gfx
REQUIRES = xpcom string dom widget caps locale js necko webshell htmlparser docshell uconv xpconnect pref layout gfx content_xul
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN

View File

@ -20,7 +20,7 @@
# Contributor(s):
DEPTH=..\..\..
MODULE=layout
MODULE=content
EXPORTS = \
nsCSSAtomList.h \
nsCSSAtoms.h \

View File

@ -22,7 +22,7 @@
DEPTH=..\..\..
MODULE=content
REQUIRES = xpcom string widget locale dom webshell pref necko htmlparser unicharutil layout gfx raptor
REQUIRES = xpcom string widget locale dom webshell pref necko htmlparser unicharutil layout gfx
LIBRARY_NAME=contentshared_s
DEFINES=-D_IMPL_NS_LAYOUT -DWIN32_LEAN_AND_MEAN
!if defined(XP_NEW_SELECTION)

View File

@ -23,7 +23,7 @@ DEPTH=..\..\..
LIBRARY_NAME=contentxbl_s
MODULE=content
REQUIRES = xpcom string js dom widget caps htmlparser necko xpconnect pref docshell chrome lwbrk xul xuldoc gfx2 imglib2 layout raptor gfx
REQUIRES = xpcom string js dom widget caps htmlparser necko xpconnect pref docshell chrome lwbrk gfx2 imglib2 layout gfx content_xul
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
@ -80,11 +80,8 @@ CPP_OBJS= \
EXPORTS = \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
-I..\..\html\style\src -I..\..\html\base\src -I$(PUBLIC)\dom \
LINCS=-I..\..\html\style\src -I..\..\html\base\src \
-I..\..\html\document\src \
-I$(PUBLIC)\netlib \
-I$(PUBLIC)\pref \
-I..\..\xml\document\src \
-I..\..\base\src \
$(NULL)

View File

@ -25,7 +25,7 @@ EXPORTS = \
nsIXMLContent.h \
$(NULL)
MODULE=raptor
MODULE=content
include <$(DEPTH)\config\rules.mak>

View File

@ -23,7 +23,7 @@ DEPTH=..\..\..\..
LIBRARY_NAME=contentxmlcontent_s
MODULE=content
REQUIRES = xpcom string js dom widget necko caps webshell docshell htmlparser xpconnect raptor layout gfx
REQUIRES = xpcom string js dom widget necko caps webshell docshell htmlparser xpconnect layout gfx
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN

View File

@ -26,7 +26,7 @@ EXPORTS = \
nsIXMLDocument.h \
$(NULL)
MODULE=raptor
MODULE=content
include <$(DEPTH)\config\rules.mak>

View File

@ -23,7 +23,7 @@ DEPTH=..\..\..\..
LIBRARY_NAME=contentxmldoc_s
MODULE=content
REQUIRES = xpcom string js dom widget caps htmlparser necko view docshell webshell uriloader pref xpconnect uconv chardet lwbrk exthandler mimetype raptor gfx layout
REQUIRES = xpcom string js dom widget caps htmlparser necko view docshell webshell uriloader pref xpconnect uconv chardet lwbrk exthandler mimetype gfx layout
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
@ -40,12 +40,10 @@ CPP_OBJS= \
EXPORTS = \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
-I..\..\..\html\base\src -I$(PUBLIC)\dom \
LINCS=-I..\..\..\html\base\src \
-I..\..\..\html\document\src \
-I..\..\..\xul\content\src -I..\..\..\xsl\document\src \
-I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref \
-I$(PUBLIC)\expat
-I..\..\..\base\src
LCFLAGS = \
$(LCFLAGS) \

View File

@ -22,8 +22,8 @@
DEPTH=..\..\..\..
LIBRARY_NAME=contentxsldoc_s
MODULE=xsl_doc
REQUIRES = xpcom string htmlparser view widget dom necko layout raptor gfx content
MODULE=content_xsl
REQUIRES = xpcom string htmlparser view widget dom necko layout gfx content
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
@ -44,12 +44,10 @@ EXPORTS = \
nsITransformMediator.h \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
-I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \
LINCS= -I..\..\..\html\style\src -I..\..\..\html\base\src \
-I..\..\..\html\content\src -I..\..\..\html\document\src \
-I..\..\..\xul\content\src -I..\..\..\xml\document\src \
-I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref \
-I$(PUBLIC)\expat
-I..\..\..\base\src
LCFLAGS = \
$(LCFLAGS) \

View File

@ -20,7 +20,7 @@
# Contributor(s):
MODULE=xul
MODULE=content_xul
DEPTH=..\..\..\..

View File

@ -22,8 +22,8 @@
DEPTH=..\..\..\..
LIBRARY_NAME=contentxulcontent_s
MODULE=content
REQUIRES = xpcom string widget htmlparser necko dom js caps rdf xpconnect locale timer lwbrk pref xul xuldoc xultmpl webshell layout layout_xul raptor gfx
MODULE=content_xul
REQUIRES = xpcom string widget htmlparser necko dom js caps rdf xpconnect locale timer lwbrk pref webshell layout layout_xul gfx content
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN

View File

@ -20,7 +20,7 @@
# Contributor(s):
MODULE=xuldoc
MODULE=content_xul
DEPTH=..\..\..\..

View File

@ -22,8 +22,8 @@
DEPTH=..\..\..\..
LIBRARY_NAME=contentxuldocument_s
MODULE=content
REQUIRES = xpcom string exthandler mimetype widget dom rdf js xpconnect caps locale view necko uriloader htmlparser lwbrk timer chrome docshell pref xul xuldoc xultmpl layout gfx raptor layout_xul
MODULE=content_xul
REQUIRES = xpcom string exthandler mimetype widget dom rdf js xpconnect caps locale view necko uriloader htmlparser lwbrk timer chrome docshell pref layout gfx layout_xul content
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN

View File

@ -20,7 +20,7 @@
# Contributor(s):
MODULE=xultmpl
MODULE=content_xul
DEPTH=..\..\..\..

View File

@ -22,8 +22,8 @@
DEPTH=..\..\..\..
LIBRARY_NAME=contentxultemplates_s
MODULE=content
REQUIRES = xpcom string js xpconnect timer caps widget dom rdf necko locale xul xuldoc xultmpl layout raptor gfx layout_xul
MODULE=content_xul
REQUIRES = xpcom string js xpconnect timer caps widget dom rdf necko locale layout gfx layout_xul content
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN

View File

@ -22,7 +22,7 @@
DEPTH=..\..
MODULE=docshell
XPIDL_MODULE=docshell_base
REQUIRES = xpcom string caps necko layout dom js uriloader exthandler htmlparser view pref locale webBrowser_core xpconnect timer widget shistory intl plugin gkplugin webshell chardet uconv appcomps xuldoc find nkcache content raptor gfx history
REQUIRES = xpcom string caps necko layout dom js uriloader exthandler htmlparser view pref locale webBrowser_core xpconnect timer widget shistory intl plugin gkplugin webshell chardet uconv appcomps content_xul find nkcache content raptor gfx history
LIBRARY_NAME=basedocshell_s

View File

@ -27,7 +27,7 @@ LIBRARY_NAME=jsdombase_s
DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
LINCS= -I..\build
REQUIRES = xpcom string webBrowser_core js widget gfx layout layout_xul content raptor caps docshell xpconnect pref oji necko java locale uriloader sidebar xuldoc timer webshell view uconv shistory plugin gkplugin windowwatcher htmlparser chardet transformiix xmlextras xsl_doc
REQUIRES = xpcom string webBrowser_core js widget gfx layout layout_xul content content_xul content_xsl caps docshell xpconnect pref oji necko java locale uriloader sidebar xuldoc timer webshell view uconv shistory plugin gkplugin windowwatcher htmlparser chardet transformiix xmlextras xsl_doc
CPPSRCS = \
nsBarProps.cpp \

View File

@ -21,7 +21,7 @@
DEPTH=..\..\..
MODULE=dom
REQUIRES = xpcom string js xpconnect widget layout caps timer webBrowser_core xuldoc docshell sidebar plugin gkplugin necko gfx content raptor
REQUIRES = xpcom string js xpconnect widget layout caps timer webBrowser_core xuldoc docshell sidebar plugin gkplugin necko gfx content content_xul
include <$(DEPTH)/config/config.mak>
DEFINES=-D_IMPL_NS_DOM

View File

@ -22,7 +22,7 @@
DEPTH=..\..
MODULE=editor
REQUIRES = xpcom string dom locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome appcomps xuldoc windowwatcher exthandler mimetype content raptor gfx
REQUIRES = xpcom string dom locale layout uriloader widget txmgr htmlparser necko pref view appshell rdf webshell timer txtsvc intl lwbrk docshell chrome appcomps xuldoc windowwatcher exthandler mimetype content content_xul gfx
include <$(DEPTH)/config/config.mak>
LIBRARY_NAME=editor

View File

@ -21,7 +21,7 @@
DEPTH=..\..\..
REQUIRES=xpcom txmgr
MAKE_OBJ_TYPE = EXE
PROG1 = .\$(OBJDIR)\TestTXMgr.exe
@ -29,11 +29,6 @@ PROGRAMS = $(PROG1)
LCFLAGS=-DUSE_NSREG
LINCS=-I$(PUBLIC)\txmgr \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\js \
-I$(PUBLIC)\dom
LLIBS= \
$(DIST)\lib\xpcom.lib

View File

@ -40,12 +40,6 @@ CPP_OBJS = \
.\$(OBJDIR)\nsTSDNotifier.obj \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\txtsvc \
-I$(PUBLIC)\editor \
-I$(PUBLIC)\base \
-I$(PUBLIC)\dom \
-I$(PUBLIC)\raptor
LLIBS= \
$(DIST)\lib\xpcom.lib

View File

@ -24,7 +24,7 @@ DEPTH=..\..\..
MAKE_OBJ_TYPE = EXE
MODULE = winEmbed
REQUIRES = xpcom string embed_base webBrowser_core raptor embedding windowwatcher profile necko docshell dom gfx widget layout uriloader shistory
REQUIRES = xpcom string embed_base webBrowser_core webshell embedding windowwatcher profile necko docshell dom gfx widget layout uriloader shistory
PROGRAM = .\$(OBJDIR)\$(MODULE).exe
RESFILE = $(MODULE).res

View File

@ -22,7 +22,7 @@
#
DEPTH= ..\..
MODULE = raptor
MODULE = expat
EXPORTS = xmlparse.h
LIBRARY_NAME=expat

View File

@ -21,7 +21,7 @@
DEPTH=..\..\..
MODULE=transformiix
REQUIRES = xpcom string dom layout widget xsl_doc necko content
REQUIRES = xpcom string dom layout widget content_xsl necko content
include <$(DEPTH)/config/config.mak>
LIBRARY_NAME=transformiix

View File

@ -21,7 +21,7 @@
DEPTH=..\..\..\..
MODULE = transformiix
REQUIRES = string xpcom dom layout widget necko xsl_doc content
REQUIRES = string xpcom dom layout widget necko content_xsl content
include <$(DEPTH)/config/config.mak>
DIRS=util functions

View File

@ -23,6 +23,8 @@
DEPTH = ..\..\..
REQUIRES=xpcom string xmlextras necko dom content layout widget
include <$(DEPTH)/config/config.mak>
MAKE_OBJ_TYPE = EXE
@ -33,12 +35,6 @@ PROGRAMS = $(PROG1) \
LCFLAGS = -DUSE_NSREG -GX
REQUIRES = libreg
LINCS = \
-Iservices \
-I$(PUBLIC)\xpcom
LLIBS = \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -47,14 +47,6 @@ CPP_OBJS=.\$(OBJDIR)\nsColor.obj .\$(OBJDIR)\nsColorNames.obj \
.\$(OBJDIR)\nsScriptableRegion.obj\
.\$(OBJDIR)\nsPrintOptionsImpl.obj
LINCS=-I$(PUBLIC)\util \
-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \
!ifdef NECKO
-I$(PUBLIC)\necko \
!else
-I$(PUBLIC)\netlib \
!endif
$(NULL)
LCFLAGS = \
$(LCFLAGS) \

View File

@ -51,10 +51,6 @@ EXPORTS= nsIRenderingContextWin.h \
LINCS= \
-I..\
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\dom \
-I$(PUBLIC)\js \
!if defined(NGLAYOUT_DDRAW)
!if "$(MOZ_VCVER)" == "50"
-I$(NGLAYOUT_DDRAW)\include \

View File

@ -26,7 +26,7 @@ PROG0 = .\$(OBJDIR)\BitTest.exe
RESFILE = image.res
PROGRAMS = $(PROG0)
LINCS=-I$(XPDIST)\public\raptor -I$(XPDIST)\public\xpcom -I..\src
LINCS=-I..\src
LLIBS= \
$(DIST)\lib\gkgfx.lib \

View File

@ -30,8 +30,6 @@ OBJS = \
.\$(OBJDIR)\nsCoverage.obj \
$(NULL)
LINCS=-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom -I\ns\raptor\ui\src\windows
LLIBS= \
$(DIST)\lib\xpcom.lib \

View File

@ -21,13 +21,14 @@
DEPTH=..\..
REQUIRES = xpcom string gfx
MAKE_OBJ_TYPE = EXE
PROG1 = .\$(OBJDIR)\TestRect.exe
PROG2 = .\$(OBJDIR)\TestColorNames.exe
PROG3 = .\$(OBJDIR)\DumpColors.exe
PROGRAMS = $(PROG1) $(PROG2) $(PROG3)
LINCS=-I$(XPDIST)\public\raptor -I$(XPDIST)\public\xpcom -I..\src
LINCS=-I..\src
LLIBS= \
$(DIST)\lib\gkgfx.lib \

View File

@ -51,7 +51,7 @@ CPP_OBJS= \
MODULE = DebugRobot
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor -I$(XPDIST)\public\netlib -I..\src
LINCS=-I..\src
include <$(DEPTH)\config\rules.mak>

View File

@ -21,7 +21,7 @@
DEPTH=..\..\..
REQUIRES=xpcom string raptor htmlparser
REQUIRES=xpcom string webshell htmlparser
MAKE_OBJ_TYPE = EXE
PROGRAM = .\$(OBJDIR)\htmlrobot.exe
@ -42,7 +42,7 @@ CPPSRCS= \
CPP_OBJS= \
.\$(OBJDIR)\RobotMain.obj
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor -I$(XPDIST)\public\netlib -I..
LINCS=-I..
include <$(DEPTH)\config\rules.mak>

View File

@ -81,10 +81,6 @@ CPP_OBJS = \
!endif
$(NULL)
LINCS= -I$(PUBLIC)\xpcom \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\uconv \
-I$(PUBLIC)\expat
LCFLAGS = \
$(LCFLAGS) \

View File

@ -29,11 +29,6 @@ OBJS = \
.\$(OBJDIR)\grabpage.obj \
$(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\netlib
LLIBS= \
$(DIST)\lib\gkparser.lib \
$(DIST)\lib\netlib.lib \

View File

@ -29,10 +29,6 @@ OBJS = \
.\$(OBJDIR)\TestParser.obj \
$(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\netlib
LLIBS= \
$(DIST)\lib\gkparser.lib \

View File

@ -54,11 +54,6 @@ TEST_FILES = \
simplemail.out \
$(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\netlib
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR) \

View File

@ -20,18 +20,15 @@
# Contributor(s):
DEPTH = ..\..\..
REQUIRES=xpcom chardet
MAKE_OBJ_TYPE = EXE
PROG1 = .\$(OBJDIR)\DetectCharset.exe
PROGRAMS = $(PROG1)
REQUIRES=chardet
LCFLAGS=-DUSE_NSREG
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\unicharutil -I$(PUBLIC)\raptor
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -30,8 +30,6 @@ PROGRAMS = $(PROG1)
LCFLAGS=-DUSE_NSREG
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\unicharutil -I$(PUBLIC)\raptor
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -30,8 +30,6 @@ PROGRAMS = $(PROG1)
LCFLAGS=-DUSE_NSREG
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\lwbrk -I$(PUBLIC)\raptor
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -20,10 +20,10 @@
# Contributor(s):
DEPTH=..\..\..\..
REQUIRES=xpcom string
MODULE = locale
REQUIRES=xpcom string unicharutil uconv
include <$(DEPTH)/config/config.mak>
MODULE = nslocale
LIBRARY_NAME = nslocale
MODULE_NAME = nsLocaleModule
@ -38,11 +38,6 @@ OBJS = \
LINCS= \
-I..\
-I$(PUBLIC)\locale \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\unicharutil \
-I$(PUBLIC)\uconv \
-I$(PUBLIC)\raptor \
$(NULL)
LCFLAGS = \

View File

@ -34,9 +34,6 @@ SRPTS = $(SRPT1)
LCFLAGS=-DUSE_NSREG $(LCFLAGS)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\locale -I$(PUBLIC)\raptor \
-I$(PUBLIC)\uconv -I$(PUBLIC)\unicharutil
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR) \

View File

@ -53,8 +53,6 @@ LIBRARY_NAME=lwbrk
MODULE_NAME=nsLWBrkModule
REQUIRES=xpcom string
INCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\lwbrk -I$(PUBLIC)\raptor
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -21,6 +21,7 @@
DEPTH = ..\..\..
REQUIRES = xpcom string lwbrk
MAKE_OBJ_TYPE = EXE
@ -30,8 +31,6 @@ PROGRAMS = $(PROG1)
LCFLAGS=-DUSE_NSREG
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\lwbrk -I$(PUBLIC)\raptor
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -21,6 +21,7 @@
DEPTH=..\..\..
MODULE=intl
REQUIRES = xpcom string necko locale
include <$(DEPTH)\config\config.mak>
@ -36,17 +37,9 @@ CPP_OBJS = \
.\$(OBJDIR)\nsAcceptLang.obj \
$(NULL)
MODULE=intl
LIBRARY_NAME=strres
MODULE_NAME=nsStringBundleModule
LINCS=\
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\netlib \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\intl \
-I$(PUBLIC)\locale \
$(NULL)
LCFLAGS = \
$(LCFLAGS) \

View File

@ -20,19 +20,11 @@
# Contributor(s):
DEPTH=..\..\..
REQUIRES=xpcom string intl necko locale
MAKE_OBJ_TYPE = EXE
PROG0 = .\$(OBJDIR)\StringBundleTest.exe
PROGRAMS = $(PROG0)
LINCS=\
-I$(PUBLIC)\intl \
-I$(PUBLIC)\netlib \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\locale \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR) \

View File

@ -20,12 +20,12 @@
# Contributor(s):
DEPTH=..\..\..
MODULE=uconv
REQUIRES = xpcom string intl locale chardet necko rdf pref
include <$(DEPTH)/config/config.mak>
DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
MODULE=uconv
LIBRARY_NAME=uconv
MODULE_NAME=nsUConvModule
@ -49,7 +49,7 @@ CPPSRCS = \
nsUnicodeToMacRoman.cpp \
nsUnicodeToUTF8.cpp \
nsUCvMinSupport.cpp \
nsScriptableUConv.cpp \
nsScriptableUConv.cpp \
$(NULL)
CPP_OBJS= \
@ -72,7 +72,7 @@ CPP_OBJS= \
.\$(OBJDIR)\nsUnicodeToMacRoman.obj \
.\$(OBJDIR)\nsUnicodeToUTF8.obj \
.\$(OBJDIR)\nsUCvMinSupport.obj \
.\$(OBJDIR)\nsScriptableUConv.obj \
.\$(OBJDIR)\nsScriptableUConv.obj \
$(NULL)
CSRCS = \
@ -90,19 +90,7 @@ OBJS = \
EXPORTS= \
$(NULL)
#LINCS= \
# -I$(PUBLIC)\raptor \
# -I$(PUBLIC)\xpcom \
# -I$(PUBLIC)\uconv \
# -I..\ucvja \
# -I..\ucvlatin \
# $(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\uconv \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \

View File

@ -20,7 +20,7 @@
# Contributor(s):
DEPTH = ..\..\..
REQUIRES = uconv string
REQUIRES = xpcom uconv string locale
MAKE_OBJ_TYPE = EXE
PROG1 = .\$(OBJDIR)\convperf.exe
@ -33,8 +33,6 @@ PROGRAMS = $(PROG1) $(PROG2) $(PROG3) $(PROG4) $(PROG5)
LCFLAGS = -DUSE_NSREG
LINCS = -I$(PUBLIC)\xpcom
LLIBS = \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -67,12 +67,6 @@ CPP_OBJS= \
EXPORTS=nsUCvCnCID.h \
$(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\uconv \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -81,12 +81,6 @@ CPP_OBJS= \
EXPORTS=nsUCvIBMCID.h \
$(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\uconv \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -60,12 +60,6 @@ EXPORTS= nsUCVJACID.h \
nsUCVJA2CID.h \
$(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\uconv \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -63,12 +63,6 @@ CPP_OBJS= \
EXPORTS=nsUCvKOCID.h \
$(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\uconv \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -281,12 +281,6 @@ CPP_OBJS= \
EXPORTS=nsUCvLatinCID.h \
$(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\uconv \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -61,12 +61,6 @@ CPP_OBJS= \
EXPORTS=nsUCvMathCID.h \
$(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\uconv \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -57,12 +57,6 @@ CPP_OBJS= \
EXPORTS=nsUCvTWCID.h \
$(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\uconv \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -59,12 +59,6 @@ CPP_OBJS= \
EXPORTS=nsUCvTW2CID.h \
$(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\uconv \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -19,6 +19,7 @@
#
# Contributor(s):
DEPTH=..\..\..
MODULE=unicharutil
REQUIRES = xpcom string uconv necko
include <$(DEPTH)\config\config.mak>
@ -60,12 +61,9 @@ CPP_OBJS= \
!endif
$(NULL)
MODULE=unicharutil
LIBRARY_NAME=ucharuti
MODULE_NAME=UcharUtil
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\unicharutil -I$(PUBLIC)\raptor
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -20,7 +20,7 @@
# Contributor(s):
DEPTH = ..\..\..
REQUIRES=xpcom string unicharutil uconv necko
MAKE_OBJ_TYPE = EXE
@ -30,8 +30,6 @@ PROGRAMS = $(PROG1)
LCFLAGS=-DUSE_NSREG
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\unicharutil -I$(PUBLIC)\raptor
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -32,7 +32,7 @@
# file under either the NPL or the GPL.
DEPTH=..\..\..\..
REQUIRES=xpcom string xpconnect js
MAKE_OBJ_TYPE = EXE
@ -41,10 +41,6 @@ PROGRAMS = $(PROG1)
LCFLAGS=-DUSE_NSREG -DWIN32_LEAN_AND_MEAN
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\js -I$(PUBLIC)\xpconnect \
-I$(PUBLIC)\raptor
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR) \

View File

@ -21,7 +21,7 @@
DEPTH=..\..\..
MODULE=layout
REQUIRES = xpcom string dom widget view locale timer htmlparser webshell necko uconv pref uriloader unicharutil docshell imglib2 gfx2 raptor content gfx
REQUIRES = xpcom string dom widget view locale timer htmlparser webshell necko uconv pref uriloader unicharutil docshell imglib2 gfx2 content gfx
include <$(DEPTH)\config\config.mak>

View File

@ -20,12 +20,12 @@
# Contributor(s):
DEPTH=..\..\..
REQUIRES=xpcom layout gfx
MAKE_OBJ_TYPE = EXE
PROG1 = .\$(OBJDIR)\TestSpaceManager.exe
PROGRAMS = $(PROG1)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\src
LINCS=-I..\src
LLIBS= \
$(DIST)\lib\layoutbase_s.lib \
$(DIST)\lib\gkgfx.lib \

View File

@ -21,7 +21,7 @@
DEPTH=..\..
MODULE=layout
REQUIRES = xpcom string widget locale timer gfx content layout_xul raptor
REQUIRES = xpcom string widget locale timer gfx content layout_xul
include <$(DEPTH)/config/config.mak>
DEFINES=-D_IMPL_NS_HTML

View File

@ -21,7 +21,7 @@
DEPTH=..\..\..\..
MODULE=layout
REQUIRES = xpcom string dom widget locale view necko js caps pref htmlparser webshell plugin gkplugin timer docshell mimetype webBrowser_core oji util unicharutil lwbrk gfx2 gfx imglib2 accessibility xpconnect java exthandler content raptor
REQUIRES = xpcom string dom widget locale view necko js caps pref htmlparser webshell plugin gkplugin timer docshell mimetype webBrowser_core oji util unicharutil lwbrk gfx2 gfx imglib2 accessibility xpconnect java exthandler content
include <$(DEPTH)\config\config.mak>
LIBRARY_NAME=layouthtmlbase_s

View File

@ -23,7 +23,7 @@ DEPTH=..\..\..\..
LIBRARY_NAME=layouthtmldoc_s
MODULE=layout
REQUIRES = xpcom string widget dom necko locale view js webshell docshell caps pref uriloader shistory xpconnect accessibility gfx content raptor layout_xul
REQUIRES = xpcom string widget dom necko locale view js webshell docshell caps pref uriloader shistory xpconnect accessibility gfx content layout_xul
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
!if defined(XP_NEW_SELECTION)

View File

@ -32,7 +32,7 @@ EXPORTS=nsIFormManager.h \
nsISelectControlFrame.h \
nsIGfxTextControlFrame.h
MODULE=raptor
MODULE=layout
include <$(DEPTH)\config\rules.mak>

View File

@ -25,7 +25,7 @@ LIBRARY_NAME=layouthtmlforms_s
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
MODULE=layout
REQUIRES = xpcom string locale widget view dom js htmlparser necko webshell caps editor intl uconv exthandler mimetype txmgr xuldoc gfx2 imglib2 accessibility xpconnect unicharutil timer pref raptor gfx content
REQUIRES = xpcom string locale widget view dom js htmlparser necko webshell caps editor intl uconv exthandler mimetype txmgr gfx2 imglib2 accessibility xpconnect unicharutil timer pref gfx content content_xul layout_xul
CPPSRCS= \
nsFormControlHelper.cpp \

View File

@ -22,8 +22,8 @@
DEPTH=..\..\..\..
LIBRARY_NAME=layouthtmlstyle_s
MODULE=raptor
REQUIRES = xpcom string dom widget timer locale view necko webshell pref docshell plugin gkplugin xuldoc imglib2 gfx2 layout gfx content layout_xul
MODULE=layout
REQUIRES = xpcom string dom widget timer locale view necko webshell pref docshell plugin gkplugin content_xul imglib2 gfx2 gfx content layout_xul
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN

View File

@ -23,7 +23,7 @@ DEPTH=..\..\..\..
MODULE=raptor
MODULE=layout
EXPORTS = \
nsITableCellLayout.h \

View File

@ -23,7 +23,7 @@ DEPTH=..\..\..\..
LIBRARY_NAME=layouthtmltable_s
MODULE=layout
REQUIRES = xpcom string dom widget locale webshell view accessibility gfx content raptor
REQUIRES = xpcom string dom widget locale webshell view accessibility gfx content
DEFINES =-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN -DoffDEBUG_TABLE_REFLOW \
@ -54,10 +54,8 @@ CPP_OBJS= .\$(OBJDIR)\nsCellMap.obj \
.\$(OBJDIR)\FixedTableLayoutStrategy.obj \
.\$(OBJDIR)\nsTableBorderCollapser.obj
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor \
-I..\..\base\src -I..\..\style\src -I..\..\content\src \
-I..\..\..\base\src \
-I$(PUBLIC)\dom -I$(PUBLIC)\js -I$(PUBLIC)\netlib
LINCS=-I..\..\base\src -I..\..\style\src -I..\..\content\src \
-I..\..\..\base\src
LCFLAGS = \
$(LCFLAGS) \

View File

@ -20,6 +20,7 @@
# Contributor(s):
DEPTH=..\..\..
REQUIRES = xpcom string layout content
include <$(DEPTH)/config/config.mak>
MAKE_OBJ_TYPE = EXE
@ -34,10 +35,6 @@ LCFLAGS = \
$(NULL)
LINCS= \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\dom \
-I$(PUBLIC)\js \
-I..\base\src \
-I..\style\src \
-I..\..\css\layout\src \

View File

@ -23,7 +23,7 @@
DEPTH=..\..\..\..
LIBRARY_NAME=layoutmathmlbase_s
MODULE=raptor
MODULE=layout
DEFINES= -DWIN32_LEAN_AND_MEAN
@ -84,13 +84,12 @@ CPP_OBJS= .\$(OBJDIR)\nsMathMLChar.obj \
EXPORTS = \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
LINCS= \
-I..\..\..\html\style\src \
-I..\..\..\html\base\src \
-I..\..\..\html\table\src \
-I$(PUBLIC)\dom \
-I..\..\content\src \
-I$(PUBLIC)\netlib -I$(PUBLIC)\pref
$(NULL)
LCFLAGS = \
$(LCFLAGS) \

View File

@ -24,7 +24,7 @@
DEPTH=..\..\..\..
LIBRARY_NAME=layoutmathmlcontent_s
MODULE=raptor
MODULE=layout
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
@ -38,9 +38,6 @@ CPP_OBJS= \
.\$(OBJDIR)\nsMathMLOperators.obj \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
-I$(PUBLIC)\dom \
-I$(PUBLIC)\netlib -I$(PUBLIC)\pref
LCFLAGS = \
$(LCFLAGS) \

View File

@ -25,6 +25,6 @@ EXPORTS = \
nsISVGFrame.h \
$(NULL)
MODULE=raptor
MODULE=layout
include <$(DEPTH)\config\rules.mak>

View File

@ -22,7 +22,7 @@
DEPTH=..\..\..\..
LIBRARY_NAME=layoutsvgbase_s
MODULE=raptor
MODULE=layout
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
@ -43,14 +43,14 @@ CPP_OBJS= \
EXPORTS = \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
-I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \
LINCS= \
-I..\..\..\html\style\src -I..\..\..\html\base\src \
-I..\..\..\html\document\src \
-I..\..\..\html\content\src \
-I..\..\..\html\table\src \
-I..\..\content\src \
-I..\..\..\html\forms\src \
-I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref \
-I..\..\..\base\src \
-I..\..\..\xml\content\src \
-I..\..\..\base\public

View File

@ -22,7 +22,7 @@
DEPTH=..\..\..\..
LIBRARY_NAME=layoutsvgcontent_s
MODULE=raptor
MODULE=layout
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
@ -37,10 +37,9 @@ CPP_OBJS= \
EXPORTS = \
$(NULL)
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\js \
-I..\..\..\html\style\src -I..\..\..\html\base\src -I$(PUBLIC)\dom \
LINCS=-I..\..\..\html\style\src -I..\..\..\html\base\src \
-I..\..\..\html\document\src \
-I$(PUBLIC)\netlib -I..\..\..\base\src -I$(PUBLIC)\pref
-I..\..\..\base\src
LCFLAGS = \
$(LCFLAGS) \

View File

@ -24,7 +24,7 @@ DEPTH=..\..\..\..
LIBRARY_NAME=layoutxulbase_s
MODULE=layout_xul
DIRS=outliner
REQUIRES = xpcom string dom locale widget view timer docshell necko editor htmlparser webshell pref intl gfx2 imglib2 unicharutil gfx layout content raptor
REQUIRES = xpcom string dom locale widget view timer docshell necko editor htmlparser webshell pref intl gfx2 imglib2 unicharutil gfx content layout
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN

View File

@ -22,8 +22,8 @@
DEPTH=..\..\..\..\..\..
LIBRARY_NAME=raptorxuloutliner_s
MODULE=raptor
REQUIRES = xpcom string dom widget timer locale view xultmpl rdf necko gfx2 imglib2 gfx layout layout_xul content
MODULE=layout_xul
REQUIRES = xpcom string dom widget timer locale view rdf necko gfx2 imglib2 gfx content content_xul
DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN

View File

@ -30,16 +30,6 @@ OBJS = \
.\$(OBJDIR)\filterTest.obj \
$(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\netlib \
-I$(PUBLIC)\mailnews \
-I$(PUBLIC)\security \
-I$(PUBLIC)\pref \
-I$(PUBLIC)\js \
-I$(PUBLIC)\rdf
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \

View File

@ -21,7 +21,7 @@
DEPTH=..\..\..
MODULE= msgbase
REQUIRES = xpcom string necko dom appshell appcomps uconv intl htmlparser widget docshell rdf editor layout mailnews locale msgbaseutil webshell txmgr msgcompo msgdb uriloader pref msglocal msgimap timer mork msgnews addrbook prefmigr chrome mime mimetype windowwatcher raptor gfx content msgsearch layout_xul
REQUIRES = xpcom string necko dom appshell appcomps uconv intl htmlparser widget docshell rdf editor layout mailnews locale msgbaseutil webshell txmgr msgcompo msgdb uriloader pref msglocal msgimap timer mork msgnews addrbook prefmigr chrome mime mimetype windowwatcher gfx content msgsearch layout_xul
include <$(DEPTH)\config\config.mak>

View File

@ -72,7 +72,6 @@ DEFFILE=nsgif.def
#// (these must be defined before the common makefiles are included)
#//
#//------------------------------------------------------------------------
LINCS=-I$(DEPTH)/dist/public/xpcom -I. -I$(DEPTH)/dist/public/raptor
CPPSRCS= nsGIFModule.cpp nsGIFDecoder.cpp gif.cpp
CPP_OBJS= .\$(OBJDIR)\nsGIFModule.obj .\$(OBJDIR)\nsGIFDecoder.obj \
.\$(OBJDIR)\gif.obj

View File

@ -81,10 +81,6 @@ C_OBJS=\
.\$(OBJDIR)\libmng_write.obj \
.\$(OBJDIR)\libmng_zlib.obj \
$(NULL)
!if "$(MOZ_BITS)" != "16"
LINCS=-I$(XPDIST)\public\util -I$(XPDIST)\public\nspr \
-I$(XPDIST)\public\zlib -I$(XPDIST)\public\jpeg
!endif
include <$(DEPTH)\config\rules.mak>

View File

@ -52,10 +52,6 @@ C_OBJS=.\$(OBJDIR)\png.obj .\$(OBJDIR)\pngerror.obj \
.\$(OBJDIR)\pngwio.obj .\$(OBJDIR)\pngwrite.obj \
.\$(OBJDIR)\pngwtran.obj .\$(OBJDIR)\pngrtran.obj \
.\$(OBJDIR)\pngwutil.obj
!if "$(MOZ_BITS)" != "16"
LINCS=-I$(XPDIST)\public\util -I$(XPDIST)\public\nspr \
-I$(XPDIST)\public\zlib
!endif
include <$(DEPTH)\config\rules.mak>

View File

@ -52,15 +52,6 @@ OBJS=.\$(OBJDIR)\nsZipArchive.obj \
LCFLAGS=-DZLIB_DLL=1
LINCS= \
-I$(PUBLIC)\security \
-I$(XPDIST)\public\nspr \
-I$(XPDIST)\public\raptor \
-I$(XPDIST)\public\xpcom \
-I$(XPDIST)\public\zlib \
-I$(XPDIST)\public\network \
-I$(XPDIST)\public\libjar \
$(NULL)
LLIBS= \
$(LIBNSPR) \

View File

@ -34,10 +34,6 @@ LCFLAGS=-DSTANDALONE
LINCS= \
-I.. \
-I$(XPDIST)\public\nspr \
-I$(XPDIST)\public\raptor \
-I$(XPDIST)\public\xpcom \
-I$(XPDIST)\public\zlib \
$(NULL)
LLIBS= \

View File

@ -31,9 +31,6 @@ PROGRAMS = $(PROG1) \
LCFLAGS=
LINCS= \
-I$(PUBLIC)\xpcom
LLIBS= \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR)

View File

@ -42,16 +42,6 @@ LIBRARY_NAME = xppref$(MOZ_BITS)
MODULE_NAME = nsPrefModule
REQUIRES = xpcom string js xpconnect caps intl timer necko embedcomponents profile
LINCS = -I$(PUBLIC)/js \
-I$(PUBLIC)/pref \
-I$(PUBLIC)/java \
-I$(PUBLIC)/ldap \
-I$(PUBLIC)/dbm \
-I$(PUBLIC)/security \
-I$(PUBLIC)/xpcom \
-I$(PUBLIC)/raptor \
-I$(PUBLIC)/profile \
-I$(DEPTH)\include \
LCFLAGS = -DMOZILLA_CLIENT

View File

@ -60,32 +60,11 @@ OBJS = .\$(OBJDIR)\jvmmgr.obj \
#//
#//------------------------------------------------------------------------
LINCS= $(LINCS) -I_jri \
LINCS= -I_jri
#
# For Win16 the following include directories are copied into
# ns/dist/public/win16
#
!if "$(MOZ_BITS)" == "32"
-I$(PUBLIC)/caps \
-I$(PUBLIC)/js \
-I$(PUBLIC)/java \
-I$(PUBLIC)/libimg \
-I$(PUBLIC)/nspr \
-I$(PUBLIC)/dbm \
-I$(PUBLIC)/security \
-I$(PUBLIC)/pref \
-I$(PUBLIC)/xpcom \
-I$(PUBLIC)/raptor \
-I$(PUBLIC)/plugin \
-I$(PUBLIC)/oji \
-I$(PUBLIC)/plugimpl \
-I$(PUBLIC)/netlib \
!endif
-I$(DIST)/include/private \
-I$(DEPTH)/lib/layout \
-I$(DEPTH)/lib/libstyle \
-I$(DEPTH)/lib/libjar \
$(NULL)
!endif # MOZ_OJI

View File

@ -44,24 +44,6 @@ OBJS = \
.\$(OBJDIR)\nsPluginsDirWin.obj \
$(NULL)
LINCS = \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\dom \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\plugin \
-I$(PUBLIC)\java \
!ifdef NECKO
-I$(PUBLIC)\necko \
!else
-I$(PUBLIC)\netlib \
!endif
-I$(PUBLIC)\oji \
-I$(PUBLIC)\cache \
-I$(PUBLIC)\pref \
-I$(PUBLIC)\js \
$(NULL)
LCFLAGS = \
$(LCFLAGS) \
-D_IMPL_NS_PLUGIN \

View File

@ -43,13 +43,6 @@ LLIBS=$(LLIBS) \
$(DIST)\lib\nunet.lib \
$(DIST)\lib\netlib.lib
LINCS=$(LINCS) -I. \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\netlib \
-I$(PUBLIC)\nunet \
-I$(PUBLIC)\pref \
-I$(PUBLIC)\xpcom
# clobber and clobber_all will remove the following garbage:
GARBAGE = $(GARBAGE) _gen

View File

@ -26,10 +26,6 @@ DEPTH=..\..\..
include <$(DEPTH)/config/config.mak>
LINCS = \
-I$(PUBLIC) \
$(NULL)
LLIBS = \
$(LIBNSPR) \
$(MOZ_DIST)\lib\xpcom.lib \

View File

@ -51,7 +51,7 @@ CPP_OBJS= \
MODULE = DebugRobot
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor -I$(XPDIST)\public\netlib -I..\src
LINCS=-I..\src
include <$(DEPTH)\config\rules.mak>

Some files were not shown because too many files have changed in this diff Show More