optionally include GlowCode. bug 299200 a:don.

cmd/winfe/mnrcdll/src/makefile.win

@@ -1,46 +0,0 @@
-IGNORE_MANIFEST=1
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-DLLNAME		= mnrc$(MOZ_BITS)
-PDBFILE		= $(DLLNAME).pdb
-MAPFILE		= $(DLLNAME).map
-DLL		=.\$(OBJDIR)\$(DLLNAME).dll
-DEFFILE		= mnrc$(MOZ_BITS).def
-RESFILE		= mnrcdll.res
-MAKE_OBJ_TYPE	= DLL
-
-OBJS = $(OBJS) 
-
-LLIBS = $(DIST)\lib\nsdlg$(MOZ_BITS).lib
-
-MODULE  = mnrcdll
-DEPTH  	= ..\..\..\..
-REQUIRES=mnrcdll coreincl nspr winprefs
-CPPSRCS = mnrcdll.cpp stdafx.cpp 
-
-CPP_OBJS=.\$(OBJDIR)\mnrcdll.obj .\$(OBJDIR)\stdafx.obj
-!if "$(MOZ_BITS)" != "16"
-LINCS=-I$(XPDIST)\public\mnrcdll -I$(XPDIST)\public\coreincl \
-    -I$(XPDIST)\public\nspr -I$(XPDIST)\public\winprefs 
-!endif
-
-!include "$(DEPTH)\config\rules.mak"
-
-libs:: $(DLL)
-       $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
-       $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
-
-

cmd/winfe/prefs/mnpref/src/makefile.win

@@ -1,70 +0,0 @@
-IGNORE_MANIFEST=1
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-
-!if "$(MOZ_BITS)" == "16"
-DLL_CFLAGS=/GA /GEd /GEf /D_WINDLL
-
-!ifndef MOZ_DEBUG
-OPTIMIZER=-O1 -UDEBUG -DNDEBUG
-!endif
-!endif
-
-DLLNAME		= mnpref$(MOZ_BITS)
-PDBFILE		= $(DLLNAME).pdb
-MAPFILE		= $(DLLNAME).map
-DLL		=.\$(OBJDIR)\$(DLLNAME).dll
-DEFFILE		= mnpref$(MOZ_BITS).def
-RESFILE		= mnpref.res
-MAKE_OBJ_TYPE	= DLL
-
-LLIBS = $(DIST)\lib\prefuuid.lib \
-        $(DIST)\lib\dllcom.lib \
-        $(DIST)\lib\nsdlg$(MOZ_BITS).lib \
-	$(DIST)\lib\xppref$(MOZ_BITS).lib
-LLIBS16 = ole2.lib shell.lib commdlg.lib toolhelp.lib
-LLIBS32 = ole32.lib comdlg32.lib shell32.lib uuid.lib
-
-!if "$(_MSC_VER)" != "1100"
-LLIBS32 = $(LLIBS32) uuid2.lib
-!endif
-
-!if "$(MOZ_BITS)" == "32"
-LLIBS = $(LLIBS) $(LLIBS32)
-!else
-LLIBS = $(LLIBS) $(LLIBS16)
-!endif
-
-MODULE=winprefs 
-DEPTH=..\..\..\..\.. 
-REQUIRES=dllcom winprefs pref dbm nspr js security
-CPPSRCS=mnpref.cpp pages.cpp mnpages.cpp offpages.cpp
-CPP_OBJS=.\$(OBJDIR)\mnpref.obj .\$(OBJDIR)\pages.obj \
-    .\$(OBJDIR)\mnpages.obj .\$(OBJDIR)\offpages.obj 
-!if "$(MOZ_BITS)" != "16"
-LINCS=-I$(XPDIST)\public\dllcom -I$(XPDIST)\public\winprefs \
-    -I$(XPDIST)\public\pref -I$(XPDIST)\public\dbm \
-    -I$(XPDIST)\public\nspr -I$(XPDIST)\public\js -I$(XPDIST)\public\security
-!endif
-
-!include "$(DEPTH)\config\rules.mak"
-
-libs:: $(DLL)
-       $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
-!if "$(WINOS)" != "WIN95"
-	   @$(DIST)\bin\dllreg $(DIST)\bin\$(DLLNAME).dll
-!endif
-       $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib

js/jsd/makefile.win

@@ -59,6 +59,10 @@ LLIBS=	$(LIBNSPR) 										\
 		$(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib	\
 		$(DIST)\lib\jrt$(MOZ_BITS)$(VERSION_NUMBER).lib	
 
+!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
+LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
+!endif
+
 
 #//------------------------------------------------------------------------
 #//

modules/softupdt/src/nsdiff/makefile.win

@@ -41,6 +41,9 @@ LINCS= \
    -I$(XPDIST)\public\softupdt \
    -I$(XPDIST)\public\zlib
 !endif
+!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
+LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
+!endif
 
 include <$(DEPTH)\config\rules.mak>
 
@@ -68,4 +71,4 @@ symbols:
 
 crc32.c:  $(DEPTH)/modules/zlib/src/crc32.c
         @$(RM) $@
-        copy $(DEPTH)\modules\zlib\src\crc32.c $@
+        copy $(DEPTH)\modules\zlib\src\crc32.c $@

modules/softupdt/src/nspatch/makefile.win

@@ -39,6 +39,9 @@ C_OBJS=.\$(OBJDIR)\nspatch.obj
 !if "$(MOZ_BITS)" != "16"
 LINCS=-I$(XPDIST)\public\softupdt 
 !endif
+!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
+LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
+!endif
 
 include <$(DEPTH)\config\rules.mak>
 

modules/softupdt/src/unbind/makefile.win

@@ -35,6 +35,9 @@ C_OBJS=.\$(OBJDIR)\nsunbind.obj
 !if "$(MOZ_BITS)" != "16"
 LINCS=-I$(XPDIST)\public\softupdt 
 !endif
+!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
+LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
+!endif
 
 include <$(DEPTH)\config\rules.mak>