Eliminated the libs build pass.

2024-10-08 19:04:45 +00:00 · 1999-11-28 03:05:01 +00:00 · 1999-11-28 03:05:01 +00:00 · 96ec037ac6
commit 96ec037ac6
parent 4371911062
158 changed files with 292 additions and 311 deletions
--- a/config/rules.mak
+++ b/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)

--- a/content/events/src/makefile.win
+++ b/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::
--- a/content/html/content/src/makefile.win
+++ b/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::
--- a/content/xml/content/src/makefile.win
+++ b/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::
--- a/content/xml/document/src/makefile.win
+++ b/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::
--- a/content/xsl/document/src/makefile.win
+++ b/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::
--- a/db/mork/src/makefile.win
+++ b/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::
--- a/dbm/src/Makefile.win
+++ b/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


--- a/docshell/base/makefile.win
+++ b/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
--- a/dom/src/base/makefile.win
+++ b/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::
--- a/dom/src/coreDOM/makefile.win
+++ b/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::
--- a/dom/src/css/makefile.win
+++ b/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::
--- a/dom/src/events/makefile.win
+++ b/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::
--- a/dom/src/html/makefile.win
+++ b/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::
--- a/dom/src/range/makefile.win
+++ b/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::
--- a/editor/txmgr/src/makefile.win
+++ b/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

--- a/editor/txtsvc/src/makefile.win
+++ b/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

--- a/embedding/browser/setup/makefile.win
+++ b/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
--- a/embedding/browser/webBrowser/makefile.win
+++ b/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
--- a/expat/makefile.win
+++ b/expat/makefile.win
@ -15,7 +15,7 @@ OBJS=                                          \

 include <$(DEPTH)\config\rules.mak>

-libs:: $(LIBRARY)
+install:: $(LIBRARY)
    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib

 install:: $(LIBRARY)
--- a/expat/xmlparse/makefile.win
+++ b/expat/xmlparse/makefile.win
@ -40,4 +40,4 @@ LINCS=-I..\xmltok

 include <$(DEPTH)\config\rules.mak>

-libs:: $(OBJDIR) $(OBJS)
+install:: $(OBJDIR) $(OBJS)
--- a/expat/xmltok/makefile.win
+++ b/expat/xmltok/makefile.win
@ -35,4 +35,4 @@ CPP_OBJS=				\

 include <$(DEPTH)\config\rules.mak>

-libs:: $(OBJDIR) $(OBJS)
+install:: $(OBJDIR) $(OBJS)
--- a/extensions/transformiix/source/base/makefile.win
+++ b/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::
--- a/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
+++ b/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::
--- a/extensions/transformiix/source/xml/makefile.win
+++ b/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::
--- a/extensions/transformiix/source/xsl/expr/makefile.win
+++ b/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::
--- a/extensions/transformiix/source/xsl/makefile.win
+++ b/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::
--- a/extensions/transformiix/source/xsl/util/makefile.win
+++ b/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::
--- a/extensions/wallet/build/makefile.win
+++ b/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
--- a/extensions/wallet/cookieviewer/makefile.win
+++ b/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::
--- a/extensions/wallet/editor/makefile.win
+++ b/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::
--- a/extensions/wallet/signonviewer/makefile.win
+++ b/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::
--- a/extensions/wallet/src/makefile.win
+++ b/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::
--- a/extensions/wallet/walletpreview/makefile.win
+++ b/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::
--- a/gc/boehm/makefile.win
+++ b/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::
--- a/gfx/src/makefile.win
+++ b/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
--- a/gfx/src/windows/makefile.win
+++ b/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
--- a/htmlparser/robot/makefile.win
+++ b/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
--- a/htmlparser/src/makefile.win
+++ b/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

--- a/intl/chardet/src/classic/makefile.win
+++ b/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

--- a/intl/chardet/src/makefile.win
+++ b/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

--- a/intl/chardet/src/windows/makefile.win
+++ b/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

--- a/intl/compatibility/src/makefile.win
+++ b/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

--- a/intl/locale/src/makefile.win
+++ b/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
+	
--- a/intl/locale/src/windows/makefile.win
+++ b/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
--- a/intl/lwbrk/src/makefile.win
+++ b/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

--- a/jpeg/makefile.win
+++ b/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)

--- a/js/src/liveconnect/makefile.win
+++ b/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

--- a/layout/base/src/makefile.win
+++ b/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::
--- a/layout/events/src/makefile.win
+++ b/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::
--- a/layout/html/base/src/makefile.win
+++ b/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::
--- a/layout/html/content/src/makefile.win
+++ b/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::
--- a/layout/html/document/src/makefile.win
+++ b/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
--- a/layout/html/forms/src/makefile.win
+++ b/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::
--- a/layout/html/makefile.win
+++ b/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>
--- a/layout/html/style/src/makefile.win
+++ b/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::
--- a/layout/html/table/src/makefile.win
+++ b/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::
--- a/layout/makefile.win
+++ b/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>
--- a/layout/mathml/base/src/makefile.win
+++ b/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::
--- a/layout/mathml/content/src/makefile.win
+++ b/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::
--- a/layout/xml/content/src/makefile.win
+++ b/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::
--- a/layout/xml/document/src/makefile.win
+++ b/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::
--- a/layout/xsl/document/src/makefile.win
+++ b/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::
--- a/layout/xul/base/src/makefile.win
+++ b/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::
--- a/layout/xul/content/src/makefile.win
+++ b/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::
--- a/mailnews/addrbook/src/makefile.win
+++ b/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::
--- a/mailnews/base/search/src/makefile.win
+++ b/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::
--- a/mailnews/base/src/makefile.win
+++ b/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::
--- a/mailnews/base/util/makefile.win
+++ b/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
--- a/mailnews/compose/src/makefile.win
+++ b/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::
--- a/mailnews/db/msgdb/src/makefile.win
+++ b/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::
--- a/mailnews/imap/src/makefile.win
+++ b/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::
--- a/mailnews/local/src/makefile.win
+++ b/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::
--- a/mailnews/mapi/lib/Makefile.win
+++ b/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::
--- a/mailnews/mime/abstatus/src/makefile.win
+++ b/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::
--- a/mailnews/mime/emitters/src/makefile.win
+++ b/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::
--- a/mailnews/mime/src/makefile.win
+++ b/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
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
--- a/mailnews/news/src/makefile.win
+++ b/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::
--- a/makefile.win
+++ b/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>

 #//------------------------------------------------------------------------
 #//
--- a/modules/libjar/standalone/makefile.win
+++ b/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::
--- a/modules/libpref/admin/makefile.win
+++ b/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

--- a/modules/libpref/src/makefile.win
+++ b/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
--- a/modules/libutil/src/makefile.win
+++ b/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\
--- a/modules/security/freenav/makefile.win
+++ b/modules/security/freenav/makefile.win
@ -96,4 +96,4 @@ install:: $(LIBRARY)

 export:: INSTALL_FILES

-libs:: install
+install:: install
--- a/modules/zlib/standalone/makefile.win
+++ b/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::
--- a/netwerk/base/src/makefile.win
+++ b/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::
--- a/netwerk/dns/src/makefile.win
+++ b/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::
--- a/netwerk/makefile.win
+++ b/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>
--- a/netwerk/socket/base/makefile.win
+++ b/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::
--- a/netwerk/util/src/makefile.win
+++ b/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::
--- a/network/cache/makefile.win
+++ b/network/cache/makefile.win
@ -104,7 +104,7 @@ LINCS= \

 include <$(DEPTH)\config\rules.mak> 

-libs:: $(LIBRARY)
+install:: $(LIBRARY)
    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib


--- a/network/cache/nu/src/makefile.win
+++ b/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
--- a/network/client/makefile.win
+++ b/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::
--- a/network/cnvts/makefile.win
+++ b/network/cnvts/makefile.win
@ -122,7 +122,7 @@ LINCS= \

 include <$(DEPTH)\config\rules.mak> 

-libs:: $(LIBRARY)
+install:: $(LIBRARY)
 	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib

 symbols::
--- a/network/cstream/makefile.win
+++ b/network/cstream/makefile.win
@ -81,7 +81,7 @@ LINCS= \

 include <$(DEPTH)\config\rules.mak> 

-libs:: $(LIBRARY)
+install:: $(LIBRARY)

 install::
    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
--- a/network/main/makefile.win
+++ b/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


--- a/network/mimetype/makefile.win
+++ b/network/mimetype/makefile.win
@ -75,7 +75,7 @@ LINCS= \

 include <$(DEPTH)\config\rules.mak> 

-libs:: $(LIBRARY)
+install:: $(LIBRARY)
    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib


--- a/network/module/makefile.win
+++ b/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
--- a/network/protocol/about/makefile.win
+++ b/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::
--- a/network/protocol/certld/makefile.win
+++ b/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::
--- a/Show More
+++ b/Show More