From e28607491efa80c11d44828569b796929bc19d98 Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Mon, 17 Sep 2001 19:06:35 +0000 Subject: [PATCH] Final REQUIRES changes for bug 98371, adding support for MOZ_TRACK_MODULE_DEPS to win32. r=cls (and tested by cls!) git-svn-id: svn://10.0.0.236/trunk@102999 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/makefile.win | 9 ++--- mozilla/content/build/makefile.win | 2 +- mozilla/content/events/public/makefile.win | 2 +- mozilla/content/events/src/makefile.win | 2 +- .../content/html/content/public/makefile.win | 2 +- mozilla/content/html/content/src/makefile.win | 7 ++-- .../content/html/document/public/makefile.win | 2 +- .../content/html/document/src/makefile.win | 11 ++----- .../content/html/style/public/makefile.win | 2 +- mozilla/content/html/style/src/makefile.win | 2 +- mozilla/content/shared/public/makefile.win | 2 +- mozilla/content/shared/src/makefile.win | 2 +- mozilla/content/xbl/src/makefile.win | 7 ++-- .../content/xml/content/public/makefile.win | 2 +- mozilla/content/xml/content/src/makefile.win | 2 +- .../content/xml/document/public/makefile.win | 2 +- mozilla/content/xml/document/src/makefile.win | 8 ++--- mozilla/content/xsl/document/src/makefile.win | 10 +++--- .../content/xul/content/public/makefile.win | 2 +- mozilla/content/xul/content/src/makefile.win | 4 +-- .../content/xul/document/public/makefile.win | 2 +- mozilla/content/xul/document/src/makefile.win | 4 +-- .../content/xul/templates/public/makefile.win | 2 +- .../content/xul/templates/src/makefile.win | 4 +-- mozilla/docshell/base/makefile.win | 2 +- mozilla/dom/src/base/makefile.win | 2 +- mozilla/dom/src/build/makefile.win | 2 +- mozilla/editor/base/makefile.win | 2 +- mozilla/editor/txmgr/tests/makefile.win | 7 +--- mozilla/editor/txtsvc/src/makefile.win | 6 ---- mozilla/embedding/tests/winEmbed/makefile.win | 2 +- mozilla/expat/xmlparse/makefile.win | 2 +- .../transformiix/build/makefile.win | 2 +- .../transformiix/source/xslt/makefile.win | 2 +- .../extensions/xmlextras/tests/makefile.win | 8 ++--- mozilla/gfx/src/makefile.win | 8 ----- mozilla/gfx/src/windows/makefile.win | 4 --- mozilla/gfx/tests/btest/makefile.win | 2 +- mozilla/gfx/tests/coverage/makefile.win | 2 -- mozilla/gfx/tests/makefile.win | 3 +- mozilla/htmlparser/robot/makefile.win | 2 +- mozilla/htmlparser/robot/test/makefile.win | 4 +-- mozilla/htmlparser/src/makefile.win | 4 --- .../htmlparser/tests/grabpage/makefile.win | 5 --- .../htmlparser/tests/logparse/makefile.win | 4 --- .../htmlparser/tests/outsinks/makefile.win | 5 --- mozilla/intl/chardet/tests/makefile.win | 5 +-- mozilla/intl/chardet/tools/makefile.win | 2 -- mozilla/intl/compatibility/tests/makefile.win | 2 -- mozilla/intl/locale/src/windows/makefile.win | 9 ++--- mozilla/intl/locale/tests/makefile.win | 3 -- mozilla/intl/lwbrk/src/makefile.win | 2 -- mozilla/intl/lwbrk/tests/makefile.win | 3 +- mozilla/intl/strres/src/makefile.win | 9 +---- mozilla/intl/strres/tests/makefile.win | 10 +----- mozilla/intl/uconv/src/makefile.win | 18 ++-------- mozilla/intl/uconv/tests/makefile.win | 4 +-- mozilla/intl/uconv/ucvcn/makefile.win | 6 ---- mozilla/intl/uconv/ucvibm/makefile.win | 6 ---- mozilla/intl/uconv/ucvja/makefile.win | 6 ---- mozilla/intl/uconv/ucvko/makefile.win | 6 ---- mozilla/intl/uconv/ucvlatin/makefile.win | 6 ---- mozilla/intl/uconv/ucvmath/makefile.win | 6 ---- mozilla/intl/uconv/ucvtw/makefile.win | 6 ---- mozilla/intl/uconv/ucvtw2/makefile.win | 6 ---- mozilla/intl/unicharutil/src/makefile.win | 4 +-- mozilla/intl/unicharutil/tests/makefile.win | 4 +-- mozilla/js/src/xpconnect/shell/makefile.win | 6 +--- mozilla/layout/base/src/makefile.win | 2 +- mozilla/layout/base/tests/makefile.win | 4 +-- mozilla/layout/build/makefile.win | 2 +- mozilla/layout/html/base/src/makefile.win | 2 +- mozilla/layout/html/document/src/makefile.win | 2 +- mozilla/layout/html/forms/public/makefile.win | 2 +- mozilla/layout/html/forms/src/makefile.win | 2 +- mozilla/layout/html/style/src/makefile.win | 4 +-- mozilla/layout/html/table/public/makefile.win | 2 +- mozilla/layout/html/table/src/makefile.win | 8 ++--- mozilla/layout/html/tests/makefile.win | 5 +-- mozilla/layout/mathml/base/src/makefile.win | 7 ++-- .../layout/mathml/content/src/makefile.win | 5 +-- mozilla/layout/svg/base/public/makefile.win | 2 +- mozilla/layout/svg/base/src/makefile.win | 8 ++--- mozilla/layout/svg/content/src/makefile.win | 7 ++-- mozilla/layout/xul/base/src/makefile.win | 2 +- .../xul/base/src/outliner/src/makefile.win | 4 +-- .../mailnews/base/search/tests/makefile.win | 10 ------ mozilla/mailnews/base/src/makefile.win | 2 +- mozilla/modules/libimg/gifcom/makefile.win | 1 - mozilla/modules/libimg/mng/makefile.win | 4 --- mozilla/modules/libimg/png/makefile.win | 4 --- mozilla/modules/libjar/makefile.win | 9 ----- .../modules/libjar/standalone/makefile.win | 4 --- mozilla/modules/libjar/test/makefile.win | 3 -- mozilla/modules/libpref/src/makefile.win | 10 ------ mozilla/modules/oji/src/makefile.win | 23 +------------ mozilla/modules/plugin/base/src/makefile.win | 18 ---------- mozilla/netwerk/base/tests/makefile.win | 7 ---- mozilla/netwerk/socket/base/makefile.win | 4 --- mozilla/parser/htmlparser/robot/makefile.win | 2 +- .../parser/htmlparser/robot/test/makefile.win | 4 +-- mozilla/parser/htmlparser/src/makefile.win | 4 --- .../htmlparser/tests/grabpage/makefile.win | 5 --- .../htmlparser/tests/logparse/makefile.win | 4 --- .../htmlparser/tests/outsinks/makefile.win | 5 --- mozilla/profile/Acct/makefile.win | 13 -------- mozilla/profile/Acctidl/makefile.win | 6 ---- mozilla/profile/src/makefile.win | 2 +- mozilla/rdf/base/src/makefile.win | 2 +- mozilla/rdf/build/makefile.win | 2 +- mozilla/rdf/chrome/src/makefile.win | 2 +- .../rdf/chrome/tools/chromereg/makefile.win | 5 +-- mozilla/rdf/tests/localfile/makefile.win | 8 ----- mozilla/rdf/tests/rdfsink/makefile.win | 8 ----- mozilla/view/src/makefile.win | 7 +--- .../webshell/embed/ngprefs/win/makefile.win | 8 ----- mozilla/webshell/public/makefile.win | 2 +- mozilla/webshell/src/makefile.win | 18 +--------- .../webshell/tests/ComFactory/makefile.win | 2 +- mozilla/webshell/tests/imgtest/makefile.win | 2 +- mozilla/webshell/tests/viewer/makefile.win | 33 ++----------------- .../webshell/tests/viewer/public/makefile.win | 2 +- mozilla/widget/src/build/makefile.win | 2 +- mozilla/widget/src/windows/makefile.win | 2 +- mozilla/widget/src/xpwidgets/makefile.win | 5 --- mozilla/widget/timer/src/windows/makefile.win | 1 - .../appshell/eventloop/windows/makefile.win | 2 +- mozilla/xpcom/base/makefile.win | 5 --- mozilla/xpcom/build/makefile.win | 1 - mozilla/xpcom/components/makefile.win | 2 -- mozilla/xpcom/ds/makefile.win | 6 ---- mozilla/xpcom/io/makefile.win | 10 +----- mozilla/xpcom/proxy/src/makefile.win | 4 +-- mozilla/xpcom/proxy/tests/makefile.win | 4 --- .../xpcom/reflect/xptcall/src/makefile.win | 4 --- .../reflect/xptcall/src/md/win32/makefile.win | 2 +- .../xpcom/reflect/xptcall/tests/makefile.win | 4 +-- .../xpcom/reflect/xptinfo/src/makefile.win | 4 --- .../xpcom/reflect/xptinfo/tests/makefile.win | 4 +-- mozilla/xpcom/sample/makefile.win | 6 ---- .../tests/StringFactoringTests/makefile.win | 4 +-- mozilla/xpcom/tests/dynamic/makefile.win | 2 +- mozilla/xpcom/tests/makefile.win | 4 +-- mozilla/xpcom/tests/services/makefile.win | 5 ++- mozilla/xpcom/tests/windows/makefile.win | 4 +-- mozilla/xpcom/threads/makefile.win | 4 --- mozilla/xpcom/tools/registry/makefile.win | 8 +---- mozilla/xpcom/typelib/xpidl/makefile.win | 4 +-- mozilla/xpcom/typelib/xpt/src/makefile.win | 4 --- mozilla/xpcom/typelib/xpt/tests/makefile.win | 4 +-- mozilla/xpcom/typelib/xpt/tools/makefile.win | 4 +-- mozilla/xpfe/appshell/public/makefile.win | 2 +- mozilla/xpfe/appshell/src/makefile.win | 2 +- .../components/autocomplete/src/makefile.win | 4 --- mozilla/xpfe/components/timebomb/makefile.win | 4 --- .../components/timebomb/tools/makefile.win | 8 ----- mozilla/xpfe/components/ucth/src/makefile.win | 8 ----- mozilla/xpfe/components/winhooks/makefile.win | 2 +- mozilla/xpinstall/standalone/makefile.win | 6 ---- mozilla/xpinstall/stub/makefile.win | 7 +--- 160 files changed, 140 insertions(+), 636 deletions(-) diff --git a/mozilla/content/base/src/makefile.win b/mozilla/content/base/src/makefile.win index 17b0907248c..cc3ebf0f38c 100644 --- a/mozilla/content/base/src/makefile.win +++ b/mozilla/content/base/src/makefile.win @@ -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) \ diff --git a/mozilla/content/build/makefile.win b/mozilla/content/build/makefile.win index cb860c3efca..f6fa18da08c 100644 --- a/mozilla/content/build/makefile.win +++ b/mozilla/content/build/makefile.win @@ -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) \ diff --git a/mozilla/content/events/public/makefile.win b/mozilla/content/events/public/makefile.win index d5b489c4ac8..04b4006f37e 100644 --- a/mozilla/content/events/public/makefile.win +++ b/mozilla/content/events/public/makefile.win @@ -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> diff --git a/mozilla/content/events/src/makefile.win b/mozilla/content/events/src/makefile.win index 5c154c86f9d..f2484344ab1 100644 --- a/mozilla/content/events/src/makefile.win +++ b/mozilla/content/events/src/makefile.win @@ -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> diff --git a/mozilla/content/html/content/public/makefile.win b/mozilla/content/html/content/public/makefile.win index f56ef674632..50364b9aeed 100644 --- a/mozilla/content/html/content/public/makefile.win +++ b/mozilla/content/html/content/public/makefile.win @@ -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> diff --git a/mozilla/content/html/content/src/makefile.win b/mozilla/content/html/content/src/makefile.win index 153a2de4c10..fbeb4caec00 100644 --- a/mozilla/content/html/content/src/makefile.win +++ b/mozilla/content/html/content/src/makefile.win @@ -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 \ diff --git a/mozilla/content/html/document/public/makefile.win b/mozilla/content/html/document/public/makefile.win index aa266a181f9..26b865cd969 100644 --- a/mozilla/content/html/document/public/makefile.win +++ b/mozilla/content/html/document/public/makefile.win @@ -24,7 +24,7 @@ DEPTH=..\..\..\.. EXPORTS = \ $(NULL) -MODULE=raptor +MODULE=content include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/content/html/document/src/makefile.win b/mozilla/content/html/document/src/makefile.win index 7b2b571c89d..c3c09f34bdb 100644 --- a/mozilla/content/html/document/src/makefile.win +++ b/mozilla/content/html/document/src/makefile.win @@ -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) \ diff --git a/mozilla/content/html/style/public/makefile.win b/mozilla/content/html/style/public/makefile.win index a559541d636..ea5ab04f77c 100644 --- a/mozilla/content/html/style/public/makefile.win +++ b/mozilla/content/html/style/public/makefile.win @@ -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> diff --git a/mozilla/content/html/style/src/makefile.win b/mozilla/content/html/style/src/makefile.win index d94544bdb85..72317ff6770 100644 --- a/mozilla/content/html/style/src/makefile.win +++ b/mozilla/content/html/style/src/makefile.win @@ -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 diff --git a/mozilla/content/shared/public/makefile.win b/mozilla/content/shared/public/makefile.win index a7d8cce2d5c..58961044743 100644 --- a/mozilla/content/shared/public/makefile.win +++ b/mozilla/content/shared/public/makefile.win @@ -20,7 +20,7 @@ # Contributor(s): DEPTH=..\..\.. -MODULE=layout +MODULE=content EXPORTS = \ nsCSSAtomList.h \ nsCSSAtoms.h \ diff --git a/mozilla/content/shared/src/makefile.win b/mozilla/content/shared/src/makefile.win index f94227a7423..d91aa947d1c 100644 --- a/mozilla/content/shared/src/makefile.win +++ b/mozilla/content/shared/src/makefile.win @@ -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) diff --git a/mozilla/content/xbl/src/makefile.win b/mozilla/content/xbl/src/makefile.win index c59b91162b1..30035f6870d 100644 --- a/mozilla/content/xbl/src/makefile.win +++ b/mozilla/content/xbl/src/makefile.win @@ -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) diff --git a/mozilla/content/xml/content/public/makefile.win b/mozilla/content/xml/content/public/makefile.win index 600150d2a03..9cf476bf31e 100644 --- a/mozilla/content/xml/content/public/makefile.win +++ b/mozilla/content/xml/content/public/makefile.win @@ -25,7 +25,7 @@ EXPORTS = \ nsIXMLContent.h \ $(NULL) -MODULE=raptor +MODULE=content include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/content/xml/content/src/makefile.win b/mozilla/content/xml/content/src/makefile.win index a7c200da3a1..1577289878b 100644 --- a/mozilla/content/xml/content/src/makefile.win +++ b/mozilla/content/xml/content/src/makefile.win @@ -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 diff --git a/mozilla/content/xml/document/public/makefile.win b/mozilla/content/xml/document/public/makefile.win index d82ad2f32b4..872dd1ea733 100644 --- a/mozilla/content/xml/document/public/makefile.win +++ b/mozilla/content/xml/document/public/makefile.win @@ -26,7 +26,7 @@ EXPORTS = \ nsIXMLDocument.h \ $(NULL) -MODULE=raptor +MODULE=content include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/content/xml/document/src/makefile.win b/mozilla/content/xml/document/src/makefile.win index 48e396d987b..d0c4f41f430 100644 --- a/mozilla/content/xml/document/src/makefile.win +++ b/mozilla/content/xml/document/src/makefile.win @@ -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) \ diff --git a/mozilla/content/xsl/document/src/makefile.win b/mozilla/content/xsl/document/src/makefile.win index 8699e8b6d83..a4b8a18d4b8 100644 --- a/mozilla/content/xsl/document/src/makefile.win +++ b/mozilla/content/xsl/document/src/makefile.win @@ -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) \ diff --git a/mozilla/content/xul/content/public/makefile.win b/mozilla/content/xul/content/public/makefile.win index 32709055cf2..ea32abef614 100644 --- a/mozilla/content/xul/content/public/makefile.win +++ b/mozilla/content/xul/content/public/makefile.win @@ -20,7 +20,7 @@ # Contributor(s): -MODULE=xul +MODULE=content_xul DEPTH=..\..\..\.. diff --git a/mozilla/content/xul/content/src/makefile.win b/mozilla/content/xul/content/src/makefile.win index 852ea7af418..7d6ade09322 100644 --- a/mozilla/content/xul/content/src/makefile.win +++ b/mozilla/content/xul/content/src/makefile.win @@ -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 diff --git a/mozilla/content/xul/document/public/makefile.win b/mozilla/content/xul/document/public/makefile.win index 68db7ae6a9a..99cd3938a2d 100644 --- a/mozilla/content/xul/document/public/makefile.win +++ b/mozilla/content/xul/document/public/makefile.win @@ -20,7 +20,7 @@ # Contributor(s): -MODULE=xuldoc +MODULE=content_xul DEPTH=..\..\..\.. diff --git a/mozilla/content/xul/document/src/makefile.win b/mozilla/content/xul/document/src/makefile.win index 48c3f495af8..9d52b5fcfa6 100644 --- a/mozilla/content/xul/document/src/makefile.win +++ b/mozilla/content/xul/document/src/makefile.win @@ -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 diff --git a/mozilla/content/xul/templates/public/makefile.win b/mozilla/content/xul/templates/public/makefile.win index 8a0961b3a76..ce8b879ca31 100644 --- a/mozilla/content/xul/templates/public/makefile.win +++ b/mozilla/content/xul/templates/public/makefile.win @@ -20,7 +20,7 @@ # Contributor(s): -MODULE=xultmpl +MODULE=content_xul DEPTH=..\..\..\.. diff --git a/mozilla/content/xul/templates/src/makefile.win b/mozilla/content/xul/templates/src/makefile.win index 73459842d23..d19b491489b 100644 --- a/mozilla/content/xul/templates/src/makefile.win +++ b/mozilla/content/xul/templates/src/makefile.win @@ -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 diff --git a/mozilla/docshell/base/makefile.win b/mozilla/docshell/base/makefile.win index f75747be05f..c974a2bc037 100644 --- a/mozilla/docshell/base/makefile.win +++ b/mozilla/docshell/base/makefile.win @@ -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 diff --git a/mozilla/dom/src/base/makefile.win b/mozilla/dom/src/base/makefile.win index c7b998096b8..842d756672e 100644 --- a/mozilla/dom/src/base/makefile.win +++ b/mozilla/dom/src/base/makefile.win @@ -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 \ diff --git a/mozilla/dom/src/build/makefile.win b/mozilla/dom/src/build/makefile.win index 307926c0a01..c2a1f3a55d7 100644 --- a/mozilla/dom/src/build/makefile.win +++ b/mozilla/dom/src/build/makefile.win @@ -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 diff --git a/mozilla/editor/base/makefile.win b/mozilla/editor/base/makefile.win index 5e30e02b413..8326ee2fd02 100644 --- a/mozilla/editor/base/makefile.win +++ b/mozilla/editor/base/makefile.win @@ -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 diff --git a/mozilla/editor/txmgr/tests/makefile.win b/mozilla/editor/txmgr/tests/makefile.win index 93ec0fd582d..efe91c727f8 100644 --- a/mozilla/editor/txmgr/tests/makefile.win +++ b/mozilla/editor/txmgr/tests/makefile.win @@ -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 diff --git a/mozilla/editor/txtsvc/src/makefile.win b/mozilla/editor/txtsvc/src/makefile.win index c44ea8cd874..d52b6bcd6ea 100644 --- a/mozilla/editor/txtsvc/src/makefile.win +++ b/mozilla/editor/txtsvc/src/makefile.win @@ -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 diff --git a/mozilla/embedding/tests/winEmbed/makefile.win b/mozilla/embedding/tests/winEmbed/makefile.win index 8cb06821599..0ef29fc6da4 100644 --- a/mozilla/embedding/tests/winEmbed/makefile.win +++ b/mozilla/embedding/tests/winEmbed/makefile.win @@ -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 diff --git a/mozilla/expat/xmlparse/makefile.win b/mozilla/expat/xmlparse/makefile.win index 9c441e2e420..5e83299c666 100644 --- a/mozilla/expat/xmlparse/makefile.win +++ b/mozilla/expat/xmlparse/makefile.win @@ -22,7 +22,7 @@ # DEPTH= ..\.. -MODULE = raptor +MODULE = expat EXPORTS = xmlparse.h LIBRARY_NAME=expat diff --git a/mozilla/extensions/transformiix/build/makefile.win b/mozilla/extensions/transformiix/build/makefile.win index 42064c48739..6e6353e1f66 100644 --- a/mozilla/extensions/transformiix/build/makefile.win +++ b/mozilla/extensions/transformiix/build/makefile.win @@ -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 diff --git a/mozilla/extensions/transformiix/source/xslt/makefile.win b/mozilla/extensions/transformiix/source/xslt/makefile.win index 0b5c323374f..e75672f539d 100644 --- a/mozilla/extensions/transformiix/source/xslt/makefile.win +++ b/mozilla/extensions/transformiix/source/xslt/makefile.win @@ -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 diff --git a/mozilla/extensions/xmlextras/tests/makefile.win b/mozilla/extensions/xmlextras/tests/makefile.win index ca3061b9424..268b076bbe6 100755 --- a/mozilla/extensions/xmlextras/tests/makefile.win +++ b/mozilla/extensions/xmlextras/tests/makefile.win @@ -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) diff --git a/mozilla/gfx/src/makefile.win b/mozilla/gfx/src/makefile.win index fc038137e1f..2c953beb5f3 100644 --- a/mozilla/gfx/src/makefile.win +++ b/mozilla/gfx/src/makefile.win @@ -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) \ diff --git a/mozilla/gfx/src/windows/makefile.win b/mozilla/gfx/src/windows/makefile.win index de9bf0fa076..9e5ccbbac40 100644 --- a/mozilla/gfx/src/windows/makefile.win +++ b/mozilla/gfx/src/windows/makefile.win @@ -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 \ diff --git a/mozilla/gfx/tests/btest/makefile.win b/mozilla/gfx/tests/btest/makefile.win index 49f3d069376..3f467e57031 100644 --- a/mozilla/gfx/tests/btest/makefile.win +++ b/mozilla/gfx/tests/btest/makefile.win @@ -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 \ diff --git a/mozilla/gfx/tests/coverage/makefile.win b/mozilla/gfx/tests/coverage/makefile.win index 531bde32de1..3322af9565a 100644 --- a/mozilla/gfx/tests/coverage/makefile.win +++ b/mozilla/gfx/tests/coverage/makefile.win @@ -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 \ diff --git a/mozilla/gfx/tests/makefile.win b/mozilla/gfx/tests/makefile.win index 8749184e358..2d0090de44a 100644 --- a/mozilla/gfx/tests/makefile.win +++ b/mozilla/gfx/tests/makefile.win @@ -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 \ diff --git a/mozilla/htmlparser/robot/makefile.win b/mozilla/htmlparser/robot/makefile.win index 4b3206e07dd..8d40dc8f6d4 100644 --- a/mozilla/htmlparser/robot/makefile.win +++ b/mozilla/htmlparser/robot/makefile.win @@ -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> diff --git a/mozilla/htmlparser/robot/test/makefile.win b/mozilla/htmlparser/robot/test/makefile.win index ef021528f2f..caa2f346caa 100644 --- a/mozilla/htmlparser/robot/test/makefile.win +++ b/mozilla/htmlparser/robot/test/makefile.win @@ -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> diff --git a/mozilla/htmlparser/src/makefile.win b/mozilla/htmlparser/src/makefile.win index f248a88ef90..cacc2016e7a 100644 --- a/mozilla/htmlparser/src/makefile.win +++ b/mozilla/htmlparser/src/makefile.win @@ -81,10 +81,6 @@ CPP_OBJS = \ !endif $(NULL) -LINCS= -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\raptor \ - -I$(PUBLIC)\uconv \ - -I$(PUBLIC)\expat LCFLAGS = \ $(LCFLAGS) \ diff --git a/mozilla/htmlparser/tests/grabpage/makefile.win b/mozilla/htmlparser/tests/grabpage/makefile.win index f672aa23b46..6690b01a559 100644 --- a/mozilla/htmlparser/tests/grabpage/makefile.win +++ b/mozilla/htmlparser/tests/grabpage/makefile.win @@ -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 \ diff --git a/mozilla/htmlparser/tests/logparse/makefile.win b/mozilla/htmlparser/tests/logparse/makefile.win index 35c79551e38..0ef72adbe44 100644 --- a/mozilla/htmlparser/tests/logparse/makefile.win +++ b/mozilla/htmlparser/tests/logparse/makefile.win @@ -29,10 +29,6 @@ OBJS = \ .\$(OBJDIR)\TestParser.obj \ $(NULL) -LINCS= \ - -I$(PUBLIC)\raptor \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\netlib LLIBS= \ $(DIST)\lib\gkparser.lib \ diff --git a/mozilla/htmlparser/tests/outsinks/makefile.win b/mozilla/htmlparser/tests/outsinks/makefile.win index 8f65f1a77bf..0131a88e45c 100644 --- a/mozilla/htmlparser/tests/outsinks/makefile.win +++ b/mozilla/htmlparser/tests/outsinks/makefile.win @@ -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) \ diff --git a/mozilla/intl/chardet/tests/makefile.win b/mozilla/intl/chardet/tests/makefile.win index 396eec715c2..d90b569d544 100644 --- a/mozilla/intl/chardet/tests/makefile.win +++ b/mozilla/intl/chardet/tests/makefile.win @@ -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) diff --git a/mozilla/intl/chardet/tools/makefile.win b/mozilla/intl/chardet/tools/makefile.win index 0f86611d069..e81cd64e5d5 100644 --- a/mozilla/intl/chardet/tools/makefile.win +++ b/mozilla/intl/chardet/tools/makefile.win @@ -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) diff --git a/mozilla/intl/compatibility/tests/makefile.win b/mozilla/intl/compatibility/tests/makefile.win index c5415c3d2e2..fbc542b0bbe 100644 --- a/mozilla/intl/compatibility/tests/makefile.win +++ b/mozilla/intl/compatibility/tests/makefile.win @@ -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) diff --git a/mozilla/intl/locale/src/windows/makefile.win b/mozilla/intl/locale/src/windows/makefile.win index 0e7ef333b34..0a01d49034a 100644 --- a/mozilla/intl/locale/src/windows/makefile.win +++ b/mozilla/intl/locale/src/windows/makefile.win @@ -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 = \ diff --git a/mozilla/intl/locale/tests/makefile.win b/mozilla/intl/locale/tests/makefile.win index ed5f7828b10..7821d95fa6e 100644 --- a/mozilla/intl/locale/tests/makefile.win +++ b/mozilla/intl/locale/tests/makefile.win @@ -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) \ diff --git a/mozilla/intl/lwbrk/src/makefile.win b/mozilla/intl/lwbrk/src/makefile.win index e1e4aa6ab78..4f4212396bc 100644 --- a/mozilla/intl/lwbrk/src/makefile.win +++ b/mozilla/intl/lwbrk/src/makefile.win @@ -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) diff --git a/mozilla/intl/lwbrk/tests/makefile.win b/mozilla/intl/lwbrk/tests/makefile.win index 50a177794bd..0b8c306a130 100644 --- a/mozilla/intl/lwbrk/tests/makefile.win +++ b/mozilla/intl/lwbrk/tests/makefile.win @@ -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) diff --git a/mozilla/intl/strres/src/makefile.win b/mozilla/intl/strres/src/makefile.win index 1fd4388e847..0d43ad3b8dd 100644 --- a/mozilla/intl/strres/src/makefile.win +++ b/mozilla/intl/strres/src/makefile.win @@ -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) \ diff --git a/mozilla/intl/strres/tests/makefile.win b/mozilla/intl/strres/tests/makefile.win index 4874cf09f62..6ae88f41252 100644 --- a/mozilla/intl/strres/tests/makefile.win +++ b/mozilla/intl/strres/tests/makefile.win @@ -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) \ diff --git a/mozilla/intl/uconv/src/makefile.win b/mozilla/intl/uconv/src/makefile.win index 994436aa689..23f88bbbfec 100644 --- a/mozilla/intl/uconv/src/makefile.win +++ b/mozilla/intl/uconv/src/makefile.win @@ -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 \ diff --git a/mozilla/intl/uconv/tests/makefile.win b/mozilla/intl/uconv/tests/makefile.win index 4b3f7d3e5f1..c778d792e52 100644 --- a/mozilla/intl/uconv/tests/makefile.win +++ b/mozilla/intl/uconv/tests/makefile.win @@ -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) diff --git a/mozilla/intl/uconv/ucvcn/makefile.win b/mozilla/intl/uconv/ucvcn/makefile.win index c0792eff5a7..0dd9524bb0d 100644 --- a/mozilla/intl/uconv/ucvcn/makefile.win +++ b/mozilla/intl/uconv/ucvcn/makefile.win @@ -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) diff --git a/mozilla/intl/uconv/ucvibm/makefile.win b/mozilla/intl/uconv/ucvibm/makefile.win index 9276208d1f9..b44661ea52b 100644 --- a/mozilla/intl/uconv/ucvibm/makefile.win +++ b/mozilla/intl/uconv/ucvibm/makefile.win @@ -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) diff --git a/mozilla/intl/uconv/ucvja/makefile.win b/mozilla/intl/uconv/ucvja/makefile.win index 8459569eb95..f203a1f7b1f 100644 --- a/mozilla/intl/uconv/ucvja/makefile.win +++ b/mozilla/intl/uconv/ucvja/makefile.win @@ -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) diff --git a/mozilla/intl/uconv/ucvko/makefile.win b/mozilla/intl/uconv/ucvko/makefile.win index cf8ed22af35..fe0f9e5fc4d 100644 --- a/mozilla/intl/uconv/ucvko/makefile.win +++ b/mozilla/intl/uconv/ucvko/makefile.win @@ -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) diff --git a/mozilla/intl/uconv/ucvlatin/makefile.win b/mozilla/intl/uconv/ucvlatin/makefile.win index 7cd6d1f196a..b96220ce1b3 100644 --- a/mozilla/intl/uconv/ucvlatin/makefile.win +++ b/mozilla/intl/uconv/ucvlatin/makefile.win @@ -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) diff --git a/mozilla/intl/uconv/ucvmath/makefile.win b/mozilla/intl/uconv/ucvmath/makefile.win index 9fc0226c123..19c29b0e07f 100644 --- a/mozilla/intl/uconv/ucvmath/makefile.win +++ b/mozilla/intl/uconv/ucvmath/makefile.win @@ -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) diff --git a/mozilla/intl/uconv/ucvtw/makefile.win b/mozilla/intl/uconv/ucvtw/makefile.win index ea5b09137bd..d8034172062 100644 --- a/mozilla/intl/uconv/ucvtw/makefile.win +++ b/mozilla/intl/uconv/ucvtw/makefile.win @@ -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) diff --git a/mozilla/intl/uconv/ucvtw2/makefile.win b/mozilla/intl/uconv/ucvtw2/makefile.win index 0a717e41b34..a751e1cadc4 100644 --- a/mozilla/intl/uconv/ucvtw2/makefile.win +++ b/mozilla/intl/uconv/ucvtw2/makefile.win @@ -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) diff --git a/mozilla/intl/unicharutil/src/makefile.win b/mozilla/intl/unicharutil/src/makefile.win index 1b185ab4245..0ca55078046 100644 --- a/mozilla/intl/unicharutil/src/makefile.win +++ b/mozilla/intl/unicharutil/src/makefile.win @@ -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) diff --git a/mozilla/intl/unicharutil/tests/makefile.win b/mozilla/intl/unicharutil/tests/makefile.win index fffbf7ca38e..2c3c89139e9 100644 --- a/mozilla/intl/unicharutil/tests/makefile.win +++ b/mozilla/intl/unicharutil/tests/makefile.win @@ -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) diff --git a/mozilla/js/src/xpconnect/shell/makefile.win b/mozilla/js/src/xpconnect/shell/makefile.win index cd19dabd3ce..3bbe5a5be99 100644 --- a/mozilla/js/src/xpconnect/shell/makefile.win +++ b/mozilla/js/src/xpconnect/shell/makefile.win @@ -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) \ diff --git a/mozilla/layout/base/src/makefile.win b/mozilla/layout/base/src/makefile.win index 8c8c3208dbb..47d96ccfe9c 100644 --- a/mozilla/layout/base/src/makefile.win +++ b/mozilla/layout/base/src/makefile.win @@ -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> diff --git a/mozilla/layout/base/tests/makefile.win b/mozilla/layout/base/tests/makefile.win index c5031dfc667..68ae02c4e0f 100644 --- a/mozilla/layout/base/tests/makefile.win +++ b/mozilla/layout/base/tests/makefile.win @@ -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 \ diff --git a/mozilla/layout/build/makefile.win b/mozilla/layout/build/makefile.win index f64d664fb40..a0e93080a9c 100644 --- a/mozilla/layout/build/makefile.win +++ b/mozilla/layout/build/makefile.win @@ -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 diff --git a/mozilla/layout/html/base/src/makefile.win b/mozilla/layout/html/base/src/makefile.win index c4e4714bf03..7c2a5301f5e 100644 --- a/mozilla/layout/html/base/src/makefile.win +++ b/mozilla/layout/html/base/src/makefile.win @@ -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 diff --git a/mozilla/layout/html/document/src/makefile.win b/mozilla/layout/html/document/src/makefile.win index a5b9f2c8fe3..c302062c5c9 100644 --- a/mozilla/layout/html/document/src/makefile.win +++ b/mozilla/layout/html/document/src/makefile.win @@ -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) diff --git a/mozilla/layout/html/forms/public/makefile.win b/mozilla/layout/html/forms/public/makefile.win index 54c022ae771..f16e64e42be 100644 --- a/mozilla/layout/html/forms/public/makefile.win +++ b/mozilla/layout/html/forms/public/makefile.win @@ -32,7 +32,7 @@ EXPORTS=nsIFormManager.h \ nsISelectControlFrame.h \ nsIGfxTextControlFrame.h -MODULE=raptor +MODULE=layout include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/layout/html/forms/src/makefile.win b/mozilla/layout/html/forms/src/makefile.win index 69fa61060f1..7a5883c4d0d 100644 --- a/mozilla/layout/html/forms/src/makefile.win +++ b/mozilla/layout/html/forms/src/makefile.win @@ -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 \ diff --git a/mozilla/layout/html/style/src/makefile.win b/mozilla/layout/html/style/src/makefile.win index 92449138954..a222bfaeba8 100644 --- a/mozilla/layout/html/style/src/makefile.win +++ b/mozilla/layout/html/style/src/makefile.win @@ -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 diff --git a/mozilla/layout/html/table/public/makefile.win b/mozilla/layout/html/table/public/makefile.win index ccd9610aa2d..b1f9663e444 100644 --- a/mozilla/layout/html/table/public/makefile.win +++ b/mozilla/layout/html/table/public/makefile.win @@ -23,7 +23,7 @@ DEPTH=..\..\..\.. -MODULE=raptor +MODULE=layout EXPORTS = \ nsITableCellLayout.h \ diff --git a/mozilla/layout/html/table/src/makefile.win b/mozilla/layout/html/table/src/makefile.win index 0d04112c4b6..505ec1e0e44 100644 --- a/mozilla/layout/html/table/src/makefile.win +++ b/mozilla/layout/html/table/src/makefile.win @@ -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) \ diff --git a/mozilla/layout/html/tests/makefile.win b/mozilla/layout/html/tests/makefile.win index 514520c70f3..b6daa07c236 100644 --- a/mozilla/layout/html/tests/makefile.win +++ b/mozilla/layout/html/tests/makefile.win @@ -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 \ diff --git a/mozilla/layout/mathml/base/src/makefile.win b/mozilla/layout/mathml/base/src/makefile.win index 8e4dd541d7c..7b318570a23 100644 --- a/mozilla/layout/mathml/base/src/makefile.win +++ b/mozilla/layout/mathml/base/src/makefile.win @@ -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) \ diff --git a/mozilla/layout/mathml/content/src/makefile.win b/mozilla/layout/mathml/content/src/makefile.win index 65a51192e6c..5b6956e6db2 100644 --- a/mozilla/layout/mathml/content/src/makefile.win +++ b/mozilla/layout/mathml/content/src/makefile.win @@ -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) \ diff --git a/mozilla/layout/svg/base/public/makefile.win b/mozilla/layout/svg/base/public/makefile.win index 225abd2e498..b72e6b4db44 100644 --- a/mozilla/layout/svg/base/public/makefile.win +++ b/mozilla/layout/svg/base/public/makefile.win @@ -25,6 +25,6 @@ EXPORTS = \ nsISVGFrame.h \ $(NULL) -MODULE=raptor +MODULE=layout include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/layout/svg/base/src/makefile.win b/mozilla/layout/svg/base/src/makefile.win index 4b82732ce25..e809ffe1e63 100644 --- a/mozilla/layout/svg/base/src/makefile.win +++ b/mozilla/layout/svg/base/src/makefile.win @@ -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 diff --git a/mozilla/layout/svg/content/src/makefile.win b/mozilla/layout/svg/content/src/makefile.win index 85391700131..687d3077a5c 100644 --- a/mozilla/layout/svg/content/src/makefile.win +++ b/mozilla/layout/svg/content/src/makefile.win @@ -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) \ diff --git a/mozilla/layout/xul/base/src/makefile.win b/mozilla/layout/xul/base/src/makefile.win index 9c94e0a8c88..5609c0d4c38 100644 --- a/mozilla/layout/xul/base/src/makefile.win +++ b/mozilla/layout/xul/base/src/makefile.win @@ -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 diff --git a/mozilla/layout/xul/base/src/outliner/src/makefile.win b/mozilla/layout/xul/base/src/outliner/src/makefile.win index 4fb05e7bfe1..0503a8c79f9 100644 --- a/mozilla/layout/xul/base/src/outliner/src/makefile.win +++ b/mozilla/layout/xul/base/src/outliner/src/makefile.win @@ -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 diff --git a/mozilla/mailnews/base/search/tests/makefile.win b/mozilla/mailnews/base/search/tests/makefile.win index 2c42379d6d9..11fc8ce5fef 100644 --- a/mozilla/mailnews/base/search/tests/makefile.win +++ b/mozilla/mailnews/base/search/tests/makefile.win @@ -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) \ diff --git a/mozilla/mailnews/base/src/makefile.win b/mozilla/mailnews/base/src/makefile.win index 3e4c8a8e82b..52234652321 100644 --- a/mozilla/mailnews/base/src/makefile.win +++ b/mozilla/mailnews/base/src/makefile.win @@ -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> diff --git a/mozilla/modules/libimg/gifcom/makefile.win b/mozilla/modules/libimg/gifcom/makefile.win index c09c6fbcf8d..2368b1b8691 100644 --- a/mozilla/modules/libimg/gifcom/makefile.win +++ b/mozilla/modules/libimg/gifcom/makefile.win @@ -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 diff --git a/mozilla/modules/libimg/mng/makefile.win b/mozilla/modules/libimg/mng/makefile.win index ecbbc39dbf9..5c51f622c0c 100644 --- a/mozilla/modules/libimg/mng/makefile.win +++ b/mozilla/modules/libimg/mng/makefile.win @@ -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> diff --git a/mozilla/modules/libimg/png/makefile.win b/mozilla/modules/libimg/png/makefile.win index 0800c08934e..c337c24d0a0 100644 --- a/mozilla/modules/libimg/png/makefile.win +++ b/mozilla/modules/libimg/png/makefile.win @@ -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> diff --git a/mozilla/modules/libjar/makefile.win b/mozilla/modules/libjar/makefile.win index fa68cdef598..79ad7fb0e8a 100644 --- a/mozilla/modules/libjar/makefile.win +++ b/mozilla/modules/libjar/makefile.win @@ -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) \ diff --git a/mozilla/modules/libjar/standalone/makefile.win b/mozilla/modules/libjar/standalone/makefile.win index d8e209ee080..bb3ab0e2b27 100644 --- a/mozilla/modules/libjar/standalone/makefile.win +++ b/mozilla/modules/libjar/standalone/makefile.win @@ -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= \ diff --git a/mozilla/modules/libjar/test/makefile.win b/mozilla/modules/libjar/test/makefile.win index 74b40f095ba..d7416c9743b 100644 --- a/mozilla/modules/libjar/test/makefile.win +++ b/mozilla/modules/libjar/test/makefile.win @@ -31,9 +31,6 @@ PROGRAMS = $(PROG1) \ LCFLAGS= -LINCS= \ - -I$(PUBLIC)\xpcom - LLIBS= \ $(DIST)\lib\xpcom.lib \ $(LIBNSPR) diff --git a/mozilla/modules/libpref/src/makefile.win b/mozilla/modules/libpref/src/makefile.win index e7013f91c81..816874cbf0a 100644 --- a/mozilla/modules/libpref/src/makefile.win +++ b/mozilla/modules/libpref/src/makefile.win @@ -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 diff --git a/mozilla/modules/oji/src/makefile.win b/mozilla/modules/oji/src/makefile.win index dc3300549c4..1f9277094a9 100644 --- a/mozilla/modules/oji/src/makefile.win +++ b/mozilla/modules/oji/src/makefile.win @@ -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 diff --git a/mozilla/modules/plugin/base/src/makefile.win b/mozilla/modules/plugin/base/src/makefile.win index 85dbb646a3a..99bac51ca5a 100644 --- a/mozilla/modules/plugin/base/src/makefile.win +++ b/mozilla/modules/plugin/base/src/makefile.win @@ -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 \ diff --git a/mozilla/netwerk/base/tests/makefile.win b/mozilla/netwerk/base/tests/makefile.win index 61d235d7f1d..249c9e77f9b 100644 --- a/mozilla/netwerk/base/tests/makefile.win +++ b/mozilla/netwerk/base/tests/makefile.win @@ -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 diff --git a/mozilla/netwerk/socket/base/makefile.win b/mozilla/netwerk/socket/base/makefile.win index aa97d46300e..3ecc8e085de 100644 --- a/mozilla/netwerk/socket/base/makefile.win +++ b/mozilla/netwerk/socket/base/makefile.win @@ -26,10 +26,6 @@ DEPTH=..\..\.. include <$(DEPTH)/config/config.mak> -LINCS = \ - -I$(PUBLIC) \ - $(NULL) - LLIBS = \ $(LIBNSPR) \ $(MOZ_DIST)\lib\xpcom.lib \ diff --git a/mozilla/parser/htmlparser/robot/makefile.win b/mozilla/parser/htmlparser/robot/makefile.win index 4b3206e07dd..8d40dc8f6d4 100644 --- a/mozilla/parser/htmlparser/robot/makefile.win +++ b/mozilla/parser/htmlparser/robot/makefile.win @@ -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> diff --git a/mozilla/parser/htmlparser/robot/test/makefile.win b/mozilla/parser/htmlparser/robot/test/makefile.win index ef021528f2f..caa2f346caa 100644 --- a/mozilla/parser/htmlparser/robot/test/makefile.win +++ b/mozilla/parser/htmlparser/robot/test/makefile.win @@ -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> diff --git a/mozilla/parser/htmlparser/src/makefile.win b/mozilla/parser/htmlparser/src/makefile.win index f248a88ef90..cacc2016e7a 100644 --- a/mozilla/parser/htmlparser/src/makefile.win +++ b/mozilla/parser/htmlparser/src/makefile.win @@ -81,10 +81,6 @@ CPP_OBJS = \ !endif $(NULL) -LINCS= -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\raptor \ - -I$(PUBLIC)\uconv \ - -I$(PUBLIC)\expat LCFLAGS = \ $(LCFLAGS) \ diff --git a/mozilla/parser/htmlparser/tests/grabpage/makefile.win b/mozilla/parser/htmlparser/tests/grabpage/makefile.win index f672aa23b46..6690b01a559 100644 --- a/mozilla/parser/htmlparser/tests/grabpage/makefile.win +++ b/mozilla/parser/htmlparser/tests/grabpage/makefile.win @@ -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 \ diff --git a/mozilla/parser/htmlparser/tests/logparse/makefile.win b/mozilla/parser/htmlparser/tests/logparse/makefile.win index 35c79551e38..0ef72adbe44 100644 --- a/mozilla/parser/htmlparser/tests/logparse/makefile.win +++ b/mozilla/parser/htmlparser/tests/logparse/makefile.win @@ -29,10 +29,6 @@ OBJS = \ .\$(OBJDIR)\TestParser.obj \ $(NULL) -LINCS= \ - -I$(PUBLIC)\raptor \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\netlib LLIBS= \ $(DIST)\lib\gkparser.lib \ diff --git a/mozilla/parser/htmlparser/tests/outsinks/makefile.win b/mozilla/parser/htmlparser/tests/outsinks/makefile.win index 8f65f1a77bf..0131a88e45c 100644 --- a/mozilla/parser/htmlparser/tests/outsinks/makefile.win +++ b/mozilla/parser/htmlparser/tests/outsinks/makefile.win @@ -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) \ diff --git a/mozilla/profile/Acct/makefile.win b/mozilla/profile/Acct/makefile.win index 89faf43cb62..38c36f328c8 100644 --- a/mozilla/profile/Acct/makefile.win +++ b/mozilla/profile/Acct/makefile.win @@ -44,19 +44,6 @@ MAPFILE = $(DLLNAME).map DLL =.\$(OBJDIR)\$(DLLNAME).dll MAKE_OBJ_TYPE = DLL -LINCS = -I$(PUBLIC)/js \ - -I$(PUBLIC)/profile \ - -I$(PUBLIC)/pref \ - -I$(PUBLIC)/prefm \ - -I$(PUBLIC)/java \ - -I$(PUBLIC)/ldap \ - -I$(PUBLIC)/dbm \ - -I$(PUBLIC)/security \ - -I$(PUBLIC)/raptor \ - -I$(PUBLIC)/xpcom \ - -I$(DEPTH)\include \ - -I$(PUBLIC)/libreg \ - LCFLAGS = -DMOZILLA_CLIENT # I'm hardcoding the directory name here to fix MOZ_LITE diff --git a/mozilla/profile/Acctidl/makefile.win b/mozilla/profile/Acctidl/makefile.win index 08ef5710b18..0a3bcfa26f7 100644 --- a/mozilla/profile/Acctidl/makefile.win +++ b/mozilla/profile/Acctidl/makefile.win @@ -39,12 +39,6 @@ LLIBS=\ $(LIBPLC) \ $(NULL) -LINCS=\ - -I$(PUBLIC)\profile \ - -I$(PUBLIC)\raptor \ - -I$(PUBLIC)\xpcom \ - $(NULL) - include <$(DEPTH)\config\rules.mak> install:: $(DLL) diff --git a/mozilla/profile/src/makefile.win b/mozilla/profile/src/makefile.win index c33e4c38220..204991611e4 100644 --- a/mozilla/profile/src/makefile.win +++ b/mozilla/profile/src/makefile.win @@ -31,7 +31,7 @@ #//------------------------------------------------------------------------ DEPTH = ..\.. MODULE = profile -REQUIRES = xpcom string raptor uriloader pref necko nsprefm prefmigr dom windowwatcher bookmarks cookie chrome intl docshell webBrowser_core widget rdf uconv +REQUIRES = xpcom string appshell uriloader pref necko nsprefm prefmigr dom windowwatcher bookmarks cookie chrome intl docshell webBrowser_core widget rdf uconv include <$(DEPTH)\config\config.mak> #//------------------------------------------------------------------------ #// diff --git a/mozilla/rdf/base/src/makefile.win b/mozilla/rdf/base/src/makefile.win index a7d820316b8..774d79a6c69 100644 --- a/mozilla/rdf/base/src/makefile.win +++ b/mozilla/rdf/base/src/makefile.win @@ -25,7 +25,7 @@ LCFLAGS= MODULE=rdf LIBRARY_NAME=rdfbase_s -REQUIRES=xpcom string rdfutil htmlparser raptor necko js layout +REQUIRES=xpcom string rdfutil htmlparser content necko js layout CPP_OBJS=\ .\$(OBJDIR)\nsCompositeDataSource.obj \ .\$(OBJDIR)\nsContainerEnumerator.obj \ diff --git a/mozilla/rdf/build/makefile.win b/mozilla/rdf/build/makefile.win index d5f8c19c187..925f22f1d5e 100644 --- a/mozilla/rdf/build/makefile.win +++ b/mozilla/rdf/build/makefile.win @@ -23,7 +23,7 @@ DEPTH=..\.. MODULE=rdf LIBRARY_NAME=rdf MODULE_NAME=nsRDFModule -REQUIRES = xpcom string layout htmlparser necko raptor +REQUIRES = xpcom string layout htmlparser necko content include <$(DEPTH)/config/config.mak> EXPORTS=\ diff --git a/mozilla/rdf/chrome/src/makefile.win b/mozilla/rdf/chrome/src/makefile.win index 38f38d54ef3..6b0ce2b35d4 100644 --- a/mozilla/rdf/chrome/src/makefile.win +++ b/mozilla/rdf/chrome/src/makefile.win @@ -22,7 +22,7 @@ DEPTH=..\..\.. MODULE=chrome LIBRARY_NAME=chrome_s -REQUIRES=xpcom string necko rdf raptor layout content intl dom widget xuldoc gfx docshell pref imglib2 caps xpconnect js +REQUIRES=xpcom string necko rdf appshell layout content intl dom widget content_xul gfx docshell pref imglib2 caps xpconnect js CPP_OBJS=\ .\$(OBJDIR)\nsChromeRegistry.obj \ .\$(OBJDIR)\nsChromeProtocolHandler.obj \ diff --git a/mozilla/rdf/chrome/tools/chromereg/makefile.win b/mozilla/rdf/chrome/tools/chromereg/makefile.win index 86e73cd979f..678c535ac6b 100644 --- a/mozilla/rdf/chrome/tools/chromereg/makefile.win +++ b/mozilla/rdf/chrome/tools/chromereg/makefile.win @@ -14,16 +14,13 @@ DEPTH=..\..\..\.. +REQUIRES=xpcom chrome necko CPPSRCS = regchrome.cpp MAKE_OBJ_TYPE = EXE PROG = .\$(OBJDIR)\regchrome.exe PROGRAMS = $(PROG) -LINCS= \ - -Iservices \ - -I$(PUBLIC)\xpcom - LLIBS= \ $(DIST)\lib\xpcom.lib \ $(LIBNSPR) diff --git a/mozilla/rdf/tests/localfile/makefile.win b/mozilla/rdf/tests/localfile/makefile.win index 11afbda78b2..ef79a3829b9 100644 --- a/mozilla/rdf/tests/localfile/makefile.win +++ b/mozilla/rdf/tests/localfile/makefile.win @@ -33,14 +33,6 @@ PROGRAM= .\$(OBJDIR)\$(EXENAME).exe OBJS= .\$(OBJDIR)\localfile.obj -LINCS= -I$(PUBLIC)\rdf \ - -I$(LIBNSPR) \ - -I$(PUBLIC)\dom \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\netlib \ - -I$(PUBLIC)\raptor \ - $(NULL) - LLIBS= \ $(DIST)\lib\rdf.lib \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/rdf/tests/rdfsink/makefile.win b/mozilla/rdf/tests/rdfsink/makefile.win index d37d2995152..5730e040c42 100644 --- a/mozilla/rdf/tests/rdfsink/makefile.win +++ b/mozilla/rdf/tests/rdfsink/makefile.win @@ -33,14 +33,6 @@ PROGRAM= .\$(OBJDIR)\$(EXENAME).exe OBJS= .\$(OBJDIR)\rdfsink.obj -LINCS= -I$(PUBLIC)\rdf \ - -I$(PUBLIC)\dom \ - -I$(LIBNSPR) \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\netlib \ - -I$(PUBLIC)\raptor \ - $(NULL) - LLIBS= \ $(DIST)\lib\rdf.lib \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/view/src/makefile.win b/mozilla/view/src/makefile.win index 6cf6eaf6c48..440ad5af3d1 100644 --- a/mozilla/view/src/makefile.win +++ b/mozilla/view/src/makefile.win @@ -24,7 +24,7 @@ DEPTH=..\.. MODULE = view LIBRARY_NAME = gkview MODULE_NAME = nsViewModule -REQUIRES = xpcom string layout gfx widget dom locale timer pref +REQUIRES = xpcom string layout gfx widget dom locale timer pref content DEFINES =-D_IMPL_NS_VIEW -DWIN32_LEAN_AND_MEAN @@ -37,11 +37,6 @@ OBJS = \ .\$(OBJDIR)\nsViewFactory.obj \ $(NULL) -LINCS= \ - -I$(PUBLIC)\raptor \ - -I$(PUBLIC)\xpcom \ - $(NULL) - LCFLAGS = \ $(LCFLAGS) \ diff --git a/mozilla/webshell/embed/ngprefs/win/makefile.win b/mozilla/webshell/embed/ngprefs/win/makefile.win index 29ab43cd507..282f15e24a3 100644 --- a/mozilla/webshell/embed/ngprefs/win/makefile.win +++ b/mozilla/webshell/embed/ngprefs/win/makefile.win @@ -25,14 +25,6 @@ MAKE_OBJ_TYPE = DLL DEPTH=..\..\..\.. -LINCS = \ - -I$(PUBLIC) \ - -I$(DEPTH)\cmd\winfe \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\pref \ - -I$(PUBLIC)\js \ - $(NULL) - LLIBS = \ $(LIBNSPR) \ $(DIST)\lib\xppref32.lib \ diff --git a/mozilla/webshell/public/makefile.win b/mozilla/webshell/public/makefile.win index 149689094f9..edcb7ed2a1a 100644 --- a/mozilla/webshell/public/makefile.win +++ b/mozilla/webshell/public/makefile.win @@ -21,7 +21,7 @@ DEPTH=..\.. -MODULE=raptor +MODULE=webshell XPIDL_MODULE=webshell_idls include <$(DEPTH)\config\config.mak> diff --git a/mozilla/webshell/src/makefile.win b/mozilla/webshell/src/makefile.win index 36809f22b78..711be2a2e39 100644 --- a/mozilla/webshell/src/makefile.win +++ b/mozilla/webshell/src/makefile.win @@ -40,23 +40,7 @@ CPP_OBJS= \ .\$(OBJDIR)\nsWebShell.obj \ $(NULL) -LINCS=-I..\public -I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \ - -I$(PUBLIC)\dom -I$(PUBLIC)\js \ - -I$(PUBLIC)\necko \ - -I$(PUBLIC)\plugin -I$(PUBLIC)\java -I$(PUBLIC)\pref -I$(PUBLIC)\profile \ - -I$(PUBLIC)\js -I$(DEPTH)\include -I$(PUBLIC)\jsurl \ - -I$(PUBLIC)\editor -I$(PUBLIC)\rdf \ - -I$(PUBLIC)\xpfe\components \ - -I$(PUBLIC)\walletlib \ - -I$(PUBLIC)\oji \ - -I$(PUBLIC)\uconv \ - -I$(PUBLIC)\strres \ - -I$(PUBLIC)\locale \ - -I$(PUBLIC)\lwbrk \ - -I$(PUBLIC)\unicharutil \ - -I$(PUBLIC)\intl \ - -I$(PUBLIC)\caps \ - -I..\..\docshell\base +LINCS=-I..\public -I..\..\docshell\base !ifdef MOZ_STATIC_COMPONENT_LIBS MAKE_OBJ_TYPE = LIB diff --git a/mozilla/webshell/tests/ComFactory/makefile.win b/mozilla/webshell/tests/ComFactory/makefile.win index b99226d4ea4..f4b30af5ca0 100644 --- a/mozilla/webshell/tests/ComFactory/makefile.win +++ b/mozilla/webshell/tests/ComFactory/makefile.win @@ -20,7 +20,7 @@ IGNORE_MANIFEST = 1 DEPTH= ..\..\.. -REQUIRES=xpcom raptor +REQUIRES=xpcom raptor webshell MAKE_OBJ_TYPE=EXE diff --git a/mozilla/webshell/tests/imgtest/makefile.win b/mozilla/webshell/tests/imgtest/makefile.win index 2a8c5468902..ec0c0192862 100644 --- a/mozilla/webshell/tests/imgtest/makefile.win +++ b/mozilla/webshell/tests/imgtest/makefile.win @@ -25,7 +25,7 @@ PROGRAM = .\$(OBJDIR)\ImageTest.exe RESFILE = image.res MAPFILE = image.map -LINCS=-I$(XPDIST)\public\raptor -I$(XPDIST)\public\xpcom -I..\..\src +LINCS=-I..\..\src LLFLAGS = $(LLFLAGS) /SUBSYSTEM:CONSOLE diff --git a/mozilla/webshell/tests/viewer/makefile.win b/mozilla/webshell/tests/viewer/makefile.win index 6d40be03f57..3946ea54ac5 100644 --- a/mozilla/webshell/tests/viewer/makefile.win +++ b/mozilla/webshell/tests/viewer/makefile.win @@ -20,7 +20,8 @@ # Contributor(s): DEPTH=..\..\.. -REQUIRES = xpcom string webshell widget layout dom webBrowser_core docshell util uriloader locale necko htmlparser view timer pref intl editor cookie xpconnect gfx content +MODULE=viewer +REQUIRES = xpcom string webshell widget layout dom webBrowser_core docshell util uriloader locale necko htmlparser view timer pref intl editor cookie xpconnect gfx content wallet js include <$(DEPTH)/config/config.mak> @@ -58,36 +59,6 @@ OBJS = \ .\$(OBJDIR)\nsWidgetSupport.obj \ $(NULL) -LINCS= \ - -I$(PUBLIC)\raptor \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\dom \ - -I$(PUBLIC)\js \ -!ifdef NECKO - -I$(PUBLIC)\necko \ -!else - -I$(PUBLIC)\netlib \ -!endif - -I$(PUBLIC)\java \ - -I$(PUBLIC)\plugin \ - -I$(PUBLIC)\pref \ - -I$(PUBLIC)\editor \ - -I$(PUBLIC)\uconv \ - -I$(PUBLIC)\strres \ - -I$(PUBLIC)\locale \ - -I$(PUBLIC)\lwbrk \ - -I$(PUBLIC)\unicharutil \ - -I$(PUBLIC)\intl \ - -I$(PUBLIC)\rdf \ - -I$(PUBLIC)\wallet \ - -I$(PUBLIC)\profile \ -!if defined(NGPREFS) - -I$(PUBLIC)\ngprefs \ -!endif - -I$(PUBLIC)\oji \ - -I$(PUBLIC)\caps \ - $(NULL) - LLIBS= \ $(DIST)\lib\gkgfx.lib \ $(DIST)\lib\timer_s.lib \ diff --git a/mozilla/webshell/tests/viewer/public/makefile.win b/mozilla/webshell/tests/viewer/public/makefile.win index a55359c3b2e..b9655962f8d 100644 --- a/mozilla/webshell/tests/viewer/public/makefile.win +++ b/mozilla/webshell/tests/viewer/public/makefile.win @@ -23,7 +23,7 @@ DEPTH=..\..\..\.. -MODULE=raptor +MODULE=viewer EXPORTS = \ nsIXPBaseWindow.h \ diff --git a/mozilla/widget/src/build/makefile.win b/mozilla/widget/src/build/makefile.win index 3172f152a45..d87bf626559 100644 --- a/mozilla/widget/src/build/makefile.win +++ b/mozilla/widget/src/build/makefile.win @@ -22,7 +22,7 @@ DEPTH=..\..\.. # -MODULE = gkwidget +MODULE = widget LIBRARY_NAME = gkwidget MODULE_NAME = nsWidgetModule REQUIRES = xpcom string widget necko uconv gfx dom timer diff --git a/mozilla/widget/src/windows/makefile.win b/mozilla/widget/src/windows/makefile.win index 5b2f4d282fb..2b85949747a 100644 --- a/mozilla/widget/src/windows/makefile.win +++ b/mozilla/widget/src/windows/makefile.win @@ -21,7 +21,7 @@ DEPTH=..\..\.. MODULE=widget -REQUIRES=xpcom string dom content accessibility layout gfx xuldoc raptor necko pref plugin timer uconv intl +REQUIRES=xpcom string dom content accessibility layout gfx necko pref plugin timer uconv intl content_xul include <$(DEPTH)\config\config.mak> LIBRARY_NAME = raptorwidget_s diff --git a/mozilla/widget/src/xpwidgets/makefile.win b/mozilla/widget/src/xpwidgets/makefile.win index 8e7472bd2fd..39452e7f209 100644 --- a/mozilla/widget/src/xpwidgets/makefile.win +++ b/mozilla/widget/src/xpwidgets/makefile.win @@ -53,12 +53,7 @@ OBJS= \ $(NULL) LINCS= \ - -I$(PUBLIC)\raptor \ - -I$(PUBLIC)\xpcom \ -I..\windows \ - -I$(PUBLIC)\dom \ - -I$(PUBLIC)\js \ - -I$(PUBLIC)\network -I$(PUBLIC)\netlib \ $(NULL) LCFLAGS = \ diff --git a/mozilla/widget/timer/src/windows/makefile.win b/mozilla/widget/timer/src/windows/makefile.win index 69343d6a31d..c3dfc7453df 100644 --- a/mozilla/widget/timer/src/windows/makefile.win +++ b/mozilla/widget/timer/src/windows/makefile.win @@ -43,7 +43,6 @@ CPP_OBJS= \ LINCS= \ -I..\ - -I$(PUBLIC)\xpcom \ $(NULL) LCFLAGS = \ diff --git a/mozilla/xpcom/appshell/eventloop/windows/makefile.win b/mozilla/xpcom/appshell/eventloop/windows/makefile.win index 62b14b58068..15e5d64d486 100644 --- a/mozilla/xpcom/appshell/eventloop/windows/makefile.win +++ b/mozilla/xpcom/appshell/eventloop/windows/makefile.win @@ -49,7 +49,7 @@ CPP_OBJS= \ LLIBS= \ $(DIST)\lib\xpcom.lib \ $(LIBNSPR) - + LINCS= \ -I..\xp \ $(NULL) diff --git a/mozilla/xpcom/base/makefile.win b/mozilla/xpcom/base/makefile.win index eb6bd9e52f2..d0f56865319 100644 --- a/mozilla/xpcom/base/makefile.win +++ b/mozilla/xpcom/base/makefile.win @@ -82,11 +82,6 @@ XPIDLSRCS = \ LIBRARY_NAME=xpcombase_s -LINCS = \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\xpcom\components \ - $(NULL) - LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN diff --git a/mozilla/xpcom/build/makefile.win b/mozilla/xpcom/build/makefile.win index 4868f5d1abf..5e35340ab3b 100644 --- a/mozilla/xpcom/build/makefile.win +++ b/mozilla/xpcom/build/makefile.win @@ -37,7 +37,6 @@ DEFFILE = xpcom_alpha.def !endif LINCS = \ - -I$(PUBLIC)\xpcom \ -I..\base \ -I..\ds \ -I..\io \ diff --git a/mozilla/xpcom/components/makefile.win b/mozilla/xpcom/components/makefile.win index 9628390425d..f34511cc34e 100644 --- a/mozilla/xpcom/components/makefile.win +++ b/mozilla/xpcom/components/makefile.win @@ -57,8 +57,6 @@ XPIDLSRCS = \ LIBRARY_NAME=xpcomcomp_s LINCS = \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\libreg \ -I..\base \ -I..\threads \ -I..\io \ diff --git a/mozilla/xpcom/ds/makefile.win b/mozilla/xpcom/ds/makefile.win index 7ffb1c562ee..ffcb8ca9044 100644 --- a/mozilla/xpcom/ds/makefile.win +++ b/mozilla/xpcom/ds/makefile.win @@ -83,12 +83,6 @@ XPIDLSRCS = \ LIBRARY_NAME=xpcomds_s -LINCS = \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\uconv \ - -I$(PUBLIC)\unicharutil \ - $(NULL) - LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN CPP_OBJS = \ diff --git a/mozilla/xpcom/io/makefile.win b/mozilla/xpcom/io/makefile.win index ae7fa580e22..fbe4ab1e050 100644 --- a/mozilla/xpcom/io/makefile.win +++ b/mozilla/xpcom/io/makefile.win @@ -21,7 +21,7 @@ DEPTH=..\.. MODULE = xpcom -REQUIRES = uconv string necko +REQUIRES = uconv string necko chrome ################################################################################ ## exports @@ -77,14 +77,6 @@ XPIDLSRCS = \ LIBRARY_NAME=xpcomio_s -LINCS = \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\uconv \ - -I$(PUBLIC)\unicharutil \ - $(NULL) - -LINCS = $(LINCS) -I$(PUBLIC)\raptor # until we sort out the filespec/widgets dependency - LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN CPP_OBJS = \ diff --git a/mozilla/xpcom/proxy/src/makefile.win b/mozilla/xpcom/proxy/src/makefile.win index cd20ee8fddb..4c5de7a5f35 100644 --- a/mozilla/xpcom/proxy/src/makefile.win +++ b/mozilla/xpcom/proxy/src/makefile.win @@ -23,11 +23,9 @@ DEPTH=..\..\.. LIBRARY_NAME=xpcomproxy_s +MODULE=xpcom REQUIRES = string -LINCS = \ - -I$(PUBLIC)\xpcom \ - $(NULL) LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN -DEXPORT_XPTC_API diff --git a/mozilla/xpcom/proxy/tests/makefile.win b/mozilla/xpcom/proxy/tests/makefile.win index 9471f1c247b..d43bd9c82d4 100644 --- a/mozilla/xpcom/proxy/tests/makefile.win +++ b/mozilla/xpcom/proxy/tests/makefile.win @@ -36,10 +36,6 @@ LLIBS = \ $(LIBNSPR) \ $(NULL) -LINCS = \ - -I$(PUBLIC)\xpcom \ - $(NULL) - include <$(DEPTH)\config\rules.mak> install:: $(PROGRAM) diff --git a/mozilla/xpcom/reflect/xptcall/src/makefile.win b/mozilla/xpcom/reflect/xptcall/src/makefile.win index 93743ddc4c8..996e589e189 100644 --- a/mozilla/xpcom/reflect/xptcall/src/makefile.win +++ b/mozilla/xpcom/reflect/xptcall/src/makefile.win @@ -34,10 +34,6 @@ OBJS= \ .\$(OBJDIR)\xptcall.obj \ $(NULL) -EXPORTS = \ - $(NULL) - -LINCS=-I$(PUBLIC)\xpcom LCFLAGS = \ $(LCFLAGS) \ diff --git a/mozilla/xpcom/reflect/xptcall/src/md/win32/makefile.win b/mozilla/xpcom/reflect/xptcall/src/md/win32/makefile.win index 1ad0f2cfad5..ffa701f9d27 100644 --- a/mozilla/xpcom/reflect/xptcall/src/md/win32/makefile.win +++ b/mozilla/xpcom/reflect/xptcall/src/md/win32/makefile.win @@ -26,7 +26,7 @@ include <$(DEPTH)\config\config.mak> DEFINES=-DWIN32_LEAN_AND_MEAN -DEXPORT_XPTC_API -LINCS=-I..\.. -I$(PUBLIC)\xpcom +LINCS=-I..\.. LCFLAGS = \ $(LCFLAGS) \ diff --git a/mozilla/xpcom/reflect/xptcall/tests/makefile.win b/mozilla/xpcom/reflect/xptcall/tests/makefile.win index 57da87eb95b..ae443ddfaa8 100644 --- a/mozilla/xpcom/reflect/xptcall/tests/makefile.win +++ b/mozilla/xpcom/reflect/xptcall/tests/makefile.win @@ -21,7 +21,7 @@ DEPTH=..\..\..\.. - +REQUIRES=xpcom MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestXPTCInvoke.exe @@ -29,8 +29,6 @@ PROGRAMS = $(PROG1) LCFLAGS=-DUSE_NSREG -DWIN32_LEAN_AND_MEAN -LINCS=-I$(PUBLIC)\xpcom - LLIBS= \ $(DIST)\lib\xpcom.lib \ $(LIBNSPR) \ diff --git a/mozilla/xpcom/reflect/xptinfo/src/makefile.win b/mozilla/xpcom/reflect/xptinfo/src/makefile.win index 72960f7831c..d8d125c75c5 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/makefile.win +++ b/mozilla/xpcom/reflect/xptinfo/src/makefile.win @@ -40,10 +40,6 @@ CPP_OBJS = \ .\$(OBJDIR)\xptiZipLoader.obj \ $(NULL) -LINCS = \ - -I$(PUBLIC)\xpcom \ - $(NULL) - include <$(DEPTH)\config\rules.mak> install:: $(LIBRARY) diff --git a/mozilla/xpcom/reflect/xptinfo/tests/makefile.win b/mozilla/xpcom/reflect/xptinfo/tests/makefile.win index 4baf2379d85..d421719a554 100644 --- a/mozilla/xpcom/reflect/xptinfo/tests/makefile.win +++ b/mozilla/xpcom/reflect/xptinfo/tests/makefile.win @@ -22,15 +22,13 @@ DEPTH=..\..\..\.. - +REQUIRES=xpcom MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestInterfaceInfo.exe PROGRAMS = $(PROG1) LCFLAGS=-DUSE_NSREG -DEXPORT_XPTI_API -DWIN32_LEAN_AND_MEAN -LINCS=-I$(PUBLIC)\xpcom - LLIBS= \ $(DIST)\lib\xpcom.lib \ $(LIBNSPR) \ diff --git a/mozilla/xpcom/sample/makefile.win b/mozilla/xpcom/sample/makefile.win index c6135188170..f60ad513548 100644 --- a/mozilla/xpcom/sample/makefile.win +++ b/mozilla/xpcom/sample/makefile.win @@ -40,12 +40,6 @@ LLIBS=\ $(LIBPLC) \ $(NULL) -LINCS=\ - -I$(PUBLIC)\sample \ - -I$(PUBLIC)\raptor \ - -I$(PUBLIC)\xpcom \ - $(NULL) - include <$(DEPTH)\config\rules.mak> install:: $(DLL) diff --git a/mozilla/xpcom/tests/StringFactoringTests/makefile.win b/mozilla/xpcom/tests/StringFactoringTests/makefile.win index c8a85059716..89d3b40226f 100644 --- a/mozilla/xpcom/tests/StringFactoringTests/makefile.win +++ b/mozilla/xpcom/tests/StringFactoringTests/makefile.win @@ -34,9 +34,7 @@ LCFLAGS = \ $(DEFINES) \ $(NULL) -LINCS=-I$(PUBLIC)\xpcom \ - -I$(DEPTH)\xpcom\ds \ - -I$(MOZ_TOOLS)\include \ +LINCS= -I$(MOZ_TOOLS)\include \ $(NULL) LLIBS = \ diff --git a/mozilla/xpcom/tests/dynamic/makefile.win b/mozilla/xpcom/tests/dynamic/makefile.win index 64286014687..69a55c38284 100644 --- a/mozilla/xpcom/tests/dynamic/makefile.win +++ b/mozilla/xpcom/tests/dynamic/makefile.win @@ -27,7 +27,7 @@ MAKE_OBJ_TYPE = DLL DLL = $(OBJDIR)\TestDynamic.dll -LINCS = -I.. -I$(PUBLIC)\xpcom +LINCS = -I.. LLIBS= \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/xpcom/tests/makefile.win b/mozilla/xpcom/tests/makefile.win index ed19ab923de..d3dc0fc6b3c 100644 --- a/mozilla/xpcom/tests/makefile.win +++ b/mozilla/xpcom/tests/makefile.win @@ -20,7 +20,7 @@ # Contributor(s): DEPTH=..\.. -REQUIRES=string necko +REQUIRES=xpcom string necko include <$(DEPTH)/config/config.mak> @@ -78,7 +78,7 @@ LCFLAGS=-DUSE_NSREG -GX LINCS= \ -Iservices \ - -I$(PUBLIC)\xpcom + $(NULL) LLIBS= \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/xpcom/tests/services/makefile.win b/mozilla/xpcom/tests/services/makefile.win index a027769660b..165f2394f97 100644 --- a/mozilla/xpcom/tests/services/makefile.win +++ b/mozilla/xpcom/tests/services/makefile.win @@ -20,15 +20,15 @@ # Contributor(s): DEPTH=..\..\.. +MODULE = xpcom include <$(DEPTH)/config/config.mak> - MAKE_OBJ_TYPE = DLL DLL = $(OBJDIR)\MyService.dll -LINCS = -I.. -I$(PUBLIC)\xpcom +LINCS = -I.. LLIBS= \ $(DIST)\lib\xpcom.lib \ @@ -42,7 +42,6 @@ CPP_OBJS = \ .\$(OBJDIR)\MyService.obj \ $(NULL) -MODULE = xpcom include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/tests/windows/makefile.win b/mozilla/xpcom/tests/windows/makefile.win index 3c2020ce984..c0abd7d58dc 100644 --- a/mozilla/xpcom/tests/windows/makefile.win +++ b/mozilla/xpcom/tests/windows/makefile.win @@ -21,7 +21,7 @@ DEPTH=..\..\.. - +REQUIRES=xpcom MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\TestCOM.exe @@ -30,8 +30,6 @@ PROG1 = .\$(OBJDIR)\TestCOM.exe #PROGRAMS = $(PROG1) $(PROG2) $(PROG3) PROGRAMS = $(PROG1) -LINCS=-I$(PUBLIC)\xpcom - LLIBS= \ rpcrt4.lib \ uuid.lib \ diff --git a/mozilla/xpcom/threads/makefile.win b/mozilla/xpcom/threads/makefile.win index 3bcfc1c75d9..e4e7ec5ddab 100644 --- a/mozilla/xpcom/threads/makefile.win +++ b/mozilla/xpcom/threads/makefile.win @@ -51,10 +51,6 @@ XPIDLSRCS = \ LIBRARY_NAME=xpcomthreads_s -LINCS = \ - -I$(PUBLIC)\xpcom \ - $(NULL) - LCFLAGS = -D_IMPL_NS_COM -D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN C_OBJS = \ diff --git a/mozilla/xpcom/tools/registry/makefile.win b/mozilla/xpcom/tools/registry/makefile.win index 943e2d8128c..8a73bfc7056 100644 --- a/mozilla/xpcom/tools/registry/makefile.win +++ b/mozilla/xpcom/tools/registry/makefile.win @@ -21,13 +21,7 @@ DEPTH=..\..\.. -LINCS = \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\libreg \ - $(NULL) - - - +REQUIRES=xpcom string MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\regExport.exe PROG2 = .\$(OBJDIR)\regxpcom.exe diff --git a/mozilla/xpcom/typelib/xpidl/makefile.win b/mozilla/xpcom/typelib/xpidl/makefile.win index 26da89b34a9..d11792c8d27 100644 --- a/mozilla/xpcom/typelib/xpidl/makefile.win +++ b/mozilla/xpcom/typelib/xpidl/makefile.win @@ -23,6 +23,7 @@ DEPTH=..\..\.. MAKE_OBJ_TYPE = EXE PROGRAM = .\$(OBJDIR)\xpidl.exe +REQUIRES = xpcom #RESFILE = xpidl.res # glib and libIDL link against the non-debug msvcrt @@ -38,8 +39,7 @@ OBJS = \ .\$(OBJDIR)\xpidl_java.obj \ $(NULL) -LINCS=-I$(PUBLIC)\xpcom \ - -I$(MOZ_TOOLS)\include \ +LINCS=-I$(MOZ_TOOLS)\include \ $(NULL) LCFLAGS = -DEXPORT_XPT_API diff --git a/mozilla/xpcom/typelib/xpt/src/makefile.win b/mozilla/xpcom/typelib/xpt/src/makefile.win index 88ce683a974..0c933cff041 100644 --- a/mozilla/xpcom/typelib/xpt/src/makefile.win +++ b/mozilla/xpcom/typelib/xpt/src/makefile.win @@ -34,10 +34,6 @@ C_OBJS = \ .\$(OBJDIR)\xpt_xdr.obj \ $(NULL) -LINCS = \ - -I$(PUBLIC)\xpcom \ - $(NULL) - MOZ_NO_COVERAGE=1 include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/typelib/xpt/tests/makefile.win b/mozilla/xpcom/typelib/xpt/tests/makefile.win index ca12f92b304..8d898cdabd4 100644 --- a/mozilla/xpcom/typelib/xpt/tests/makefile.win +++ b/mozilla/xpcom/typelib/xpt/tests/makefile.win @@ -21,7 +21,7 @@ DEPTH=..\..\..\.. - +REQUIRES=xpcom MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\PrimitiveTest.exe @@ -30,8 +30,6 @@ PROGRAMS = $(PROG1) $(PROG2) LCFLAGS=-DWIN32_LEAN_AND_MEAN -DEXPORT_XPT_API -DUSE_NSREG -LINCS=-I$(PUBLIC)\xpcom - LLIBS= \ $(DIST)\lib\xpcomxpt_s.lib \ $(NULL) diff --git a/mozilla/xpcom/typelib/xpt/tools/makefile.win b/mozilla/xpcom/typelib/xpt/tools/makefile.win index 4fad270ff50..a2e62f63b27 100644 --- a/mozilla/xpcom/typelib/xpt/tools/makefile.win +++ b/mozilla/xpcom/typelib/xpt/tools/makefile.win @@ -22,7 +22,7 @@ DEPTH=..\..\..\.. - +REQUIRES=xpcom MAKE_OBJ_TYPE = EXE PROG1 = .\$(OBJDIR)\xpt_dump.exe PROG2 = .\$(OBJDIR)\xpt_link.exe @@ -30,8 +30,6 @@ PROGRAMS = $(PROG1) $(PROG2) LCFLAGS=-DUSE_NSREG -DWIN32_LEAN_AND_MEAN -DEXPORT_XPT_API -LINCS=-I$(PUBLIC)\xpcom - LLIBS= \ $(DIST)\lib\xpcomxpt_s.lib \ $(NULL) diff --git a/mozilla/xpfe/appshell/public/makefile.win b/mozilla/xpfe/appshell/public/makefile.win index 8bb5e0065f1..2f6056d6605 100644 --- a/mozilla/xpfe/appshell/public/makefile.win +++ b/mozilla/xpfe/appshell/public/makefile.win @@ -22,7 +22,7 @@ DEPTH=..\..\.. -MODULE=raptor +MODULE=appshell XPIDL_MODULE=appshell XPIDLSRCS = \ diff --git a/mozilla/xpfe/appshell/src/makefile.win b/mozilla/xpfe/appshell/src/makefile.win index 0becce0d318..2f36f07ba8b 100644 --- a/mozilla/xpfe/appshell/src/makefile.win +++ b/mozilla/xpfe/appshell/src/makefile.win @@ -21,7 +21,7 @@ DEPTH=..\..\.. MODULE=appshell -REQUIRES = xpcom string widget docshell webshell layout layout_xul dom necko uriloader js locale webBrowser_core rdf pref xpconnect timer intl xul windowwatcher browser appcomps caps profile gfx raptor mozbrwsr content +REQUIRES = xpcom string widget docshell webshell layout layout_xul dom necko uriloader js locale webBrowser_core rdf pref xpconnect timer intl xul windowwatcher browser appcomps caps profile gfx content_xul mozbrwsr content include <$(DEPTH)/config/config.mak> LIBRARY_NAME=appshell diff --git a/mozilla/xpfe/components/autocomplete/src/makefile.win b/mozilla/xpfe/components/autocomplete/src/makefile.win index ec59cea83d3..37c48592e31 100644 --- a/mozilla/xpfe/components/autocomplete/src/makefile.win +++ b/mozilla/xpfe/components/autocomplete/src/makefile.win @@ -35,10 +35,6 @@ include <$(DEPTH)/config/config.mak> LIBRARY_NAME=autocomplete_s LCFLAGS = -DWIN32_LEAN_AND_MEAN -LINCS = \ - -I$(PUBLIC)/xpcom \ - $(NULL) - #//------------------------------------------------------------------------ #// #// Define the files necessary to build the target (ie. OBJS) diff --git a/mozilla/xpfe/components/timebomb/makefile.win b/mozilla/xpfe/components/timebomb/makefile.win index 404e6d0d7d5..05ae72804fb 100644 --- a/mozilla/xpfe/components/timebomb/makefile.win +++ b/mozilla/xpfe/components/timebomb/makefile.win @@ -39,10 +39,6 @@ XPIDLSRCS = \ $(NULL) -LINCS = \ - -I$(PUBLIC)/xpcom \ - $(NULL) - OBJS = \ .\$(OBJDIR)\nsTimeBomb.obj \ $(NULL) diff --git a/mozilla/xpfe/components/timebomb/tools/makefile.win b/mozilla/xpfe/components/timebomb/tools/makefile.win index c4764c6ebed..d4ff063aba2 100644 --- a/mozilla/xpfe/components/timebomb/tools/makefile.win +++ b/mozilla/xpfe/components/timebomb/tools/makefile.win @@ -30,13 +30,6 @@ PROGRAMS = \ $(NULL) DEFINES=-DWIN32_LEAN_AND_MEAN -MODULE=raptor - - -LINCS=-I$(PUBLIC)\raptor \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\base \ - $(NULL) LCFLAGS = \ $(LCFLAGS) \ @@ -45,7 +38,6 @@ LCFLAGS = \ # These are the libraries we need to link with to create the exe LLIBS= \ - $(DIST)\lib\xpcom.lib \ $(LIBNSPR) \ $(NULL) diff --git a/mozilla/xpfe/components/ucth/src/makefile.win b/mozilla/xpfe/components/ucth/src/makefile.win index 78268036781..58cbfc1d26a 100644 --- a/mozilla/xpfe/components/ucth/src/makefile.win +++ b/mozilla/xpfe/components/ucth/src/makefile.win @@ -40,14 +40,6 @@ MODULE= mozucth LIBRARY_NAME = mozucth MODULE_NAME = nsUnknownContentTypeHandler -LINCS = \ - -I$(PUBLIC)/xpcom \ - -I$(PUBLIC)/xpfe/components \ - -I$(PUBLIC)/raptor \ - -I$(PUBLIC)/rdf \ - -I$(PUBLIC)/dom \ - $(NULL) - LLIBS = \ $(LIBNSPR) \ $(DIST)\lib\xpcom.lib \ diff --git a/mozilla/xpfe/components/winhooks/makefile.win b/mozilla/xpfe/components/winhooks/makefile.win index a87387eeb9b..7a53e0aec3e 100644 --- a/mozilla/xpfe/components/winhooks/makefile.win +++ b/mozilla/xpfe/components/winhooks/makefile.win @@ -21,7 +21,7 @@ # Bill Law MODULE=appcomps -REQUIRES=xpcom string dom windowwatcher intl raptor necko +REQUIRES=xpcom string dom windowwatcher intl appshell necko DEPTH=..\..\.. XPIDL_MODULE=winhooks diff --git a/mozilla/xpinstall/standalone/makefile.win b/mozilla/xpinstall/standalone/makefile.win index 9c0d9a93d9c..0ff741171d9 100644 --- a/mozilla/xpinstall/standalone/makefile.win +++ b/mozilla/xpinstall/standalone/makefile.win @@ -35,12 +35,6 @@ LLIBS = \ $(LIBNSPR) \ $(NULL) -LINCS = \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\xpinstall \ - -I$(PUBLIC)\raptor \ - $(NULL) - include <$(DEPTH)\config\rules.mak> export:: $(PROGRAM) diff --git a/mozilla/xpinstall/stub/makefile.win b/mozilla/xpinstall/stub/makefile.win index 265f0a58bad..de43cf63333 100644 --- a/mozilla/xpinstall/stub/makefile.win +++ b/mozilla/xpinstall/stub/makefile.win @@ -23,7 +23,7 @@ DEPTH=..\.. -REQUIRES=string dom appcomps +REQUIRES=xpcom string dom appcomps xpinstall MAKE_OBJ_TYPE = DLL LIBRARY_NAME=xpistub DLL = .\$(OBJDIR)\xpistub.dll @@ -38,11 +38,6 @@ LLIBS = \ $(DIST)\lib\xpcom.lib \ $(NULL) -LINCS = \ - -I$(PUBLIC)\xpcom \ - -I$(PUBLIC)\xpinstall \ - $(NULL) - include <$(DEPTH)\config\rules.mak> install:: $(DLL)