diff --git a/mozilla/caps/src/makefile.win b/mozilla/caps/src/makefile.win index 323af419d74..4c160e70545 100755 --- a/mozilla/caps/src/makefile.win +++ b/mozilla/caps/src/makefile.win @@ -15,8 +15,6 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 - #//------------------------------------------------------------------------ #// @@ -112,7 +110,7 @@ LLIBS = \ $(DIST)\lib\libplc21.lib \ $(DIST)\lib\xpcom32.lib \ $(DIST)\lib\xplib.lib \ - $(ZIPLIB) \ + $(DIST)\lib\zip3250.lib \ $(NULL) diff --git a/mozilla/config/WIN32 b/mozilla/config/WIN32 index c2a25cbfeb0..3e8e27028c2 100644 --- a/mozilla/config/WIN32 +++ b/mozilla/config/WIN32 @@ -54,12 +54,12 @@ JAVAH_PROG = $(JAVA) netscape.tools.jric.Main # # Uncomment for MSVC debug malloc logging... # -#OPTIMIZER=-Z7 -DDEBUG -UNDEBUG -D_DEBUG -D_CRTDBG_MAP_ALLOC -OPTIMIZER=-Z7 -DDEBUG -UNDEBUG -D_DEBUG +#OPTIMIZER=-Zi -DDEBUG -UNDEBUG -D_DEBUG -D_CRTDBG_MAP_ALLOC +OPTIMIZER=-Zi -DDEBUG -UNDEBUG -D_DEBUG !if defined(GLOWCODE) && "$(MOZ_BITS)"=="32" OS_LFLAGS=/DEBUG /DEBUGTYPE:BOTH /INCLUDE:_GlowCode /PDB:NONE !else -OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:NONE +OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:$(PDBFILE) !endif !else @@ -69,7 +69,7 @@ OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:NONE # compiler optimization bugs !ifdef MOZ_DEBUGOPT -OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:NONE /opt:ref +OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:$(PDBFILE) /opt:ref OPTIMIZER=/Zi -O1 -UDEBUG -DNDEBUG !else # MOZ_DEBUG not set. @@ -83,22 +83,6 @@ OS_LFLAGS= !endif # MOZ_DEBUG -# Replace optimizer and pdb related flags to use our own conventions -!ifdef LIBRARY_NAME -!ifdef MOZ_DEBUG -OPTIMIZER=-Zi -DDEBUG -UNDEBUG -D_DEBUG -OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:$(LIBRARY_NAME) -!endif -!endif - -# Replace optimizer and pdb related flags to use our own conventions -!ifdef DLLNAME -!ifdef MOZ_DEBUG -OPTIMIZER=-Zi -DDEBUG -UNDEBUG -D_DEBUG -OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:$(DLLNAME) -!endif -!endif - #//------------------------------------------------------------------------ #// #// Select the correct RTL to link... diff --git a/mozilla/config/config.mak b/mozilla/config/config.mak index efcae5c649b..bebb32ff710 100644 --- a/mozilla/config/config.mak +++ b/mozilla/config/config.mak @@ -377,7 +377,6 @@ MOD_JBN=jbn$(MOZ_BITS)$(VERSION_NUMBER) MOD_NSC=nsc$(MOZ_BITS)$(VERSION_NUMBER) MOD_JPW=jpw$(MOZ_BITS)$(VERSION_NUMBER) MOD_JDB=jdb$(MOZ_BITS)$(VERSION_NUMBER) -MOD_ZIP=zip$(MOZ_BITS)$(VERSION_NUMBER) MOD_ZPW=zpw$(MOZ_BITS)$(VERSION_NUMBER) MOD_CON=con$(MOZ_BITS)$(VERSION_NUMBER) MOD_NPJ=npj$(MOZ_BITS)$(VERSION_NUMBER) @@ -393,12 +392,11 @@ JBNDLL=$(MOD_JBN).$(DLL_SUFFIX) NSCDLL=$(MOD_NSC).$(DLL_SUFFIX) JPWDLL=$(MOD_JPW).$(DLL_SUFFIX) JDBDLL=$(MOD_JDB).$(DLL_SUFFIX) -ZIPDLL=$(MOD_ZIP).$(DLL_SUFFIX) ZPWDLL=$(MOD_ZPW).$(DLL_SUFFIX) CONDLL=$(MOD_CON).$(DLL_SUFFIX) NPJDLL=$(MOD_NPJ).$(DLL_SUFFIX) -ZIPLIB=$(DIST)\lib\$(MOD_ZIP).$(LIB_SUFFIX) +ZIPLIB=$(DIST)\lib\$(MOD_ZIP) AWTLIB=$(DIST)\lib\$(MOD_AWT).$(LIB_SUFFIX) ###################################################################### diff --git a/mozilla/config/rules.mak b/mozilla/config/rules.mak index 0423c6d2efc..ed869715fee 100644 --- a/mozilla/config/rules.mak +++ b/mozilla/config/rules.mak @@ -146,6 +146,25 @@ LFLAGS=$(EXE_LFLAGS) $(LFLAGS) OS_LIBS=$(EXE_LIBS) $(OS_LIBS) !endif +#//------------------------------------------------------------------------ +#// +#// Use various library names as default name for PDB Files +#// +#// LIBRARY_NAME - Static Library +#// DLLNAME - Dynamic Load Library +#// +#// +#//------------------------------------------------------------------------ + +# Replace optimizer and pdb related flags to use our own conventions +!ifdef LIBRARY_NAME +PDBFILE=$(LIBRARY_NAME) +!endif + +# Replace optimizer and pdb related flags to use our own conventions +!ifdef DLLNAME +PDBFILE=$(DLLNAME) +!endif #//------------------------------------------------------------------------ #// @@ -158,7 +177,7 @@ OS_LIBS=$(EXE_LIBS) $(OS_LIBS) !ifdef PDBFILE PDBFILE=.\$(OBJDIR)\$(PDBFILE) !else -PDBFILE=NONE +PDBFILE=.\$(OBJDIR)\default !endif !ifdef RESFILE RESFILE=.\$(OBJDIR)\$(RESFILE) diff --git a/mozilla/gfx/tests/btest/makefile.win b/mozilla/gfx/tests/btest/makefile.win index 415fb1dbfbd..22622b2303a 100644 --- a/mozilla/gfx/tests/btest/makefile.win +++ b/mozilla/gfx/tests/btest/makefile.win @@ -53,7 +53,7 @@ clobber:: $(INCS) $(LLIBS) $(OS_LIBS) - -Fd$(PBDFILE) + -Fd.\$(OBJDIR)\ -Fe.\$(OBJDIR)\ -Fo.\$(OBJDIR)\ $(CURDIR)$(*B).cpp diff --git a/mozilla/gfx/tests/makefile.win b/mozilla/gfx/tests/makefile.win index b6fb6e091d8..44a1b06a143 100644 --- a/mozilla/gfx/tests/makefile.win +++ b/mozilla/gfx/tests/makefile.win @@ -57,7 +57,7 @@ clobber:: $(INCS) $(LLIBS) $(OS_LIBS) - -Fd$(PBDFILE) + -Fd.\$(OBJDIR)\ -Fe.\$(OBJDIR)\ -Fo.\$(OBJDIR)\ $(CURDIR)$(*B).cpp diff --git a/mozilla/layout/html/tests/makefile.win b/mozilla/layout/html/tests/makefile.win index 5e9f56d6f54..a8a5d3897f2 100644 --- a/mozilla/layout/html/tests/makefile.win +++ b/mozilla/layout/html/tests/makefile.win @@ -88,9 +88,7 @@ clobber:: $(INCS) $(LLIBS) $(OS_LIBS) -!ifdef MOZ_DEBUG - -Fd.\$(OBJDIR)\$(CURDIR)$(*B) -!endif + -Fd.\$(OBJDIR)\ -Fe.\$(OBJDIR)\ -Fo.\$(OBJDIR)\ $(CURDIR)$(*B).cpp diff --git a/mozilla/mailnews/base/build/makefile.win b/mozilla/mailnews/base/build/makefile.win index 4ff5ea2f713..d910e5a6401 100644 --- a/mozilla/mailnews/base/build/makefile.win +++ b/mozilla/mailnews/base/build/makefile.win @@ -14,7 +14,6 @@ # Reserved. NODEPEND=1 -IGNORE_MANIFEST = 1 #//------------------------------------------------------------------------ #// @@ -57,8 +56,7 @@ OBJS= \ #// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...) #// #//------------------------------------------------------------------------ -DLLNAME=mailnews.dll -PDBFILE=mailnews.pdb +DLLNAME=mailnews MAPFILE=mailnews.map # DEFFILE=msg.def @@ -70,7 +68,7 @@ MAPFILE=mailnews.map #// #//------------------------------------------------------------------------ -DLL=.\$(OBJDIR)\$(DLLNAME) +DLL=.\$(OBJDIR)\$(DLLNAME).dll #//------------------------------------------------------------------------ #// @@ -115,10 +113,9 @@ LINCS=$(LINCS) -I, \ include <$(DEPTH)/config/rules.mak> install:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME) $(DIST)\bin -# $(MAKE_INSTALL) .\$(OBJDIR)\$(LIBNAME) $(DIST)\lib + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin clobber:: rm -f $(DIST)\bin\$(DLLNAME) -# rm -f $(DIST)\lib\$(LIBNAME) + diff --git a/mozilla/mailnews/compose/build/makefile.win b/mozilla/mailnews/compose/build/makefile.win index 60bcbb628aa..e8509e76f09 100644 --- a/mozilla/mailnews/compose/build/makefile.win +++ b/mozilla/mailnews/compose/build/makefile.win @@ -14,7 +14,6 @@ # Reserved. NODEPEND=1 -IGNORE_MANIFEST = 1 #//------------------------------------------------------------------------ #// @@ -57,8 +56,7 @@ OBJS= \ #// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...) #// #//------------------------------------------------------------------------ -DLLNAME=msgcompose.dll -PDBFILE=msgcompose.pdb +DLLNAME=msgcompose MAPFILE=msgcompose.map # DEFFILE=msg.def @@ -70,7 +68,7 @@ MAPFILE=msgcompose.map #// #//------------------------------------------------------------------------ -DLL=.\$(OBJDIR)\$(DLLNAME) +DLL=.\$(OBJDIR)\$(DLLNAME).dll #//------------------------------------------------------------------------ #// @@ -114,10 +112,8 @@ LINCS=$(LINCS) -I, \ include <$(DEPTH)/config/rules.mak> install:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME) $(DIST)\bin -# $(MAKE_INSTALL) .\$(OBJDIR)\$(LIBNAME) $(DIST)\lib + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin clobber:: rm -f $(DIST)\bin\$(DLLNAME) -# rm -f $(DIST)\lib\$(LIBNAME) diff --git a/mozilla/mailnews/mime/cthandlers/calendar/makefile.win b/mozilla/mailnews/mime/cthandlers/calendar/makefile.win index b6067045784..d4ab56c20ee 100644 --- a/mozilla/mailnews/mime/cthandlers/calendar/makefile.win +++ b/mozilla/mailnews/mime/cthandlers/calendar/makefile.win @@ -14,7 +14,6 @@ # Reserved. # NODEPEND=1 -IGNORE_MANIFEST = 1 # # mimect-cal.dll @@ -61,9 +60,7 @@ OBJS= \ #// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...) #// #//------------------------------------------------------------------------ -DLLNAME=$(MODULE).dll -LIBNAME=$(MODULE).lib -PDBFILE=$(MODULE).pdb +DLLNAME=$(MODULE) MAPFILE=$(MODULE).map DEFFILE=$(MODULE).def @@ -74,7 +71,7 @@ DEFFILE=$(MODULE).def #// #//------------------------------------------------------------------------ # -DLL=.\$(OBJDIR)\$(DLLNAME) +DLL=.\$(OBJDIR)\$(DLLNAME).dll #//------------------------------------------------------------------------ #// @@ -110,7 +107,7 @@ LINCS=$(LINCS) -I. \ include <$(DEPTH)/config/rules.mak> install:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME) $(DIST)\bin\mimeplugins + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\mimeplugins clobber:: - rm -f $(DIST)\bin\$(DLLNAME) + rm -f $(DIST)\bin\$(DLLNAME).dll diff --git a/mozilla/mailnews/mime/cthandlers/vcard/makefile.win b/mozilla/mailnews/mime/cthandlers/vcard/makefile.win index 9a37135c96b..5db21cf2fc3 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/makefile.win +++ b/mozilla/mailnews/mime/cthandlers/vcard/makefile.win @@ -67,8 +67,7 @@ OBJS= \ #// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...) #// #//------------------------------------------------------------------------ -DLLNAME=$(MODULE).dll -LIBNAME=$(MODULE).lib +DLLNAME=$(MODULE) PDBFILE=$(MODULE).pdb MAPFILE=$(MODULE).map DEFFILE=$(MODULE).def @@ -80,7 +79,7 @@ DEFFILE=$(MODULE).def #// #//------------------------------------------------------------------------ # -DLL=.\$(OBJDIR)\$(DLLNAME) +DLL=.\$(OBJDIR)\$(DLLNAME).dll #//------------------------------------------------------------------------ #// @@ -126,7 +125,7 @@ LINCS=$(LINCS) -I. \ include <$(DEPTH)/config/rules.mak> install:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME) $(DIST)\bin\mimeplugins + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\mimeplugins clobber:: rm -f $(DIST)\bin\$(DLLNAME) diff --git a/mozilla/mailnews/mime/src/makefile.win b/mozilla/mailnews/mime/src/makefile.win index ed3758a37ae..2f31de04c12 100644 --- a/mozilla/mailnews/mime/src/makefile.win +++ b/mozilla/mailnews/mime/src/makefile.win @@ -14,7 +14,6 @@ # Reserved. # NODEPEND=1 -IGNORE_MANIFEST = 1 # # MIME.DLL @@ -126,9 +125,8 @@ OBJS= \ #// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...) #// #//------------------------------------------------------------------------ -DLLNAME=$(MODULE).dll -LIBNAME=$(MODULE).lib -PDBFILE=$(MODULE).pdb +DLLNAME=$(MODULE) +LIBNAME=$(MODULE) MAPFILE=$(MODULE).map DEFFILE=$(MODULE).def @@ -139,7 +137,7 @@ DEFFILE=$(MODULE).def #// #//------------------------------------------------------------------------ # -DLL=.\$(OBJDIR)\$(DLLNAME) +DLL=.\$(OBJDIR)\$(DLLNAME).dll #//------------------------------------------------------------------------ #// @@ -188,8 +186,8 @@ LINCS=$(LINCS) -I. \ include <$(DEPTH)/config/rules.mak> install:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME) $(DIST)\bin - $(MAKE_INSTALL) .\$(OBJDIR)\$(LIBNAME) $(DIST)\lib + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin + $(MAKE_INSTALL) .\$(OBJDIR)\$(LIBNAME).lib $(DIST)\lib $(MAKE_INSTALL) .\$(CSS) $(DIST)\bin\res $(MAKE_INSTALL) .\$(JS) $(DIST)\bin\res diff --git a/mozilla/mailnews/ui/compose/src/Makefile.win b/mozilla/mailnews/ui/compose/src/Makefile.win index 19f835108c4..8295c4bc64e 100644 --- a/mozilla/mailnews/ui/compose/src/Makefile.win +++ b/mozilla/mailnews/ui/compose/src/Makefile.win @@ -17,7 +17,6 @@ DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 MAKE_OBJ_TYPE = DLL MODULE=compose @@ -26,9 +25,9 @@ EXPORTS = \ nsJScomposeAppCore.h \ $(NULL) -DLLNAME=compose.dll -LIBNAME=compose.lib -DLL=.\$(OBJDIR)\$(DLLNAME) +DLLNAME=compose +LIBNAME=compose +DLL=.\$(OBJDIR)\$(DLLNAME).dll DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN @@ -80,10 +79,10 @@ LLIBS = \ include <$(DEPTH)\config\rules.mak> clobber:: - rm -f $(DIST)\lib\$(LIBNAME) - rm -f $(DIST)\bin\$(DLLNAME) + rm -f $(DIST)\lib\$(LIBNAME).dll + rm -f $(DIST)\bin\$(DLLNAME).lib install:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME) $(DIST)\bin - $(MAKE_INSTALL) .\$(OBJDIR)\$(LIBNAME) $(DIST)\lib + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin + $(MAKE_INSTALL) .\$(OBJDIR)\$(LIBNAME).lib $(DIST)\lib $(MAKE_INSTALL) $(DLL) $(DIST)\bin diff --git a/mozilla/mailnews/ui/messenger/src/makefile.win b/mozilla/mailnews/ui/messenger/src/makefile.win index 458e18623b5..704332fb696 100644 --- a/mozilla/mailnews/ui/messenger/src/makefile.win +++ b/mozilla/mailnews/ui/messenger/src/makefile.win @@ -17,7 +17,6 @@ DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 MAKE_OBJ_TYPE = DLL MODULE=messenger @@ -26,9 +25,9 @@ EXPORTS = \ nsJSMsgAppCore.h \ $(NULL) -DLLNAME=messenger.dll -LIBNAME=messenger.lib -DLL=.\$(OBJDIR)\$(DLLNAME) +DLLNAME=messenger +LIBNAME=messenger +DLL=.\$(OBJDIR)\$(DLLNAME).dll DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN @@ -78,10 +77,10 @@ LLIBS = \ include <$(DEPTH)\config\rules.mak> clobber:: - rm -f $(DIST)\lib\$(LIBNAME) - rm -f $(DIST)\bin\$(DLLNAME) + rm -f $(DIST)\lib\$(LIBNAME).dll + rm -f $(DIST)\bin\$(DLLNAME).lib install:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME) $(DIST)\bin - $(MAKE_INSTALL) .\$(OBJDIR)\$(LIBNAME) $(DIST)\lib + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin + $(MAKE_INSTALL) .\$(OBJDIR)\$(LIBNAME).lib $(DIST)\lib $(MAKE_INSTALL) $(DLL) $(DIST)\bin diff --git a/mozilla/modules/zlib/src/makefile.win b/mozilla/modules/zlib/src/makefile.win index 73b6718a9df..2b83aa8c444 100644 --- a/mozilla/modules/zlib/src/makefile.win +++ b/mozilla/modules/zlib/src/makefile.win @@ -17,9 +17,7 @@ # - NODEPEND=1 -IGNORE_MANIFEST = 1 #//------------------------------------------------------------------------ #// @@ -47,13 +45,8 @@ MAKE_OBJ_TYPE=DLL #// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...) #// #//------------------------------------------------------------------------ -DLLNAME=$(ZIPDLL) -#PDBFILE=$(MOD_ZIP).pdb +DLLNAME=zip$(MOZ_BITS)$(VERSION_NUMBER) MAPFILE=$(MOD_ZIP).map -!if "$(MOZ_BITS)" == "16" -DEFFILE=zip16.def -!endif -#RESFILE=zip.res #//------------------------------------------------------------------------ #// @@ -84,7 +77,7 @@ OBJS= \ #// #//------------------------------------------------------------------------ -DLL=.\$(OBJDIR)\$(DLLNAME) +DLL=.\$(OBJDIR)\$(DLLNAME).dll MAPFILE= $(MOD_ZIP).map @@ -111,5 +104,7 @@ LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib include <$(DEPTH)/config/rules.mak> export:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME) $(DIST)\bin - $(MAKE_INSTALL) .\$(OBJDIR)\$(MOD_ZIP).lib $(DIST)\lib + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib + + diff --git a/mozilla/network/module/makefile.win b/mozilla/network/module/makefile.win index 4147530ef80..4a90d4ed678 100644 --- a/mozilla/network/module/makefile.win +++ b/mozilla/network/module/makefile.win @@ -51,8 +51,7 @@ MAKE_OBJ_TYPE=DLL #// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...) #// #//------------------------------------------------------------------------ -DLLNAME=netlib.dll -PDBFILE=netlib.pdb +DLLNAME=netlib MAPFILE=netlib.map DEFFILE=net.def @@ -84,7 +83,7 @@ OBJS= \ #// #//------------------------------------------------------------------------ -DLL=.\$(OBJDIR)\$(DLLNAME) +DLL=.\$(OBJDIR)\$(DLLNAME).dll #//------------------------------------------------------------------------ #// @@ -166,7 +165,7 @@ include <$(DEPTH)/config/rules.mak> $(DLL): $(NETLIBS) libs:: $(DLL) - $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME) $(DIST)\bin + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin $(MAKE_INSTALL) .\$(OBJDIR)\netlib.lib $(DIST)\lib $(MAKE_INSTALL) .\res\gopher-audio.gif $(DIST)\bin\res\network $(MAKE_INSTALL) .\res\gopher-binary.gif $(DIST)\bin\res\network