diff --git a/mozilla/config/rules.mak b/mozilla/config/rules.mak index 52efe4c4736..f9e99167576 100644 --- a/mozilla/config/rules.mak +++ b/mozilla/config/rules.mak @@ -112,10 +112,14 @@ W32LOBJS = $(OBJS: .= +-.) !endif -all:: +all:: + @date /T + @time /T $(NMAKE) -f makefile.win export $(NMAKE) -f makefile.win libs $(NMAKE) -f makefile.win install + @date /T + @time /T #//------------------------------------------------------------------------ #// @@ -353,7 +357,7 @@ export:: @$(W95MAKE) export $(MAKEDIR) $(DIRS) !endif # DIRS -libs:: w95libs $(LIBRARY) +install:: w95libs $(LIBRARY) w95libs:: !ifdef DIRS @@ -451,9 +455,14 @@ $(OBJS) export:: $(DIRS) -libs:: $(DIRS) $(LIBRARY) +libs:: + @echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + @echo !! THE libs BUILD PHASE HAS BEEN CANCELED DUE TO LACK OF INTEREST + @echo !! (This saves 4 minutes (out of 42.5) doing a complete build on my + @echo !! PII 400mhz running NT4.) + @echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -install:: $(DIRS) +install:: $(DIRS) $(LIBRARY) depend:: $(DIRS) diff --git a/mozilla/content/events/src/makefile.win b/mozilla/content/events/src/makefile.win index 25f3ca5dd96..3254772ef19 100644 --- a/mozilla/content/events/src/makefile.win +++ b/mozilla/content/events/src/makefile.win @@ -57,7 +57,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/content/html/content/src/makefile.win b/mozilla/content/html/content/src/makefile.win index 7557f5194a1..6d29c2747fb 100644 --- a/mozilla/content/html/content/src/makefile.win +++ b/mozilla/content/html/content/src/makefile.win @@ -178,7 +178,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/content/xml/content/src/makefile.win b/mozilla/content/xml/content/src/makefile.win index ce25cc39bb2..640543023a6 100644 --- a/mozilla/content/xml/content/src/makefile.win +++ b/mozilla/content/xml/content/src/makefile.win @@ -64,7 +64,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/content/xml/document/src/makefile.win b/mozilla/content/xml/document/src/makefile.win index a90f2049ed3..002419870f2 100644 --- a/mozilla/content/xml/document/src/makefile.win +++ b/mozilla/content/xml/document/src/makefile.win @@ -57,7 +57,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/content/xsl/document/src/makefile.win b/mozilla/content/xsl/document/src/makefile.win index 587d5901f68..969b05cbeec 100644 --- a/mozilla/content/xsl/document/src/makefile.win +++ b/mozilla/content/xsl/document/src/makefile.win @@ -61,7 +61,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/db/mork/src/makefile.win b/mozilla/db/mork/src/makefile.win index 18a0dcc5a8b..2c5427d1b98 100644 --- a/mozilla/db/mork/src/makefile.win +++ b/mozilla/db/mork/src/makefile.win @@ -100,7 +100,7 @@ CPP_OBJS= .\$(OBJDIR)\orkinCell.obj \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/dbm/src/Makefile.win b/mozilla/dbm/src/Makefile.win index 9484811e8d5..1d49e5f919b 100644 --- a/mozilla/dbm/src/Makefile.win +++ b/mozilla/dbm/src/Makefile.win @@ -90,7 +90,7 @@ include <$(DEPTH)/config/rules.mak> CFLAGS = $(CFLAGS) -DMOZILLA_CLIENT -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib diff --git a/mozilla/docshell/base/makefile.win b/mozilla/docshell/base/makefile.win index c7c62784d29..0ba396cdc06 100644 --- a/mozilla/docshell/base/makefile.win +++ b/mozilla/docshell/base/makefile.win @@ -45,5 +45,5 @@ CPP_OBJS= \ include <$(DEPTH)\config\rules.mak> include <$(DEPTH)\config\config.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib diff --git a/mozilla/dom/src/base/makefile.win b/mozilla/dom/src/base/makefile.win index 31c81b28426..37669e3be51 100644 --- a/mozilla/dom/src/base/makefile.win +++ b/mozilla/dom/src/base/makefile.win @@ -96,7 +96,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/dom/src/coreDOM/makefile.win b/mozilla/dom/src/coreDOM/makefile.win index 7336a705c29..faa9a6bd06e 100644 --- a/mozilla/dom/src/coreDOM/makefile.win +++ b/mozilla/dom/src/coreDOM/makefile.win @@ -83,7 +83,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/dom/src/css/makefile.win b/mozilla/dom/src/css/makefile.win index d304ba4f381..1fb88ade55f 100644 --- a/mozilla/dom/src/css/makefile.win +++ b/mozilla/dom/src/css/makefile.win @@ -49,7 +49,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/dom/src/events/makefile.win b/mozilla/dom/src/events/makefile.win index 445a0f63698..38bb3bdd62b 100644 --- a/mozilla/dom/src/events/makefile.win +++ b/mozilla/dom/src/events/makefile.win @@ -48,7 +48,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/dom/src/html/makefile.win b/mozilla/dom/src/html/makefile.win index e53a1076905..826d12e7f16 100644 --- a/mozilla/dom/src/html/makefile.win +++ b/mozilla/dom/src/html/makefile.win @@ -157,7 +157,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/dom/src/range/makefile.win b/mozilla/dom/src/range/makefile.win index 65a5cba8fcd..d1d31bce41d 100644 --- a/mozilla/dom/src/range/makefile.win +++ b/mozilla/dom/src/range/makefile.win @@ -46,7 +46,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/editor/txmgr/src/makefile.win b/mozilla/editor/txmgr/src/makefile.win index b866b48a866..67d569871ff 100644 --- a/mozilla/editor/txmgr/src/makefile.win +++ b/mozilla/editor/txmgr/src/makefile.win @@ -69,7 +69,7 @@ LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/editor/txtsvc/src/makefile.win b/mozilla/editor/txtsvc/src/makefile.win index 41cdc145cda..b92b1067b9c 100644 --- a/mozilla/editor/txtsvc/src/makefile.win +++ b/mozilla/editor/txtsvc/src/makefile.win @@ -69,7 +69,7 @@ LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/embedding/browser/setup/makefile.win b/mozilla/embedding/browser/setup/makefile.win index aea594a8939..a947e8eabad 100644 --- a/mozilla/embedding/browser/setup/makefile.win +++ b/mozilla/embedding/browser/setup/makefile.win @@ -36,5 +36,5 @@ CPP_OBJS= \ include <$(DEPTH)\config\rules.mak> include <$(DEPTH)\config\config.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib diff --git a/mozilla/embedding/browser/webBrowser/makefile.win b/mozilla/embedding/browser/webBrowser/makefile.win index dc58480b43f..317bc645ac6 100644 --- a/mozilla/embedding/browser/webBrowser/makefile.win +++ b/mozilla/embedding/browser/webBrowser/makefile.win @@ -40,5 +40,5 @@ CPP_OBJS= \ include <$(DEPTH)\config\rules.mak> include <$(DEPTH)\config\config.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib diff --git a/mozilla/expat/makefile.win b/mozilla/expat/makefile.win index 3cf3be77599..58d57c68062 100644 --- a/mozilla/expat/makefile.win +++ b/mozilla/expat/makefile.win @@ -15,7 +15,7 @@ OBJS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib install:: $(LIBRARY) diff --git a/mozilla/expat/xmlparse/makefile.win b/mozilla/expat/xmlparse/makefile.win index f24106e2bb5..e78e0f6592b 100644 --- a/mozilla/expat/xmlparse/makefile.win +++ b/mozilla/expat/xmlparse/makefile.win @@ -40,4 +40,4 @@ LINCS=-I..\xmltok include <$(DEPTH)\config\rules.mak> -libs:: $(OBJDIR) $(OBJS) +install:: $(OBJDIR) $(OBJS) diff --git a/mozilla/expat/xmltok/makefile.win b/mozilla/expat/xmltok/makefile.win index b6451f2ce6e..6c7c4b9207c 100644 --- a/mozilla/expat/xmltok/makefile.win +++ b/mozilla/expat/xmltok/makefile.win @@ -35,4 +35,4 @@ CPP_OBJS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(OBJDIR) $(OBJS) +install:: $(OBJDIR) $(OBJS) diff --git a/mozilla/extensions/transformiix/source/base/makefile.win b/mozilla/extensions/transformiix/source/base/makefile.win index 9f78fde83c9..c65570c8754 100644 --- a/mozilla/extensions/transformiix/source/base/makefile.win +++ b/mozilla/extensions/transformiix/source/base/makefile.win @@ -67,7 +67,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win index 927af153155..32eb22078c5 100644 --- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win +++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win @@ -77,7 +77,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/extensions/transformiix/source/xml/makefile.win b/mozilla/extensions/transformiix/source/xml/makefile.win index 1806cb96415..f7e34487507 100644 --- a/mozilla/extensions/transformiix/source/xml/makefile.win +++ b/mozilla/extensions/transformiix/source/xml/makefile.win @@ -49,7 +49,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/extensions/transformiix/source/xsl/expr/makefile.win b/mozilla/extensions/transformiix/source/xsl/expr/makefile.win index b484a87dab0..fde0b21acad 100644 --- a/mozilla/extensions/transformiix/source/xsl/expr/makefile.win +++ b/mozilla/extensions/transformiix/source/xsl/expr/makefile.win @@ -106,7 +106,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/extensions/transformiix/source/xsl/makefile.win b/mozilla/extensions/transformiix/source/xsl/makefile.win index 3c08e872065..80a333cb5e8 100644 --- a/mozilla/extensions/transformiix/source/xsl/makefile.win +++ b/mozilla/extensions/transformiix/source/xsl/makefile.win @@ -55,7 +55,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/extensions/transformiix/source/xsl/util/makefile.win b/mozilla/extensions/transformiix/source/xsl/util/makefile.win index 1d10a047247..64e94b3f83b 100644 --- a/mozilla/extensions/transformiix/source/xsl/util/makefile.win +++ b/mozilla/extensions/transformiix/source/xsl/util/makefile.win @@ -48,7 +48,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/extensions/wallet/build/makefile.win b/mozilla/extensions/wallet/build/makefile.win index c1b9e60808c..f530c77728d 100644 --- a/mozilla/extensions/wallet/build/makefile.win +++ b/mozilla/extensions/wallet/build/makefile.win @@ -51,5 +51,5 @@ WIN_LIBS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components diff --git a/mozilla/extensions/wallet/cookieviewer/makefile.win b/mozilla/extensions/wallet/cookieviewer/makefile.win index 174c205dd9b..5141cb86e57 100644 --- a/mozilla/extensions/wallet/cookieviewer/makefile.win +++ b/mozilla/extensions/wallet/cookieviewer/makefile.win @@ -48,7 +48,7 @@ LINCS=\ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/extensions/wallet/editor/makefile.win b/mozilla/extensions/wallet/editor/makefile.win index fd6cbaa4ed8..6f8413b9344 100644 --- a/mozilla/extensions/wallet/editor/makefile.win +++ b/mozilla/extensions/wallet/editor/makefile.win @@ -48,7 +48,7 @@ LINCS=\ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/extensions/wallet/signonviewer/makefile.win b/mozilla/extensions/wallet/signonviewer/makefile.win index 68e25064d30..936fa90214d 100644 --- a/mozilla/extensions/wallet/signonviewer/makefile.win +++ b/mozilla/extensions/wallet/signonviewer/makefile.win @@ -48,7 +48,7 @@ LINCS=\ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/extensions/wallet/src/makefile.win b/mozilla/extensions/wallet/src/makefile.win index 52858b6661a..25f4f802980 100644 --- a/mozilla/extensions/wallet/src/makefile.win +++ b/mozilla/extensions/wallet/src/makefile.win @@ -68,7 +68,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/extensions/wallet/walletpreview/makefile.win b/mozilla/extensions/wallet/walletpreview/makefile.win index 2116c72dd38..b2d808e8116 100644 --- a/mozilla/extensions/wallet/walletpreview/makefile.win +++ b/mozilla/extensions/wallet/walletpreview/makefile.win @@ -48,7 +48,7 @@ LINCS=\ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/gc/boehm/makefile.win b/mozilla/gc/boehm/makefile.win index e6b8e1e9046..01e7181be10 100644 --- a/mozilla/gc/boehm/makefile.win +++ b/mozilla/gc/boehm/makefile.win @@ -57,7 +57,7 @@ INCS = $(INCS) \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/gfx/src/makefile.win b/mozilla/gfx/src/makefile.win index dd50e757532..7ad5d97ce75 100644 --- a/mozilla/gfx/src/makefile.win +++ b/mozilla/gfx/src/makefile.win @@ -20,12 +20,15 @@ # Contributor(s): DEPTH=..\.. - +MODULE=raptor DIRS = windows -LIBRARY_NAME=raptorgfx_s -MODULE=raptor +MAKE_OBJ_TYPE = DLL +DLLNAME = gkgfxwin +DLL=.\$(OBJDIR)\$(DLLNAME).dll +#RESFILE = $(DLLNAME).res + !ifdef NECKO REQUIRES=util img xpcom raptor necko timer !else @@ -68,17 +71,44 @@ LCFLAGS = \ $(DEFINES) \ $(NULL) +LLIBS= \ + $(DIST)\lib\xpcom.lib \ + $(DIST)\lib\img32$(VERSION_NUMBER).lib \ + $(DIST)\lib\js32$(VERSION_NUMBER).lib \ + $(DIST)\lib\util.lib \ + $(DIST)\lib\neckoutil_s.lib \ + $(DIST)\lib\raptorgfxwin_s.lib \ + $(DIST)\lib\timer_s.lib \ +!if defined(NGLAYOUT_DDRAW) + $(NGLAYOUT_DDRAW)\lib\ddraw.lib \ +!endif + $(LIBNSPR) + +WIN_LIBS= \ +!if defined(NGLAYOUT_DDRAW) + ole32.lib \ +!endif + comdlg32.lib + +LLFLAGS = \ + $(LLFLAGS) \ + /INCLUDE:_NS_HexToRGB@8 \ + /INCLUDE:_NS_ColorNameToRGB@8 \ + /INCLUDE:_NS_NewImageGroup@4 \ + /INCLUDE:_NS_NewImageRenderer@4 \ + /INCLUDE:_NS_NewImageSystemServices@4 \ + /INCLUDE:_NS_NewImageManager@4 + include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) - $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib - -install:: +install:: $(DLL) + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib $(MAKE_INSTALL) icon_0.gif $(DIST)\bin\res\gfx $(MAKE_INSTALL) icon_1.gif $(DIST)\bin\res\gfx clobber:: - rm -f $(DIST)\lib\$(LIBRARY_NAME).lib - rm -f $(PDBFILE).pdb + rm -f $(DIST)\bin\$(DLLNAME).dll + rm -f $(DIST)\lib\$(DLLNAME).lib rm -f $(DIST)\bin\res\gfx\icon_0.gif rm -f $(DIST)\bin\res\gfx\icon_1.gif diff --git a/mozilla/gfx/src/windows/makefile.win b/mozilla/gfx/src/windows/makefile.win index 39e8eb5ea21..dc39954eb15 100644 --- a/mozilla/gfx/src/windows/makefile.win +++ b/mozilla/gfx/src/windows/makefile.win @@ -22,14 +22,10 @@ DEPTH=..\..\.. include <$(DEPTH)/config/config.mak> - -MAKE_OBJ_TYPE = DLL -DLLNAME = gkgfxwin -DLL=.\$(OBJDIR)\$(DLLNAME).dll -#RESFILE = $(DLLNAME).res - MODULE=raptor +LIBRARY_NAME=raptorgfxwin_s + DEFINES=-D_IMPL_NS_GFX -D_IMPL_NS_GFXNONXP -DWIN32_LEAN_AND_MEAN -DSTRICT !if defined(NGLAYOUT_DDRAW) @@ -71,44 +67,11 @@ LCFLAGS = \ $(DEFINES) \ $(NULL) -LLIBS= \ - $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\img32$(VERSION_NUMBER).lib \ - $(DIST)\lib\js32$(VERSION_NUMBER).lib \ - $(DIST)\lib\util.lib \ -!ifdef NECKO - $(DIST)\lib\neckoutil_s.lib \ -!else - $(DIST)\lib\netlib.lib \ -!endif - $(DIST)\lib\raptorgfx_s.lib \ - $(DIST)\lib\timer_s.lib \ -!if defined(NGLAYOUT_DDRAW) - $(NGLAYOUT_DDRAW)\lib\ddraw.lib \ -!endif - $(LIBNSPR) - -WIN_LIBS= \ -!if defined(NGLAYOUT_DDRAW) - ole32.lib \ -!endif - comdlg32.lib - -LLFLAGS = \ - $(LLFLAGS) \ - /INCLUDE:_NS_HexToRGB@8 \ - /INCLUDE:_NS_ColorNameToRGB@8 \ - /INCLUDE:_NS_NewImageGroup@4 \ - /INCLUDE:_NS_NewImageRenderer@4 \ - /INCLUDE:_NS_NewImageSystemServices@4 \ - /INCLUDE:_NS_NewImageManager@4 - include <$(DEPTH)\config\rules.mak> -install:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib +install:: $(LIBRARY) + $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: - rm -f $(DIST)\bin\$(DLLNAME).dll - rm -f $(DIST)\lib\$(DLLNAME).lib + rm -f $(DIST)\lib\$(LIBRARY_NAME).lib + rm -f $(PDBFILE).pdb diff --git a/mozilla/htmlparser/robot/makefile.win b/mozilla/htmlparser/robot/makefile.win index 596bba14c90..0daf31f5e16 100644 --- a/mozilla/htmlparser/robot/makefile.win +++ b/mozilla/htmlparser/robot/makefile.win @@ -55,6 +55,6 @@ LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor -I$(XPDIST)\public\net include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin $(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib diff --git a/mozilla/htmlparser/src/makefile.win b/mozilla/htmlparser/src/makefile.win index 4207727271d..93bba6902fe 100644 --- a/mozilla/htmlparser/src/makefile.win +++ b/mozilla/htmlparser/src/makefile.win @@ -171,7 +171,7 @@ include <$(DEPTH)\config\rules.mak> #export:: $(XPDIST)\include # $(MAKE_INSTALL) $(XPDIST)\include -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/intl/chardet/src/classic/makefile.win b/mozilla/intl/chardet/src/classic/makefile.win index f1fdb997a71..f91e53831a1 100644 --- a/mozilla/intl/chardet/src/classic/makefile.win +++ b/mozilla/intl/chardet/src/classic/makefile.win @@ -59,7 +59,7 @@ LLIBS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/intl/chardet/src/makefile.win b/mozilla/intl/chardet/src/makefile.win index bac4e5ae244..703712d69ca 100644 --- a/mozilla/intl/chardet/src/makefile.win +++ b/mozilla/intl/chardet/src/makefile.win @@ -75,7 +75,7 @@ LLIBS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/intl/chardet/src/windows/makefile.win b/mozilla/intl/chardet/src/windows/makefile.win index de163ce3313..05dcdb4eec9 100644 --- a/mozilla/intl/chardet/src/windows/makefile.win +++ b/mozilla/intl/chardet/src/windows/makefile.win @@ -59,7 +59,7 @@ LLIBS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/intl/compatibility/src/makefile.win b/mozilla/intl/compatibility/src/makefile.win index ef50a4e5336..6d2f1cc5c21 100644 --- a/mozilla/intl/compatibility/src/makefile.win +++ b/mozilla/intl/compatibility/src/makefile.win @@ -54,7 +54,7 @@ LLIBS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/intl/locale/src/makefile.win b/mozilla/intl/locale/src/makefile.win index 68fa532cb4d..94da1c2bcb8 100644 --- a/mozilla/intl/locale/src/makefile.win +++ b/mozilla/intl/locale/src/makefile.win @@ -31,7 +31,10 @@ MODULE = locale REQUIRES = xpcom unicharutil uconv DIRS = windows -LIBRARY_NAME = nslocale_s +MAKE_OBJ_TYPE = DLL +DLLNAME = nslocale +DLL=.\$(OBJDIR)\$(DLLNAME).dll +#RESFILE = $(DLLNAME).res CPPSRCS = nsLocale.cpp \ nsLocaleFactory.cpp \ @@ -54,18 +57,20 @@ LINCS = -I. \ -I$(PUBLIC)\unicharutil -LLIBS = $(DIST)\lib\xpcom.lib \ - $(LIBNSPR) +LLIBS = $(DIST)\lib\xpcom.lib \ + $(DIST)\lib\nslocalewin_s.lib \ + $(LIBNSPR) LCFLAGS = $(LCFLAGS) \ $(DEFINES) include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) - @echo $(LIBRARY) - $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib - +install:: $(DLL) + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib clobber:: - rm -f $(DIST)\bin\$(DLLNAME).lib + rm -f $(DIST)\bin\components\$(DLLNAME).dll + rm -f $(DIST)\lib\$(DLLNAME).lib + diff --git a/mozilla/intl/locale/src/windows/makefile.win b/mozilla/intl/locale/src/windows/makefile.win index 2a466a82fce..2881c00207d 100644 --- a/mozilla/intl/locale/src/windows/makefile.win +++ b/mozilla/intl/locale/src/windows/makefile.win @@ -21,11 +21,7 @@ DEPTH=..\..\..\.. - -MAKE_OBJ_TYPE = DLL -DLLNAME = nslocale -DLL=.\$(OBJDIR)\$(DLLNAME).dll -#RESFILE = $(DLLNAME).res +LIBRARY_NAME = nslocalewin_s MODULE=raptor @@ -62,11 +58,9 @@ $(LIBNSPR) include <$(DEPTH)\config\rules.mak> -install:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib +install:: $(LIBRARY) + @echo $(LIBRARY) + $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib\ clobber:: - rm -f $(DIST)\bin\components\$(DLLNAME).dll - rm -f $(DIST)\lib\$(DLLNAME).lib - + rm -f $(DIST)\lib\$(LIBRARY_NAME).lib diff --git a/mozilla/intl/lwbrk/src/makefile.win b/mozilla/intl/lwbrk/src/makefile.win index 57aabd73f94..347414d8dbd 100644 --- a/mozilla/intl/lwbrk/src/makefile.win +++ b/mozilla/intl/lwbrk/src/makefile.win @@ -65,7 +65,7 @@ LLIBS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/jpeg/makefile.win b/mozilla/jpeg/makefile.win index 2574af123c7..92cdb1a61fe 100644 --- a/mozilla/jpeg/makefile.win +++ b/mozilla/jpeg/makefile.win @@ -142,13 +142,10 @@ MAPFILE= $(DLLNAME).map #//------------------------------------------------------------------------ include <$(DEPTH)/config/rules.mak> -export:: -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib -install:: export libs - clobber:: $(RM) $(JPEG_OBJS) diff --git a/mozilla/js/src/liveconnect/makefile.win b/mozilla/js/src/liveconnect/makefile.win index 8b04b7b68dc..aaac1477814 100644 --- a/mozilla/js/src/liveconnect/makefile.win +++ b/mozilla/js/src/liveconnect/makefile.win @@ -171,7 +171,7 @@ include <$(DEPTH)/config/rules.mak> export:: INSTALL_FILES -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/layout/base/src/makefile.win b/mozilla/layout/base/src/makefile.win index 265fd46bdd2..ab21bfd69bd 100644 --- a/mozilla/layout/base/src/makefile.win +++ b/mozilla/layout/base/src/makefile.win @@ -123,7 +123,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/layout/events/src/makefile.win b/mozilla/layout/events/src/makefile.win index 25f3ca5dd96..3254772ef19 100644 --- a/mozilla/layout/events/src/makefile.win +++ b/mozilla/layout/events/src/makefile.win @@ -57,7 +57,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/layout/html/base/src/makefile.win b/mozilla/layout/html/base/src/makefile.win index d9256dbcca7..b74c30db4e0 100644 --- a/mozilla/layout/html/base/src/makefile.win +++ b/mozilla/layout/html/base/src/makefile.win @@ -140,7 +140,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib install:: diff --git a/mozilla/layout/html/content/src/makefile.win b/mozilla/layout/html/content/src/makefile.win index 7557f5194a1..6d29c2747fb 100644 --- a/mozilla/layout/html/content/src/makefile.win +++ b/mozilla/layout/html/content/src/makefile.win @@ -178,7 +178,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/layout/html/document/src/makefile.win b/mozilla/layout/html/document/src/makefile.win index b628d7cbefc..6cd41a14565 100644 --- a/mozilla/layout/html/document/src/makefile.win +++ b/mozilla/layout/html/document/src/makefile.win @@ -72,7 +72,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib $(MAKE_INSTALL) ua.css $(DIST)\bin\res $(MAKE_INSTALL) html.css $(DIST)\bin\res diff --git a/mozilla/layout/html/forms/src/makefile.win b/mozilla/layout/html/forms/src/makefile.win index 9f2de7efe5e..5b613a1946b 100644 --- a/mozilla/layout/html/forms/src/makefile.win +++ b/mozilla/layout/html/forms/src/makefile.win @@ -114,7 +114,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/layout/html/makefile.win b/mozilla/layout/html/makefile.win index 4e43f8b07d1..cde17b21df9 100644 --- a/mozilla/layout/html/makefile.win +++ b/mozilla/layout/html/makefile.win @@ -21,6 +21,7 @@ DEPTH=..\.. -DIRS = base content document forms style table tests +DIRS = base content document forms style table +# tests is now done after we build layout/events include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/layout/html/style/src/makefile.win b/mozilla/layout/html/style/src/makefile.win index 41de7d23be0..8dc826dbf86 100644 --- a/mozilla/layout/html/style/src/makefile.win +++ b/mozilla/layout/html/style/src/makefile.win @@ -111,7 +111,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/layout/html/table/src/makefile.win b/mozilla/layout/html/table/src/makefile.win index 882fe202920..afe74bba13b 100644 --- a/mozilla/layout/html/table/src/makefile.win +++ b/mozilla/layout/html/table/src/makefile.win @@ -62,7 +62,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/layout/makefile.win b/mozilla/layout/makefile.win index 3a792249c57..cf398c29ac0 100644 --- a/mozilla/layout/makefile.win +++ b/mozilla/layout/makefile.win @@ -21,13 +21,20 @@ DEPTH=.. -DIRS=base html xml xul \ +DIRS= \ + base \ + html \ + xml \ + xul \ !if defined(MOZ_XSL) -xsl \ + xsl \ !endif !ifdef MOZ_MATHML -mathml \ + mathml \ !endif -events build + events \ + build \ + html\tests \ + $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/layout/mathml/base/src/makefile.win b/mozilla/layout/mathml/base/src/makefile.win index afdbe360b22..b3de52bf297 100644 --- a/mozilla/layout/mathml/base/src/makefile.win +++ b/mozilla/layout/mathml/base/src/makefile.win @@ -92,7 +92,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/layout/mathml/content/src/makefile.win b/mozilla/layout/mathml/content/src/makefile.win index a2c9d2348cc..8219e5c065c 100644 --- a/mozilla/layout/mathml/content/src/makefile.win +++ b/mozilla/layout/mathml/content/src/makefile.win @@ -55,7 +55,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib install:: diff --git a/mozilla/layout/xml/content/src/makefile.win b/mozilla/layout/xml/content/src/makefile.win index ce25cc39bb2..640543023a6 100644 --- a/mozilla/layout/xml/content/src/makefile.win +++ b/mozilla/layout/xml/content/src/makefile.win @@ -64,7 +64,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/layout/xml/document/src/makefile.win b/mozilla/layout/xml/document/src/makefile.win index a90f2049ed3..002419870f2 100644 --- a/mozilla/layout/xml/document/src/makefile.win +++ b/mozilla/layout/xml/document/src/makefile.win @@ -57,7 +57,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/layout/xsl/document/src/makefile.win b/mozilla/layout/xsl/document/src/makefile.win index 587d5901f68..969b05cbeec 100644 --- a/mozilla/layout/xsl/document/src/makefile.win +++ b/mozilla/layout/xsl/document/src/makefile.win @@ -61,7 +61,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/layout/xul/base/src/makefile.win b/mozilla/layout/xul/base/src/makefile.win index 63c8f2c8e9c..e38d8c11ed3 100644 --- a/mozilla/layout/xul/base/src/makefile.win +++ b/mozilla/layout/xul/base/src/makefile.win @@ -122,7 +122,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/layout/xul/content/src/makefile.win b/mozilla/layout/xul/content/src/makefile.win index 5acd0c85725..ee705792e83 100644 --- a/mozilla/layout/xul/content/src/makefile.win +++ b/mozilla/layout/xul/content/src/makefile.win @@ -50,7 +50,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/mailnews/addrbook/src/makefile.win b/mozilla/mailnews/addrbook/src/makefile.win index 6f816c6d74f..bfcff2d359c 100644 --- a/mozilla/mailnews/addrbook/src/makefile.win +++ b/mozilla/mailnews/addrbook/src/makefile.win @@ -68,7 +68,7 @@ CPP_OBJS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/mailnews/base/search/src/makefile.win b/mozilla/mailnews/base/search/src/makefile.win index b4fbffb2867..2c8530f9faf 100644 --- a/mozilla/mailnews/base/search/src/makefile.win +++ b/mozilla/mailnews/base/search/src/makefile.win @@ -69,7 +69,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/mailnews/base/src/makefile.win b/mozilla/mailnews/base/src/makefile.win index 2b8562573df..15297543a95 100644 --- a/mozilla/mailnews/base/src/makefile.win +++ b/mozilla/mailnews/base/src/makefile.win @@ -85,7 +85,7 @@ CPP_OBJS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/mailnews/base/util/makefile.win b/mozilla/mailnews/base/util/makefile.win index 8505e2eb198..1a62658ee35 100644 --- a/mozilla/mailnews/base/util/makefile.win +++ b/mozilla/mailnews/base/util/makefile.win @@ -86,6 +86,6 @@ LLIBS= \ include <$(DEPTH)/config/rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin $(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib diff --git a/mozilla/mailnews/compose/src/makefile.win b/mozilla/mailnews/compose/src/makefile.win index 0bda143f388..b5eac6684df 100644 --- a/mozilla/mailnews/compose/src/makefile.win +++ b/mozilla/mailnews/compose/src/makefile.win @@ -76,7 +76,7 @@ CPP_OBJS= .\$(OBJDIR)\nsMsgCompFields.obj \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/mailnews/db/msgdb/src/makefile.win b/mozilla/mailnews/db/msgdb/src/makefile.win index 28bdd06c5ae..74e32919cc7 100644 --- a/mozilla/mailnews/db/msgdb/src/makefile.win +++ b/mozilla/mailnews/db/msgdb/src/makefile.win @@ -46,7 +46,7 @@ CPP_OBJS= .\$(OBJDIR)\nsMsgDatabase.obj \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/mailnews/imap/src/makefile.win b/mozilla/mailnews/imap/src/makefile.win index 8fe9c5fdfea..a90a2167b11 100644 --- a/mozilla/mailnews/imap/src/makefile.win +++ b/mozilla/mailnews/imap/src/makefile.win @@ -71,7 +71,7 @@ CPP_OBJS= .\$(OBJDIR)\nsImapUrl.obj \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/mailnews/local/src/makefile.win b/mozilla/mailnews/local/src/makefile.win index c4d32beb69b..aabb7e715e2 100644 --- a/mozilla/mailnews/local/src/makefile.win +++ b/mozilla/mailnews/local/src/makefile.win @@ -69,7 +69,7 @@ CPP_OBJS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/mailnews/mapi/lib/Makefile.win b/mozilla/mailnews/mapi/lib/Makefile.win index e975a7b79b5..b5dfd2a692a 100644 --- a/mozilla/mailnews/mapi/lib/Makefile.win +++ b/mozilla/mailnews/mapi/lib/Makefile.win @@ -43,7 +43,7 @@ CPP_OBJS= .\$(OBJDIR)\mapismem.obj \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/mailnews/mime/abstatus/src/makefile.win b/mozilla/mailnews/mime/abstatus/src/makefile.win index c05ab541ec7..2b63cc1d1a7 100644 --- a/mozilla/mailnews/mime/abstatus/src/makefile.win +++ b/mozilla/mailnews/mime/abstatus/src/makefile.win @@ -41,7 +41,7 @@ CPP_OBJS= .\$(OBJDIR)\nsMimeMiscStatus.obj \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/mailnews/mime/emitters/src/makefile.win b/mozilla/mailnews/mime/emitters/src/makefile.win index 852398f680a..fcd12131401 100644 --- a/mozilla/mailnews/mime/emitters/src/makefile.win +++ b/mozilla/mailnews/mime/emitters/src/makefile.win @@ -53,7 +53,7 @@ CPP_OBJS= .\$(OBJDIR)\nsMimeBaseEmitter.obj \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/mailnews/mime/src/makefile.win b/mozilla/mailnews/mime/src/makefile.win index 5412716b40c..9143543398b 100644 --- a/mozilla/mailnews/mime/src/makefile.win +++ b/mozilla/mailnews/mime/src/makefile.win @@ -119,8 +119,8 @@ OBJS= \ include <$(DEPTH)/config/rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: - rm -f $(DIST)\lib\$(LIBRARY_NAME).lib \ No newline at end of file + rm -f $(DIST)\lib\$(LIBRARY_NAME).lib diff --git a/mozilla/mailnews/news/src/makefile.win b/mozilla/mailnews/news/src/makefile.win index 787a778e3a6..7964f246d1b 100644 --- a/mozilla/mailnews/news/src/makefile.win +++ b/mozilla/mailnews/news/src/makefile.win @@ -66,7 +66,7 @@ CPP_OBJS= .\$(OBJDIR)\nsNNTPProtocol.obj \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/makefile.win b/mozilla/makefile.win index d592a883558..0e3b24c4c5c 100644 --- a/mozilla/makefile.win +++ b/mozilla/makefile.win @@ -31,6 +31,7 @@ NECKO=1 #// root of mozilla #// #//------------------------------------------------------------------------ + DEPTH=. #//------------------------------------------------------------------------ @@ -42,77 +43,59 @@ DEPTH=. #// #//------------------------------------------------------------------------ -DIRS = \ +DIRS = \ !if defined(DIST_DIRS) - config \ - db \ - dbm \ - include \ - jpeg \ - modules\libreg \ - xpcom \ - modules\zlib \ - modules\libjar \ - modules\libutil \ - sun-java \ - js \ - modules\libimg \ - modules\plugin \ - modules\oji \ - modules\libpref \ - intl \ - caps \ -!if !defined(NECKO) - lib\libpwcac \ - network \ -!endif + config \ + include \ + jpeg \ + sun-java \ + modules\libreg \ + xpcom \ + db \ + dbm \ + netwerk \ + widget\timer \ + js \ + modules \ + caps \ + intl \ !endif !if defined(LAYOUT_DIRS) # the following are associated with the layout engine - expat \ - gfx \ -!if defined(NECKO) - netwerk \ -!endif - uriloader \ - profile \ - htmlparser \ - widget \ - dom \ - view \ - layout \ - rdf \ - webshell \ - editor \ + expat \ + gfx \ + uriloader \ + htmlparser \ + widget \ + dom \ + view \ + layout \ + rdf \ + webshell \ + profile \ + editor \ !if defined(GC_LEAK_DETECTOR) - gc\boehm \ + gc\boehm \ !endif !endif !if defined(CLIENT_DIRS) # the following are associated with the browser - xpfe \ - xpinstall \ - extensions \ + xpfe \ + xpinstall \ + extensions \ !if !defined(DISABLE_MAILNEWS) - mailnews \ + mailnews \ !endif !endif $(NULL) - -!ifdef NECKO -all:: -export:: - @echo NECKO is enabled -!endif - #//------------------------------------------------------------------------ #// #// Include the common makefile rules #// #//------------------------------------------------------------------------ -include <$(DEPTH)\config\rules.mak> +include <$(DEPTH)\config\rules.mak> #//------------------------------------------------------------------------ #// diff --git a/mozilla/modules/libjar/standalone/makefile.win b/mozilla/modules/libjar/standalone/makefile.win index 8834f3b1d91..bc5dd0eef0c 100644 --- a/mozilla/modules/libjar/standalone/makefile.win +++ b/mozilla/modules/libjar/standalone/makefile.win @@ -52,7 +52,7 @@ export:: $(MAKE_INSTALL) ..\nsZip*.* . $(MAKE_INSTALL) ..\zip*.* . -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) .\$(OBJDIR)\jar_s.lib $(DIST)\lib clobber:: diff --git a/mozilla/modules/libpref/admin/makefile.win b/mozilla/modules/libpref/admin/makefile.win index 965c2025ee8..8d64350752b 100644 --- a/mozilla/modules/libpref/admin/makefile.win +++ b/mozilla/modules/libpref/admin/makefile.win @@ -98,7 +98,7 @@ LIBRARY=.\$(OBJDIR)\$(LIBNAME).lib #//------------------------------------------------------------------------ include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin # $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/modules/libpref/src/makefile.win b/mozilla/modules/libpref/src/makefile.win index f8d5ca72e5f..de0f8152ba5 100644 --- a/mozilla/modules/libpref/src/makefile.win +++ b/mozilla/modules/libpref/src/makefile.win @@ -110,7 +110,7 @@ LIBRARY=.\$(OBJDIR)\$(LIBNAME).lib #//------------------------------------------------------------------------ include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib $(MAKE_INSTALL) .\init\netscape.cfg $(DIST)\bin diff --git a/mozilla/modules/libutil/src/makefile.win b/mozilla/modules/libutil/src/makefile.win index 338da9e0f8e..cdd634bffac 100644 --- a/mozilla/modules/libutil/src/makefile.win +++ b/mozilla/modules/libutil/src/makefile.win @@ -31,5 +31,5 @@ C_OBJS=.\$(OBJDIR)\obs.obj !include $(DEPTH)\config\rules.mak -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib\ diff --git a/mozilla/modules/security/freenav/makefile.win b/mozilla/modules/security/freenav/makefile.win index a297954e899..837bc955aa0 100644 --- a/mozilla/modules/security/freenav/makefile.win +++ b/mozilla/modules/security/freenav/makefile.win @@ -96,4 +96,4 @@ install:: $(LIBRARY) export:: INSTALL_FILES -libs:: install +install:: install diff --git a/mozilla/modules/zlib/standalone/makefile.win b/mozilla/modules/zlib/standalone/makefile.win index 36db0e0e86c..75f1f3233e6 100644 --- a/mozilla/modules/zlib/standalone/makefile.win +++ b/mozilla/modules/zlib/standalone/makefile.win @@ -61,7 +61,7 @@ docopy: export:: docopy -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE)_s.lib $(DIST)\lib clobber:: diff --git a/mozilla/netwerk/base/src/makefile.win b/mozilla/netwerk/base/src/makefile.win index 012704a791b..0a4d65763ea 100644 --- a/mozilla/netwerk/base/src/makefile.win +++ b/mozilla/netwerk/base/src/makefile.win @@ -50,7 +50,7 @@ INCS = $(INCS) \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/netwerk/dns/src/makefile.win b/mozilla/netwerk/dns/src/makefile.win index c310e67b70f..258bea50b9d 100644 --- a/mozilla/netwerk/dns/src/makefile.win +++ b/mozilla/netwerk/dns/src/makefile.win @@ -35,7 +35,7 @@ INCS = $(INCS) \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/netwerk/makefile.win b/mozilla/netwerk/makefile.win index 92cc64a01ba..d2e6fd4ece9 100644 --- a/mozilla/netwerk/makefile.win +++ b/mozilla/netwerk/makefile.win @@ -23,16 +23,16 @@ DEPTH = .. MODULE = necko -DIRS= \ - base \ - dns \ - build \ - protocol \ - socket \ - util \ - mime \ +DIRS= \ + base \ + dns \ + socket \ + mime \ streamconv \ - test \ + build \ + util \ + protocol \ + test \ $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/netwerk/socket/base/makefile.win b/mozilla/netwerk/socket/base/makefile.win index c2849f10aa2..c821e0e5c91 100644 --- a/mozilla/netwerk/socket/base/makefile.win +++ b/mozilla/netwerk/socket/base/makefile.win @@ -57,7 +57,7 @@ NO_GEN_XPT=1 include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/netwerk/util/src/makefile.win b/mozilla/netwerk/util/src/makefile.win index 0dd759b4380..0fbf577424b 100644 --- a/mozilla/netwerk/util/src/makefile.win +++ b/mozilla/netwerk/util/src/makefile.win @@ -36,7 +36,7 @@ INCS = $(INCS) \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/network/cache/makefile.win b/mozilla/network/cache/makefile.win index 8016b71d282..cf4d7de3077 100644 --- a/mozilla/network/cache/makefile.win +++ b/mozilla/network/cache/makefile.win @@ -104,7 +104,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib diff --git a/mozilla/network/cache/nu/src/makefile.win b/mozilla/network/cache/nu/src/makefile.win index fd9538d40bb..fe89a789b66 100644 --- a/mozilla/network/cache/nu/src/makefile.win +++ b/mozilla/network/cache/nu/src/makefile.win @@ -77,7 +77,7 @@ include <$(DEPTH)\config\rules.mak> install:: $(EXE) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).$(LIB_SUFFIX) $(DIST)\lib -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).$(LIB_SUFFIX) $(DIST)\lib # $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).$(DLL_SUFFIX) $(DIST)\bin diff --git a/mozilla/network/client/makefile.win b/mozilla/network/client/makefile.win index ebbb8b25b95..e6b63306f07 100644 --- a/mozilla/network/client/makefile.win +++ b/mozilla/network/client/makefile.win @@ -35,7 +35,7 @@ EXPORTS= cnetinit.h include <$(DEPTH)\config\rules.mak> !ifndef MODULAR_NETLIB -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/cnvts/makefile.win b/mozilla/network/cnvts/makefile.win index 93ca0541bd7..e54fc9d6ad7 100644 --- a/mozilla/network/cnvts/makefile.win +++ b/mozilla/network/cnvts/makefile.win @@ -122,7 +122,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/cstream/makefile.win b/mozilla/network/cstream/makefile.win index 71e037a8e21..c11882548d0 100644 --- a/mozilla/network/cstream/makefile.win +++ b/mozilla/network/cstream/makefile.win @@ -81,7 +81,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) install:: $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib diff --git a/mozilla/network/main/makefile.win b/mozilla/network/main/makefile.win index 2dea302ca96..28b0459de5b 100644 --- a/mozilla/network/main/makefile.win +++ b/mozilla/network/main/makefile.win @@ -175,7 +175,7 @@ LINCS=-I$(PUBLIC)\jtools \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib diff --git a/mozilla/network/mimetype/makefile.win b/mozilla/network/mimetype/makefile.win index 27a12ca45ae..6687e9bcd97 100644 --- a/mozilla/network/mimetype/makefile.win +++ b/mozilla/network/mimetype/makefile.win @@ -75,7 +75,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib diff --git a/mozilla/network/module/makefile.win b/mozilla/network/module/makefile.win index 8d0a34bb4ce..3e31844390f 100644 --- a/mozilla/network/module/makefile.win +++ b/mozilla/network/module/makefile.win @@ -165,7 +165,7 @@ include <$(DEPTH)/config/rules.mak> $(DLL): $(NETLIBS) -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin $(MAKE_INSTALL) .\$(OBJDIR)\netlib.lib $(DIST)\lib $(MAKE_INSTALL) .\res\gopher-audio.gif $(DIST)\bin\res\network diff --git a/mozilla/network/protocol/about/makefile.win b/mozilla/network/protocol/about/makefile.win index 22a7eed2ccf..61db195a8d8 100644 --- a/mozilla/network/protocol/about/makefile.win +++ b/mozilla/network/protocol/about/makefile.win @@ -79,7 +79,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/certld/makefile.win b/mozilla/network/protocol/certld/makefile.win index a8f1ae939de..f0b2a7d4b75 100644 --- a/mozilla/network/protocol/certld/makefile.win +++ b/mozilla/network/protocol/certld/makefile.win @@ -77,7 +77,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/dataurl/makefile.win b/mozilla/network/protocol/dataurl/makefile.win index 8f9195271e8..b028f20afed 100644 --- a/mozilla/network/protocol/dataurl/makefile.win +++ b/mozilla/network/protocol/dataurl/makefile.win @@ -79,7 +79,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/file/makefile.win b/mozilla/network/protocol/file/makefile.win index 9e2d026f07d..6c09b85db58 100644 --- a/mozilla/network/protocol/file/makefile.win +++ b/mozilla/network/protocol/file/makefile.win @@ -82,7 +82,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/ftp/makefile.win b/mozilla/network/protocol/ftp/makefile.win index b7db8c59980..06a551982df 100644 --- a/mozilla/network/protocol/ftp/makefile.win +++ b/mozilla/network/protocol/ftp/makefile.win @@ -79,7 +79,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/gopher/makefile.win b/mozilla/network/protocol/gopher/makefile.win index d7cdf6f409d..e3c3ba31c71 100644 --- a/mozilla/network/protocol/gopher/makefile.win +++ b/mozilla/network/protocol/gopher/makefile.win @@ -78,7 +78,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/http/makefile.win b/mozilla/network/protocol/http/makefile.win index d3b854c0525..29771b7cadf 100644 --- a/mozilla/network/protocol/http/makefile.win +++ b/mozilla/network/protocol/http/makefile.win @@ -102,7 +102,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/imap4/makefile.win b/mozilla/network/protocol/imap4/makefile.win index 905a8cf2515..42f8b649c62 100644 --- a/mozilla/network/protocol/imap4/makefile.win +++ b/mozilla/network/protocol/imap4/makefile.win @@ -93,7 +93,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/js/makefile.win b/mozilla/network/protocol/js/makefile.win index b25362f388c..4d47b0d56eb 100644 --- a/mozilla/network/protocol/js/makefile.win +++ b/mozilla/network/protocol/js/makefile.win @@ -79,7 +79,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/ldap/makefile.win b/mozilla/network/protocol/ldap/makefile.win index b846171c116..80c2c78929d 100644 --- a/mozilla/network/protocol/ldap/makefile.win +++ b/mozilla/network/protocol/ldap/makefile.win @@ -81,7 +81,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/mailbox/makefile.win b/mozilla/network/protocol/mailbox/makefile.win index 15f7680c8b7..851b6c61b90 100644 --- a/mozilla/network/protocol/mailbox/makefile.win +++ b/mozilla/network/protocol/mailbox/makefile.win @@ -80,7 +80,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/marimba/makefile.win b/mozilla/network/protocol/marimba/makefile.win index 352105c451f..49aa971f559 100644 --- a/mozilla/network/protocol/marimba/makefile.win +++ b/mozilla/network/protocol/marimba/makefile.win @@ -76,7 +76,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/nntp/makefile.win b/mozilla/network/protocol/nntp/makefile.win index ab7b87765fe..2e764e1c4a4 100644 --- a/mozilla/network/protocol/nntp/makefile.win +++ b/mozilla/network/protocol/nntp/makefile.win @@ -82,7 +82,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/pop3/makefile.win b/mozilla/network/protocol/pop3/makefile.win index 7f190875197..fdc146591d9 100644 --- a/mozilla/network/protocol/pop3/makefile.win +++ b/mozilla/network/protocol/pop3/makefile.win @@ -79,7 +79,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/remote/makefile.win b/mozilla/network/protocol/remote/makefile.win index 1b19089d93b..0e74b9c96e4 100644 --- a/mozilla/network/protocol/remote/makefile.win +++ b/mozilla/network/protocol/remote/makefile.win @@ -76,7 +76,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/smtp/makefile.win b/mozilla/network/protocol/smtp/makefile.win index 2fa7d8f6bbe..9c7257e263c 100644 --- a/mozilla/network/protocol/smtp/makefile.win +++ b/mozilla/network/protocol/smtp/makefile.win @@ -81,7 +81,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/protocol/sockstub/makefile.win b/mozilla/network/protocol/sockstub/makefile.win index 1a55bffe55f..736f91ad401 100644 --- a/mozilla/network/protocol/sockstub/makefile.win +++ b/mozilla/network/protocol/sockstub/makefile.win @@ -84,7 +84,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/network/util/makefile.win b/mozilla/network/util/makefile.win index f9760813b8e..4b459868062 100644 --- a/mozilla/network/util/makefile.win +++ b/mozilla/network/util/makefile.win @@ -86,7 +86,7 @@ LINCS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib symbols:: diff --git a/mozilla/parser/htmlparser/robot/makefile.win b/mozilla/parser/htmlparser/robot/makefile.win index 596bba14c90..0daf31f5e16 100644 --- a/mozilla/parser/htmlparser/robot/makefile.win +++ b/mozilla/parser/htmlparser/robot/makefile.win @@ -55,6 +55,6 @@ LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor -I$(XPDIST)\public\net include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin $(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib diff --git a/mozilla/parser/htmlparser/src/makefile.win b/mozilla/parser/htmlparser/src/makefile.win index 4207727271d..93bba6902fe 100644 --- a/mozilla/parser/htmlparser/src/makefile.win +++ b/mozilla/parser/htmlparser/src/makefile.win @@ -171,7 +171,7 @@ include <$(DEPTH)\config\rules.mak> #export:: $(XPDIST)\include # $(MAKE_INSTALL) $(XPDIST)\include -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/profile/Acct/makefile.win b/mozilla/profile/Acct/makefile.win index 79da0236c75..8309cb276a6 100644 --- a/mozilla/profile/Acct/makefile.win +++ b/mozilla/profile/Acct/makefile.win @@ -114,6 +114,6 @@ LIBRARY=.\$(OBJDIR)\$(LIBNAME).lib #//------------------------------------------------------------------------ include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/profile/src/makefile.win b/mozilla/profile/src/makefile.win index c674db30bf1..1ee5c56b758 100644 --- a/mozilla/profile/src/makefile.win +++ b/mozilla/profile/src/makefile.win @@ -107,6 +107,6 @@ LIBRARY=.\$(OBJDIR)\$(LIBNAME).lib #//------------------------------------------------------------------------ include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/rdf/base/src/makefile.win b/mozilla/rdf/base/src/makefile.win index 08e55a0fc96..293bb0dfdaf 100644 --- a/mozilla/rdf/base/src/makefile.win +++ b/mozilla/rdf/base/src/makefile.win @@ -42,7 +42,7 @@ CPP_OBJS=\ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/rdf/brprof/src/makefile.win b/mozilla/rdf/brprof/src/makefile.win index 7ff8021b62b..3c17cbf7274 100644 --- a/mozilla/rdf/brprof/src/makefile.win +++ b/mozilla/rdf/brprof/src/makefile.win @@ -29,7 +29,7 @@ CPP_OBJS=\ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/rdf/chrome/src/makefile.win b/mozilla/rdf/chrome/src/makefile.win index 5d8b07d3b69..b1160682ace 100644 --- a/mozilla/rdf/chrome/src/makefile.win +++ b/mozilla/rdf/chrome/src/makefile.win @@ -30,7 +30,7 @@ CPP_OBJS=\ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/rdf/content/src/makefile.win b/mozilla/rdf/content/src/makefile.win index 9a92d26d623..2bbd837d025 100644 --- a/mozilla/rdf/content/src/makefile.win +++ b/mozilla/rdf/content/src/makefile.win @@ -65,7 +65,7 @@ LINCS= -I$(DEPTH)\rdf\base\src \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/rdf/datasource/src/makefile.win b/mozilla/rdf/datasource/src/makefile.win index ccd3f06d55d..2d32f951314 100644 --- a/mozilla/rdf/datasource/src/makefile.win +++ b/mozilla/rdf/datasource/src/makefile.win @@ -39,7 +39,7 @@ LINCS= -I$(DEPTH)\rdf\base\src \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/rdf/util/src/makefile.win b/mozilla/rdf/util/src/makefile.win index 56503db52e9..276af74b8e9 100644 --- a/mozilla/rdf/util/src/makefile.win +++ b/mozilla/rdf/util/src/makefile.win @@ -32,7 +32,7 @@ CPP_OBJS=\ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/uriloader/base/makefile.win b/mozilla/uriloader/base/makefile.win index d877a0d999a..4d447ea437b 100644 --- a/mozilla/uriloader/base/makefile.win +++ b/mozilla/uriloader/base/makefile.win @@ -47,7 +47,7 @@ INCS = $(INCS) \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/webshell/embed/ngprefs/win/makefile.win b/mozilla/webshell/embed/ngprefs/win/makefile.win index 666324725c6..29ab43cd507 100644 --- a/mozilla/webshell/embed/ngprefs/win/makefile.win +++ b/mozilla/webshell/embed/ngprefs/win/makefile.win @@ -64,7 +64,7 @@ MODULE = ngprefs include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin $(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib diff --git a/mozilla/widget/src/support/makefile.win b/mozilla/widget/src/support/makefile.win index ebba901450a..fdb663db830 100644 --- a/mozilla/widget/src/support/makefile.win +++ b/mozilla/widget/src/support/makefile.win @@ -56,7 +56,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/widget/src/windows/makefile.win b/mozilla/widget/src/windows/makefile.win index a0609c2c024..33a1dc8c70c 100644 --- a/mozilla/widget/src/windows/makefile.win +++ b/mozilla/widget/src/windows/makefile.win @@ -113,7 +113,7 @@ WIN_LIBS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/widget/src/xpwidgets/makefile.win b/mozilla/widget/src/xpwidgets/makefile.win index fa6fb0bd732..05db0c5c865 100644 --- a/mozilla/widget/src/xpwidgets/makefile.win +++ b/mozilla/widget/src/xpwidgets/makefile.win @@ -64,7 +64,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/widget/timer/src/windows/makefile.win b/mozilla/widget/timer/src/windows/makefile.win index 736bab97250..2a7f8d8ae3c 100644 --- a/mozilla/widget/timer/src/windows/makefile.win +++ b/mozilla/widget/timer/src/windows/makefile.win @@ -48,7 +48,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/xpcom/base/makefile.win b/mozilla/xpcom/base/makefile.win index 0f46a202a72..24125e97cbf 100644 --- a/mozilla/xpcom/base/makefile.win +++ b/mozilla/xpcom/base/makefile.win @@ -97,11 +97,11 @@ CPP_OBJS = \ include <$(DEPTH)\config\rules.mak> -#libs:: $(DLL) +install:: $(DLL) # $(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin # $(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/xpcom/build/makefile.win b/mozilla/xpcom/build/makefile.win index f3f38704a5b..eb07134d8b9 100644 --- a/mozilla/xpcom/build/makefile.win +++ b/mozilla/xpcom/build/makefile.win @@ -96,6 +96,6 @@ WIN_LIBS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin $(MAKE_INSTALL) $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib diff --git a/mozilla/xpcom/components/makefile.win b/mozilla/xpcom/components/makefile.win index ec475e3d74f..8f817b1077c 100644 --- a/mozilla/xpcom/components/makefile.win +++ b/mozilla/xpcom/components/makefile.win @@ -76,7 +76,7 @@ CPP_OBJS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/xpcom/ds/makefile.win b/mozilla/xpcom/ds/makefile.win index 8936c68dd36..0acc426865c 100644 --- a/mozilla/xpcom/ds/makefile.win +++ b/mozilla/xpcom/ds/makefile.win @@ -116,7 +116,7 @@ CPP_OBJS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/xpcom/io/makefile.win b/mozilla/xpcom/io/makefile.win index 79ae6cff34c..c6fca0abea7 100644 --- a/mozilla/xpcom/io/makefile.win +++ b/mozilla/xpcom/io/makefile.win @@ -88,7 +88,7 @@ CPP_OBJS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/xpcom/makefile.win b/mozilla/xpcom/makefile.win index 574a6aa691c..80d51358181 100644 --- a/mozilla/xpcom/makefile.win +++ b/mozilla/xpcom/makefile.win @@ -31,10 +31,13 @@ DIRS= typelib \ threads \ reflect \ proxy \ - appshell \ - tools \ build \ + appshell \ + tools \ sample \ - tests + tests \ + reflect\xptinfo\tests \ + reflect\xptcall\tests \ + proxy\tests include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/proxy/makefile.win b/mozilla/xpcom/proxy/makefile.win index 98c1d8e8bed..67bc32211a1 100644 --- a/mozilla/xpcom/proxy/makefile.win +++ b/mozilla/xpcom/proxy/makefile.win @@ -16,6 +16,7 @@ DEPTH=..\.. -DIRS=public src tests +DIRS=public src +# tests are made later after xpcom.lib is linked include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/proxy/src/makefile.win b/mozilla/xpcom/proxy/src/makefile.win index 1ef9fb13607..aae27fab15f 100644 --- a/mozilla/xpcom/proxy/src/makefile.win +++ b/mozilla/xpcom/proxy/src/makefile.win @@ -39,7 +39,7 @@ OBJS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/xpcom/reflect/xptcall/makefile.win b/mozilla/xpcom/reflect/xptcall/makefile.win index ce851d41ec5..f697c6b2987 100644 --- a/mozilla/xpcom/reflect/xptcall/makefile.win +++ b/mozilla/xpcom/reflect/xptcall/makefile.win @@ -20,6 +20,7 @@ DEPTH=..\..\.. -DIRS=public src tests +DIRS=public src +# tests are made later after xpcom.lib is linked include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/reflect/xptcall/src/makefile.win b/mozilla/xpcom/reflect/xptcall/src/makefile.win index 0d54a4a80ba..93743ddc4c8 100644 --- a/mozilla/xpcom/reflect/xptcall/src/makefile.win +++ b/mozilla/xpcom/reflect/xptcall/src/makefile.win @@ -46,7 +46,7 @@ LCFLAGS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/xpcom/reflect/xptcall/src/md/win32/makefile.win b/mozilla/xpcom/reflect/xptcall/src/md/win32/makefile.win index 7ba457df8a5..1ad0f2cfad5 100644 --- a/mozilla/xpcom/reflect/xptcall/src/md/win32/makefile.win +++ b/mozilla/xpcom/reflect/xptcall/src/md/win32/makefile.win @@ -61,7 +61,7 @@ include <$(DEPTH)\config\rules.mak> asaxp /I..\..\..\public -Fo.\$(OBJDIR)\$(*B).obj $(*B).s !endif -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/xpcom/reflect/xptinfo/makefile.win b/mozilla/xpcom/reflect/xptinfo/makefile.win index 5f6d1621106..0035aafb335 100644 --- a/mozilla/xpcom/reflect/xptinfo/makefile.win +++ b/mozilla/xpcom/reflect/xptinfo/makefile.win @@ -21,6 +21,7 @@ DEPTH=..\..\.. -DIRS=public src tests +DIRS=public src +# tests are made later after xpcom.lib is linked include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/reflect/xptinfo/src/makefile.win b/mozilla/xpcom/reflect/xptinfo/src/makefile.win index 929a305cee0..2c1a91a0f3f 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/makefile.win +++ b/mozilla/xpcom/reflect/xptinfo/src/makefile.win @@ -55,7 +55,7 @@ CPP_OBJS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/xpcom/reflect/xptinfo/tests/makefile.win b/mozilla/xpcom/reflect/xptinfo/tests/makefile.win index e20cc6a476c..4baf2379d85 100644 --- a/mozilla/xpcom/reflect/xptinfo/tests/makefile.win +++ b/mozilla/xpcom/reflect/xptinfo/tests/makefile.win @@ -31,9 +31,9 @@ LCFLAGS=-DUSE_NSREG -DEXPORT_XPTI_API -DWIN32_LEAN_AND_MEAN LINCS=-I$(PUBLIC)\xpcom -LLIBS= \ - $(DIST)\lib\xpcom.lib \ - $(LIBNSPR) \ +LLIBS= \ + $(DIST)\lib\xpcom.lib \ + $(LIBNSPR) \ $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/tests/makefile.win b/mozilla/xpcom/tests/makefile.win index 4ed8340cf66..4bb29ae6a91 100644 --- a/mozilla/xpcom/tests/makefile.win +++ b/mozilla/xpcom/tests/makefile.win @@ -33,7 +33,6 @@ PROG4 = .\$(OBJDIR)\TestID.exe PROG5 = .\$(OBJDIR)\TestServMgr.exe #PROG6 = .\$(OBJDIR)\TimerTest.exe PROG7 = .\$(OBJDIR)\TestAtoms.exe -PROG8 = .\$(OBJDIR)\CvtURL.exe PROG9 = .\$(OBJDIR)\TestCRT.exe PROG10 = .\$(OBJDIR)\FilesTest.exe PROG11 = .\$(OBJDIR)\PropertiesTest.exe @@ -60,26 +59,16 @@ PROGRAMS = $(PROG1) $(PROG3) $(PROG4) $(PROG5) \ $(PROG18) \ $(NULL) -LCFLAGS=-DUSE_NSREG -GX -DNECKO +LCFLAGS=-DUSE_NSREG -GX REQUIRES=libreg LINCS= \ -Iservices \ -!ifdef NECKO - -I$(PUBLIC)\necko \ -!else - -I$(PUBLIC)\netlib \ -!endif -I$(PUBLIC)\xpcom LLIBS= \ $(DIST)\lib\xpcom.lib \ -!ifdef NECKO - $(DIST)\lib\neckoutil_s.lib \ -!else - $(DIST)\lib\netlib.lib \ -!endif $(LIBNSPR) !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) @@ -105,8 +94,6 @@ $(PROG7): $(OBJDIR) TestAtoms.cpp $(PROG10): $(OBJDIR) FilesTest.cpp -$(PROG8): $(OBJDIR) CvtURL.cpp - $(PROG9): $(OBJDIR) TestCRT.cpp $(PROG11): $(OBJDIR) PropertiesTest.cpp diff --git a/mozilla/xpcom/threads/makefile.win b/mozilla/xpcom/threads/makefile.win index 5c0fde142a1..cea171cbf52 100644 --- a/mozilla/xpcom/threads/makefile.win +++ b/mozilla/xpcom/threads/makefile.win @@ -63,7 +63,7 @@ CPP_OBJS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(LIBRARY) +install:: $(LIBRARY) $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib clobber:: diff --git a/mozilla/xpcom/tools/registry/makefile.win b/mozilla/xpcom/tools/registry/makefile.win index fce00024c41..657cdb12cb4 100644 --- a/mozilla/xpcom/tools/registry/makefile.win +++ b/mozilla/xpcom/tools/registry/makefile.win @@ -36,7 +36,6 @@ PROGRAMS = $(PROG1) $(PROG2) LLIBS = \ $(LIBNSPR) \ $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\neckoutil_s.lib \ !if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE) $(GLOWDIR)\glowcode.lib \ !endif diff --git a/mozilla/xpcom/typelib/xpt/tests/makefile.win b/mozilla/xpcom/typelib/xpt/tests/makefile.win index b11fcc5073e..ca12f92b304 100644 --- a/mozilla/xpcom/typelib/xpt/tests/makefile.win +++ b/mozilla/xpcom/typelib/xpt/tests/makefile.win @@ -33,7 +33,7 @@ LCFLAGS=-DWIN32_LEAN_AND_MEAN -DEXPORT_XPT_API -DUSE_NSREG LINCS=-I$(PUBLIC)\xpcom LLIBS= \ - $(DIST)\lib\xpcom.lib \ + $(DIST)\lib\xpcomxpt_s.lib \ $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/typelib/xpt/tools/makefile.win b/mozilla/xpcom/typelib/xpt/tools/makefile.win index 22040d2eb61..cb98385d409 100644 --- a/mozilla/xpcom/typelib/xpt/tools/makefile.win +++ b/mozilla/xpcom/typelib/xpt/tools/makefile.win @@ -33,7 +33,7 @@ LCFLAGS=-DUSE_NSREG -DWIN32_LEAN_AND_MEAN -DEXPORT_XPT_API LINCS=-I$(PUBLIC)\xpcom LLIBS= \ - $(DIST)\lib\xpcom.lib \ + $(DIST)\lib\xpcomxpt_s.lib \ $(NULL) include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpinstall/public/makefile.win b/mozilla/xpinstall/public/makefile.win index 3f4599932d9..edd9cf3d472 100644 --- a/mozilla/xpinstall/public/makefile.win +++ b/mozilla/xpinstall/public/makefile.win @@ -39,7 +39,7 @@ XPIDLSRCS = \ include <$(DEPTH)\config\rules.mak> -libs:: +install:: $(MAKE_INSTALL) .\xpinstall.js $(DIST)\bin\defaults\pref diff --git a/mozilla/xpinstall/stub/makefile.win b/mozilla/xpinstall/stub/makefile.win index 8b08dc4b8ae..41fa74461d8 100644 --- a/mozilla/xpinstall/stub/makefile.win +++ b/mozilla/xpinstall/stub/makefile.win @@ -43,7 +43,7 @@ LINCS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) $(DLL) $(DIST)\bin clobber:: diff --git a/mozilla/xpinstall/wizard/windows/nsinstall/makefile.win b/mozilla/xpinstall/wizard/windows/nsinstall/makefile.win index 597b91508a3..7eb81ee06e4 100644 --- a/mozilla/xpinstall/wizard/windows/nsinstall/makefile.win +++ b/mozilla/xpinstall/wizard/windows/nsinstall/makefile.win @@ -52,7 +52,7 @@ docopy: export:: docopy -libs:: $(PROGRAM) +install:: $(PROGRAM) $(MAKE_INSTALL) $(PROGRAM) $(DIST)\install clobber_all:: diff --git a/mozilla/xpinstall/wizard/windows/nszip/makefile.win b/mozilla/xpinstall/wizard/windows/nszip/makefile.win index f1d364c3577..95a406ea070 100644 --- a/mozilla/xpinstall/wizard/windows/nszip/makefile.win +++ b/mozilla/xpinstall/wizard/windows/nszip/makefile.win @@ -47,7 +47,7 @@ LLFLAGS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(PROGRAM) +install:: $(PROGRAM) $(MAKE_INSTALL) $(PROGRAM) $(DIST)\install clobber_all:: diff --git a/mozilla/xpinstall/wizard/windows/ren8dot3/makefile.win b/mozilla/xpinstall/wizard/windows/ren8dot3/makefile.win index 619b7148ac2..3136dd15270 100644 --- a/mozilla/xpinstall/wizard/windows/ren8dot3/makefile.win +++ b/mozilla/xpinstall/wizard/windows/ren8dot3/makefile.win @@ -34,7 +34,7 @@ OBJS = \ include <$(DEPTH)\config\rules.mak> -libs:: $(PROGRAM) +install:: $(PROGRAM) $(MAKE_INSTALL) $(PROGRAM) $(DIST)\install clobber_all:: diff --git a/mozilla/xpinstall/wizard/windows/setup/makefile.win b/mozilla/xpinstall/wizard/windows/setup/makefile.win index 9ebb2d11afd..632518fa95c 100644 --- a/mozilla/xpinstall/wizard/windows/setup/makefile.win +++ b/mozilla/xpinstall/wizard/windows/setup/makefile.win @@ -51,7 +51,7 @@ WIN_LIBS= \ include <$(DEPTH)\config\rules.mak> -libs:: $(PROGRAM) +install:: $(PROGRAM) $(MAKE_INSTALL) $(PROGRAM) $(DIST)\install $(MAKE_INSTALL) *.html $(DIST)\install diff --git a/mozilla/xpinstall/wizard/windows/setuprsc/makefile.win b/mozilla/xpinstall/wizard/windows/setuprsc/makefile.win index 0d5a5712392..7fe5a9e203a 100644 --- a/mozilla/xpinstall/wizard/windows/setuprsc/makefile.win +++ b/mozilla/xpinstall/wizard/windows/setuprsc/makefile.win @@ -44,7 +44,7 @@ docopy: export:: docopy -libs:: $(DLL) +install:: $(DLL) $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).dll $(DIST)\install clobber::