From cfce14ff56565c3d80c90055eba3d9bccfb18404 Mon Sep 17 00:00:00 2001 From: "cyeh%netscape.com" Date: Wed, 1 Sep 1999 01:13:14 +0000 Subject: [PATCH] Remove IGNORE_MANIFEST=1. It doesn't do anything and it confuses people. git-svn-id: svn://10.0.0.236/trunk@45405 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/events/makefile.win | 2 +- mozilla/content/events/public/makefile.win | 2 +- mozilla/content/events/src/makefile.win | 2 +- mozilla/dom/public/base/makefile.win | 2 +- mozilla/dom/public/coreDom/makefile.win | 2 +- mozilla/dom/public/coreEvents/makefile.win | 2 +- mozilla/dom/public/css/makefile.win | 2 +- mozilla/dom/public/events/makefile.win | 2 +- mozilla/dom/public/html/makefile.win | 2 +- mozilla/dom/public/idl/base/makefile.win | 2 +- mozilla/dom/public/idl/coreDom/makefile.win | 2 +- mozilla/dom/public/idl/css/makefile.win | 2 +- mozilla/dom/public/idl/events/makefile.win | 2 +- mozilla/dom/public/idl/html/makefile.win | 2 +- mozilla/dom/public/idl/makefile.win | 2 +- mozilla/dom/public/idl/range/makefile.win | 2 +- mozilla/dom/public/makefile.win | 2 +- mozilla/dom/public/range/makefile.win | 2 +- mozilla/dom/src/base/makefile.win | 2 +- mozilla/dom/src/coreDOM/makefile.win | 2 +- mozilla/dom/src/css/makefile.win | 2 +- mozilla/dom/src/events/makefile.win | 2 +- mozilla/dom/src/html/makefile.win | 2 +- mozilla/dom/src/makefile.win | 2 +- mozilla/dom/src/range/makefile.win | 2 +- mozilla/dom/tools/Makefile.win | 2 +- mozilla/jpeg/makefile.win | 2 +- mozilla/layout/events/makefile.win | 2 +- mozilla/layout/events/public/makefile.win | 2 +- mozilla/layout/events/src/makefile.win | 2 +- mozilla/layout/html/table/public/makefile.win | 5 +++-- mozilla/netwerk/socket/base/makefile.win | 2 +- mozilla/netwerk/streamconv/test/makefile.win | 5 +++-- mozilla/profile/Acct/makefile.win | 2 +- mozilla/profile/makefile.win | 2 +- mozilla/profile/pref-migrator/src/makefile.win | 2 +- mozilla/profile/public/makefile.win | 2 +- mozilla/profile/src/makefile.win | 2 +- mozilla/rdf/content/public/idl/makefile.win | 2 +- mozilla/widget/makefile.win | 2 +- mozilla/widget/public/makefile.win | 2 +- mozilla/widget/src/build/makefile.win | 2 +- mozilla/widget/src/support/makefile.win | 2 +- mozilla/widget/src/windows/makefile.win | 2 +- mozilla/widget/src/xpwidgets/makefile.win | 2 +- mozilla/widget/tests/makefile.win | 2 +- mozilla/widget/tests/scribble/makefile.win | 2 +- mozilla/widget/timer/public/makefile.win | 2 +- mozilla/widget/timer/src/makefile.win | 2 +- mozilla/xpfe/AppCores/idl/makefile.win | 2 +- mozilla/xpfe/AppCores/public/makefile.win | 2 +- mozilla/xpfe/AppCores/src/makefile.win | 2 +- mozilla/xpfe/apprunner/public/makefile.win | 2 +- mozilla/xpfe/apprunner/src/makefile.win | 2 +- mozilla/xpfe/appshell/public/makefile.win | 2 +- mozilla/xpfe/appshell/public/nsBuildID.h | 2 +- mozilla/xpfe/appshell/src/makefile.win | 2 +- mozilla/xpfe/bootstrap/makefile.win | 2 +- mozilla/xpfe/browser/public/makefile.win | 2 +- mozilla/xpfe/browser/resources/locale/makefile.win | 2 +- mozilla/xpfe/browser/resources/makefile.win | 2 +- mozilla/xpfe/browser/samples/makefile.win | 2 +- mozilla/xpfe/browser/samples/sampleimages/makefile.win | 2 +- mozilla/xpfe/browser/src/makefile.win | 2 +- mozilla/xpfe/components/find/public/makefile.win | 2 +- mozilla/xpfe/components/find/resources/makefile.win | 2 +- mozilla/xpfe/components/find/src/makefile.win | 2 +- mozilla/xpfe/components/prefwindow/public/makefile.win | 2 +- .../xpfe/components/prefwindow/resources/locale/makefile.win | 2 +- mozilla/xpfe/components/prefwindow/resources/makefile.win | 2 +- mozilla/xpfe/components/prefwindow/src/makefile.win | 2 +- mozilla/xpfe/components/public/makefile.win | 2 +- mozilla/xpfe/components/sample/public/makefile.win | 2 +- mozilla/xpfe/components/sample/resources/makefile.win | 2 +- mozilla/xpfe/components/sample/src/makefile.win | 2 +- mozilla/xpfe/components/ucth/public/makefile.win | 2 +- mozilla/xpfe/components/ucth/resources/makefile.win | 2 +- mozilla/xpfe/components/ucth/src/makefile.win | 2 +- mozilla/xpfe/components/xfer/public/makefile.win | 2 +- mozilla/xpfe/components/xfer/resources/makefile.win | 1 - mozilla/xpfe/components/xfer/src/makefile.win | 2 +- mozilla/xpfe/global/resources/makefile.win | 2 +- mozilla/xpfe/main/makefile.win | 2 +- mozilla/xpfe/tools/makefile.win | 2 +- 84 files changed, 87 insertions(+), 86 deletions(-) diff --git a/mozilla/content/events/makefile.win b/mozilla/content/events/makefile.win index afb09e0a2bf..c62470482d7 100644 --- a/mozilla/content/events/makefile.win +++ b/mozilla/content/events/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + DIRS=public src diff --git a/mozilla/content/events/public/makefile.win b/mozilla/content/events/public/makefile.win index e4dad490f8e..7714250df8c 100644 --- a/mozilla/content/events/public/makefile.win +++ b/mozilla/content/events/public/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + EXPORTS = \ nsIEventListenerManager.h \ diff --git a/mozilla/content/events/src/makefile.win b/mozilla/content/events/src/makefile.win index 626c0a7bded..67f833c064b 100644 --- a/mozilla/content/events/src/makefile.win +++ b/mozilla/content/events/src/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + include <$(DEPTH)\config\config.mak> diff --git a/mozilla/dom/public/base/makefile.win b/mozilla/dom/public/base/makefile.win index e9294d21c91..7f1f0124259 100644 --- a/mozilla/dom/public/base/makefile.win +++ b/mozilla/dom/public/base/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DEFINES=-D_IMPL_NS_DOM EXPORTS=nsIDOMWindow.h nsIDOMNavigator.h nsIDOMLocation.h nsIDOMNSLocation.h \ diff --git a/mozilla/dom/public/coreDom/makefile.win b/mozilla/dom/public/coreDom/makefile.win index fec08460b7b..7423e79e5e1 100644 --- a/mozilla/dom/public/coreDom/makefile.win +++ b/mozilla/dom/public/coreDom/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DEFINES=-D_IMPL_NS_DOM EXPORTS = \ diff --git a/mozilla/dom/public/coreEvents/makefile.win b/mozilla/dom/public/coreEvents/makefile.win index 3c448751e83..91cc41fbdee 100644 --- a/mozilla/dom/public/coreEvents/makefile.win +++ b/mozilla/dom/public/coreEvents/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DEFINES=-D_IMPL_NS_DOM diff --git a/mozilla/dom/public/css/makefile.win b/mozilla/dom/public/css/makefile.win index cbaed1d5f11..5df20e81776 100644 --- a/mozilla/dom/public/css/makefile.win +++ b/mozilla/dom/public/css/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DEFINES=-D_IMPL_NS_DOM EXPORTS= \ diff --git a/mozilla/dom/public/events/makefile.win b/mozilla/dom/public/events/makefile.win index 52eb06bf733..fc023ca1807 100644 --- a/mozilla/dom/public/events/makefile.win +++ b/mozilla/dom/public/events/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DEFINES=-D_IMPL_NS_DOM EXPORTS=nsINSEvent.h diff --git a/mozilla/dom/public/html/makefile.win b/mozilla/dom/public/html/makefile.win index 97522addaf2..c846f0f944f 100644 --- a/mozilla/dom/public/html/makefile.win +++ b/mozilla/dom/public/html/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DEFINES=-D_IMPL_NS_DOM EXPORTS= \ diff --git a/mozilla/dom/public/idl/base/makefile.win b/mozilla/dom/public/idl/base/makefile.win index 84821a63296..d106a43f790 100644 --- a/mozilla/dom/public/idl/base/makefile.win +++ b/mozilla/dom/public/idl/base/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 + MODULE=raptor diff --git a/mozilla/dom/public/idl/coreDom/makefile.win b/mozilla/dom/public/idl/coreDom/makefile.win index f3f82157110..896a2471992 100644 --- a/mozilla/dom/public/idl/coreDom/makefile.win +++ b/mozilla/dom/public/idl/coreDom/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 + MODULE=raptor diff --git a/mozilla/dom/public/idl/css/makefile.win b/mozilla/dom/public/idl/css/makefile.win index df8a21c9b8a..e1e74515685 100644 --- a/mozilla/dom/public/idl/css/makefile.win +++ b/mozilla/dom/public/idl/css/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 + MODULE=raptor diff --git a/mozilla/dom/public/idl/events/makefile.win b/mozilla/dom/public/idl/events/makefile.win index 16977d34ccc..fbd4d8594ed 100644 --- a/mozilla/dom/public/idl/events/makefile.win +++ b/mozilla/dom/public/idl/events/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 + MODULE=raptor diff --git a/mozilla/dom/public/idl/html/makefile.win b/mozilla/dom/public/idl/html/makefile.win index de7c83dc3e4..89b64a3b83a 100644 --- a/mozilla/dom/public/idl/html/makefile.win +++ b/mozilla/dom/public/idl/html/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 + MODULE=raptor diff --git a/mozilla/dom/public/idl/makefile.win b/mozilla/dom/public/idl/makefile.win index b4ae559672f..0ee0b1d0da8 100644 --- a/mozilla/dom/public/idl/makefile.win +++ b/mozilla/dom/public/idl/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DIRS=coreDom html events css base range diff --git a/mozilla/dom/public/idl/range/makefile.win b/mozilla/dom/public/idl/range/makefile.win index 5a4507ea0c2..9b7811f0bb4 100644 --- a/mozilla/dom/public/idl/range/makefile.win +++ b/mozilla/dom/public/idl/range/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 + MODULE=raptor diff --git a/mozilla/dom/public/makefile.win b/mozilla/dom/public/makefile.win index c1197865f2b..214840ae332 100644 --- a/mozilla/dom/public/makefile.win +++ b/mozilla/dom/public/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + DIRS=base coreDom coreEvents range events html css diff --git a/mozilla/dom/public/range/makefile.win b/mozilla/dom/public/range/makefile.win index 2bcebe96d87..014fbd84afc 100644 --- a/mozilla/dom/public/range/makefile.win +++ b/mozilla/dom/public/range/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DEFINES=-D_IMPL_NS_DOM EXPORTS = \ diff --git a/mozilla/dom/src/base/makefile.win b/mozilla/dom/src/base/makefile.win index b7c5934dfd5..a604e128715 100644 --- a/mozilla/dom/src/base/makefile.win +++ b/mozilla/dom/src/base/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + LIBRARY_NAME=jsdombase_s diff --git a/mozilla/dom/src/coreDOM/makefile.win b/mozilla/dom/src/coreDOM/makefile.win index 3866edaf2e2..32db188d2e2 100644 --- a/mozilla/dom/src/coreDOM/makefile.win +++ b/mozilla/dom/src/coreDOM/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + LIBRARY_NAME=jsdomcore_s MODULE=raptor diff --git a/mozilla/dom/src/css/makefile.win b/mozilla/dom/src/css/makefile.win index 04ce5688440..d304ba4f381 100644 --- a/mozilla/dom/src/css/makefile.win +++ b/mozilla/dom/src/css/makefile.win @@ -2,7 +2,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + LIBRARY_NAME=jsdomcss_s MODULE=raptor diff --git a/mozilla/dom/src/events/makefile.win b/mozilla/dom/src/events/makefile.win index 3acfc80d693..5228a93ea4f 100644 --- a/mozilla/dom/src/events/makefile.win +++ b/mozilla/dom/src/events/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + LIBRARY_NAME=jsdomevents_s MODULE=raptor diff --git a/mozilla/dom/src/html/makefile.win b/mozilla/dom/src/html/makefile.win index 3a46068749d..9eac7dd6e5f 100644 --- a/mozilla/dom/src/html/makefile.win +++ b/mozilla/dom/src/html/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + LIBRARY_NAME=jsdomhtml_s MODULE=raptor diff --git a/mozilla/dom/src/makefile.win b/mozilla/dom/src/makefile.win index bded3b6b6a6..aec856e2fe9 100644 --- a/mozilla/dom/src/makefile.win +++ b/mozilla/dom/src/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + DIRS = base coreDOM html css events range jsurl build diff --git a/mozilla/dom/src/range/makefile.win b/mozilla/dom/src/range/makefile.win index 6e7b03556cd..3cfae883af7 100644 --- a/mozilla/dom/src/range/makefile.win +++ b/mozilla/dom/src/range/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + LIBRARY_NAME=jsdomrange_s MODULE=raptor diff --git a/mozilla/dom/tools/Makefile.win b/mozilla/dom/tools/Makefile.win index 8ba8e3e5918..c8c548f000b 100644 --- a/mozilla/dom/tools/Makefile.win +++ b/mozilla/dom/tools/Makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + MAKE_OBJ_TYPE = EXE PROGRAM = .\$(OBJDIR)\idlc.exe diff --git a/mozilla/jpeg/makefile.win b/mozilla/jpeg/makefile.win index a86707c3626..9204a8e0a25 100644 --- a/mozilla/jpeg/makefile.win +++ b/mozilla/jpeg/makefile.win @@ -17,7 +17,7 @@ # -IGNORE_MANIFEST=1 + MODULE = jpeg EXPORTS = jconfig.h jerror.h jinclude.h jmorecfg.h jpeglib.h jpegint.h jwinfig.h diff --git a/mozilla/layout/events/makefile.win b/mozilla/layout/events/makefile.win index afb09e0a2bf..c62470482d7 100644 --- a/mozilla/layout/events/makefile.win +++ b/mozilla/layout/events/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + DIRS=public src diff --git a/mozilla/layout/events/public/makefile.win b/mozilla/layout/events/public/makefile.win index e4dad490f8e..7714250df8c 100644 --- a/mozilla/layout/events/public/makefile.win +++ b/mozilla/layout/events/public/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + EXPORTS = \ nsIEventListenerManager.h \ diff --git a/mozilla/layout/events/src/makefile.win b/mozilla/layout/events/src/makefile.win index 626c0a7bded..67f833c064b 100644 --- a/mozilla/layout/events/src/makefile.win +++ b/mozilla/layout/events/src/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + include <$(DEPTH)\config\config.mak> diff --git a/mozilla/layout/html/table/public/makefile.win b/mozilla/layout/html/table/public/makefile.win index bc9cfefc24e..07259a2cbda 100644 --- a/mozilla/layout/html/table/public/makefile.win +++ b/mozilla/layout/html/table/public/makefile.win @@ -17,7 +17,7 @@ DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 + MODULE=raptor @@ -26,4 +26,5 @@ EXPORTS = \ nsITableLayout.h \ $(NULL) -include <$(DEPTH)\config\rules.mak> \ No newline at end of file +include <$(DEPTH)\config\rules.mak> + diff --git a/mozilla/netwerk/socket/base/makefile.win b/mozilla/netwerk/socket/base/makefile.win index 5014f632581..b9a5c613294 100644 --- a/mozilla/netwerk/socket/base/makefile.win +++ b/mozilla/netwerk/socket/base/makefile.win @@ -18,7 +18,7 @@ MODULE = necko DEPTH=..\..\.. -IGNORE_MANIFEST=1 + MAKE_OBJ_TYPE = DLL diff --git a/mozilla/netwerk/streamconv/test/makefile.win b/mozilla/netwerk/streamconv/test/makefile.win index 0f18783f773..d20b68859c3 100644 --- a/mozilla/netwerk/streamconv/test/makefile.win +++ b/mozilla/netwerk/streamconv/test/makefile.win @@ -26,7 +26,7 @@ LLIBS= \ DEPTH=..\..\.. -IGNORE_MANIFEST=1 + include <$(DEPTH)/config/config.mak> @@ -54,4 +54,5 @@ install:: $(PROGRAM) $(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin clobber:: - rm -f $(DIST)\bin\TestStreamConv.exe \ No newline at end of file + rm -f $(DIST)\bin\TestStreamConv.exe + diff --git a/mozilla/profile/Acct/makefile.win b/mozilla/profile/Acct/makefile.win index ac52d9ea3eb..f3b797c2571 100644 --- a/mozilla/profile/Acct/makefile.win +++ b/mozilla/profile/Acct/makefile.win @@ -17,7 +17,7 @@ -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// diff --git a/mozilla/profile/makefile.win b/mozilla/profile/makefile.win index d4ac873fde8..62193c78d08 100644 --- a/mozilla/profile/makefile.win +++ b/mozilla/profile/makefile.win @@ -17,7 +17,7 @@ -IGNORE_MANIFEST=1 + DEPTH = ..\ diff --git a/mozilla/profile/pref-migrator/src/makefile.win b/mozilla/profile/pref-migrator/src/makefile.win index 9f02ded69c9..bafa1b3d376 100644 --- a/mozilla/profile/pref-migrator/src/makefile.win +++ b/mozilla/profile/pref-migrator/src/makefile.win @@ -19,7 +19,7 @@ DEPTH=..\..\.. include <$(DEPTH)/config/config.mak> -IGNORE_MANIFEST=1 + MODULE=nsprefm DLL=.\$(OBJDIR)\$(MODULE).dll EXPORTS=nsPrefMigration.h diff --git a/mozilla/profile/public/makefile.win b/mozilla/profile/public/makefile.win index c2aaa3ee88c..9dc1fc88e32 100644 --- a/mozilla/profile/public/makefile.win +++ b/mozilla/profile/public/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # MODULE=profile diff --git a/mozilla/profile/src/makefile.win b/mozilla/profile/src/makefile.win index 2c63c994231..a54899bf657 100644 --- a/mozilla/profile/src/makefile.win +++ b/mozilla/profile/src/makefile.win @@ -17,7 +17,7 @@ -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// diff --git a/mozilla/rdf/content/public/idl/makefile.win b/mozilla/rdf/content/public/idl/makefile.win index 82fe4386afb..456235f424b 100644 --- a/mozilla/rdf/content/public/idl/makefile.win +++ b/mozilla/rdf/content/public/idl/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 + MODULE=rdf diff --git a/mozilla/widget/makefile.win b/mozilla/widget/makefile.win index 07b4de6f365..e265ac4b071 100644 --- a/mozilla/widget/makefile.win +++ b/mozilla/widget/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=.. -IGNORE_MANIFEST=1 + DIRS=public timer src diff --git a/mozilla/widget/public/makefile.win b/mozilla/widget/public/makefile.win index 3b3e34ab31e..aaaa8a87db2 100644 --- a/mozilla/widget/public/makefile.win +++ b/mozilla/widget/public/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + DEFINES=-D_IMPL_NS_UI MODULE=raptor diff --git a/mozilla/widget/src/build/makefile.win b/mozilla/widget/src/build/makefile.win index fc1cddc164a..854bbe14b78 100644 --- a/mozilla/widget/src/build/makefile.win +++ b/mozilla/widget/src/build/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -#IGNORE_MANIFEST=1 +# MODULE=raptor MAKE_OBJ_TYPE = DLL diff --git a/mozilla/widget/src/support/makefile.win b/mozilla/widget/src/support/makefile.win index 28e40f94c8c..c30144ef3d9 100644 --- a/mozilla/widget/src/support/makefile.win +++ b/mozilla/widget/src/support/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -#IGNORE_MANIFEST=1 +# LIBRARY_NAME = widgetsupport_s REQUIRES=xpcom gfxwin raptor dom js network netlib diff --git a/mozilla/widget/src/windows/makefile.win b/mozilla/widget/src/windows/makefile.win index e4fb583d04b..306cfff0ed3 100644 --- a/mozilla/widget/src/windows/makefile.win +++ b/mozilla/widget/src/windows/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -#IGNORE_MANIFEST=1 +# LIBRARY_NAME = raptorwidget_s REQUIRES=xpcom gfxwin raptor dom network netlib diff --git a/mozilla/widget/src/xpwidgets/makefile.win b/mozilla/widget/src/xpwidgets/makefile.win index da88dbc72fc..f5382cf28ba 100644 --- a/mozilla/widget/src/xpwidgets/makefile.win +++ b/mozilla/widget/src/xpwidgets/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -#IGNORE_MANIFEST=1 +# LIBRARY_NAME = raptorbasewidget_s REQUIRES=xpcom gfxwin raptor dom js network netlib diff --git a/mozilla/widget/tests/makefile.win b/mozilla/widget/tests/makefile.win index fca5ccce136..633b80a2a93 100644 --- a/mozilla/widget/tests/makefile.win +++ b/mozilla/widget/tests/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + DIRS=scribble widget diff --git a/mozilla/widget/tests/scribble/makefile.win b/mozilla/widget/tests/scribble/makefile.win index 67fd7851851..de69e860bf5 100644 --- a/mozilla/widget/tests/scribble/makefile.win +++ b/mozilla/widget/tests/scribble/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + MAKE_OBJ_TYPE = EXE diff --git a/mozilla/widget/timer/public/makefile.win b/mozilla/widget/timer/public/makefile.win index 038e46aaa55..f3c6c7f41e6 100644 --- a/mozilla/widget/timer/public/makefile.win +++ b/mozilla/widget/timer/public/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + EXPORTS = \ nsITimer.h \ diff --git a/mozilla/widget/timer/src/makefile.win b/mozilla/widget/timer/src/makefile.win index 55394760a59..80dbd56dd7a 100644 --- a/mozilla/widget/timer/src/makefile.win +++ b/mozilla/widget/timer/src/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DIRS = windows diff --git a/mozilla/xpfe/AppCores/idl/makefile.win b/mozilla/xpfe/AppCores/idl/makefile.win index 4eb1c818d24..b53ae3321d8 100644 --- a/mozilla/xpfe/AppCores/idl/makefile.win +++ b/mozilla/xpfe/AppCores/idl/makefile.win @@ -25,7 +25,7 @@ # run this makefile during development, only. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + !ifndef IDLSRCS IDLSRCS= \ diff --git a/mozilla/xpfe/AppCores/public/makefile.win b/mozilla/xpfe/AppCores/public/makefile.win index 305dfcf6d83..a64c64a2ba5 100644 --- a/mozilla/xpfe/AppCores/public/makefile.win +++ b/mozilla/xpfe/AppCores/public/makefile.win @@ -17,7 +17,7 @@ DEPTH=..\..\.. -IGNORE_MANIFEST=1 + MODULE=appcores diff --git a/mozilla/xpfe/AppCores/src/makefile.win b/mozilla/xpfe/AppCores/src/makefile.win index 0c120b7cb84..b32549cb443 100644 --- a/mozilla/xpfe/AppCores/src/makefile.win +++ b/mozilla/xpfe/AppCores/src/makefile.win @@ -19,7 +19,7 @@ DEPTH=..\..\.. include <$(DEPTH)/config/config.mak> -IGNORE_MANIFEST=1 + MAKE_OBJ_TYPE = DLL MODULE=appcores diff --git a/mozilla/xpfe/apprunner/public/makefile.win b/mozilla/xpfe/apprunner/public/makefile.win index 5448096f832..0a8c0d6ed66 100644 --- a/mozilla/xpfe/apprunner/public/makefile.win +++ b/mozilla/xpfe/apprunner/public/makefile.win @@ -17,7 +17,7 @@ DEPTH=..\..\.. -IGNORE_MANIFEST=1 + MODULE=raptor diff --git a/mozilla/xpfe/apprunner/src/makefile.win b/mozilla/xpfe/apprunner/src/makefile.win index 3d2b122b19c..e46924c8272 100644 --- a/mozilla/xpfe/apprunner/src/makefile.win +++ b/mozilla/xpfe/apprunner/src/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DEFINES=-D_IMPL_NS_APPRUNNER -DWIN32_LEAN_AND_MEAN MODULE=raptor diff --git a/mozilla/xpfe/appshell/public/makefile.win b/mozilla/xpfe/appshell/public/makefile.win index cdb9e032c5d..4dfa26a0685 100644 --- a/mozilla/xpfe/appshell/public/makefile.win +++ b/mozilla/xpfe/appshell/public/makefile.win @@ -17,7 +17,7 @@ DEPTH=..\..\.. -IGNORE_MANIFEST=1 + MODULE=raptor XPIDL_MODULE=appshell diff --git a/mozilla/xpfe/appshell/public/nsBuildID.h b/mozilla/xpfe/appshell/public/nsBuildID.h index 696995db022..4a93c8ae429 100644 --- a/mozilla/xpfe/appshell/public/nsBuildID.h +++ b/mozilla/xpfe/appshell/public/nsBuildID.h @@ -5,4 +5,4 @@ * re-register components. * */ -#define NS_BUILD_ID 0000000000 +#define NS_BUILD_ID 1999083114 diff --git a/mozilla/xpfe/appshell/src/makefile.win b/mozilla/xpfe/appshell/src/makefile.win index 23e8700bbf3..4f9844fdb6f 100644 --- a/mozilla/xpfe/appshell/src/makefile.win +++ b/mozilla/xpfe/appshell/src/makefile.win @@ -18,7 +18,7 @@ DEPTH=..\..\.. include <$(DEPTH)/config/config.mak> -IGNORE_MANIFEST=1 + DEFINES=-D_IMPL_NS_APPSHELL -DWIN32_LEAN_AND_MEAN MODULE=raptor diff --git a/mozilla/xpfe/bootstrap/makefile.win b/mozilla/xpfe/bootstrap/makefile.win index 1bc4577f073..a26230952bd 100644 --- a/mozilla/xpfe/bootstrap/makefile.win +++ b/mozilla/xpfe/bootstrap/makefile.win @@ -18,7 +18,7 @@ DEPTH=..\.. include <$(DEPTH)/config/config.mak> -IGNORE_MANIFEST=1 + DEFINES=-DWIN32_LEAN_AND_MEAN MODULE=raptor diff --git a/mozilla/xpfe/browser/public/makefile.win b/mozilla/xpfe/browser/public/makefile.win index 5d0d9316afb..6adf07a68ac 100644 --- a/mozilla/xpfe/browser/public/makefile.win +++ b/mozilla/xpfe/browser/public/makefile.win @@ -17,7 +17,7 @@ DEPTH=..\..\.. -IGNORE_MANIFEST=1 + MODULE=raptor diff --git a/mozilla/xpfe/browser/resources/locale/makefile.win b/mozilla/xpfe/browser/resources/locale/makefile.win index a34a20e074b..3e847e3c112 100644 --- a/mozilla/xpfe/browser/resources/locale/makefile.win +++ b/mozilla/xpfe/browser/resources/locale/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + DEPTH=..\..\..\.. diff --git a/mozilla/xpfe/browser/resources/makefile.win b/mozilla/xpfe/browser/resources/makefile.win index ae779c94bd2..e2902bc95dc 100644 --- a/mozilla/xpfe/browser/resources/makefile.win +++ b/mozilla/xpfe/browser/resources/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + DEPTH=..\..\.. diff --git a/mozilla/xpfe/browser/samples/makefile.win b/mozilla/xpfe/browser/samples/makefile.win index 59f703de307..0a8c48894c8 100644 --- a/mozilla/xpfe/browser/samples/makefile.win +++ b/mozilla/xpfe/browser/samples/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DIRS=sampleimages include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpfe/browser/samples/sampleimages/makefile.win b/mozilla/xpfe/browser/samples/sampleimages/makefile.win index 3f59a5e2fb1..a69b04dd62c 100644 --- a/mozilla/xpfe/browser/samples/sampleimages/makefile.win +++ b/mozilla/xpfe/browser/samples/sampleimages/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 + include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpfe/browser/src/makefile.win b/mozilla/xpfe/browser/src/makefile.win index ada2a341ce0..e6fd530aa34 100644 --- a/mozilla/xpfe/browser/src/makefile.win +++ b/mozilla/xpfe/browser/src/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DEFINES=-DWIN32_LEAN_AND_MEAN MODULE=raptor diff --git a/mozilla/xpfe/components/find/public/makefile.win b/mozilla/xpfe/components/find/public/makefile.win index fc5c90e1883..2f135191c82 100644 --- a/mozilla/xpfe/components/find/public/makefile.win +++ b/mozilla/xpfe/components/find/public/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + MODULE=xpfe\components diff --git a/mozilla/xpfe/components/find/resources/makefile.win b/mozilla/xpfe/components/find/resources/makefile.win index f377d2ca6ca..68c3d33944c 100644 --- a/mozilla/xpfe/components/find/resources/makefile.win +++ b/mozilla/xpfe/components/find/resources/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + DEPTH=..\..\..\.. diff --git a/mozilla/xpfe/components/find/src/makefile.win b/mozilla/xpfe/components/find/src/makefile.win index e89c28ed9c9..0aca6776be5 100644 --- a/mozilla/xpfe/components/find/src/makefile.win +++ b/mozilla/xpfe/components/find/src/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// diff --git a/mozilla/xpfe/components/prefwindow/public/makefile.win b/mozilla/xpfe/components/prefwindow/public/makefile.win index 384d9c13cf8..9a90824bcac 100644 --- a/mozilla/xpfe/components/prefwindow/public/makefile.win +++ b/mozilla/xpfe/components/prefwindow/public/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + MODULE=prefwindow diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/makefile.win b/mozilla/xpfe/components/prefwindow/resources/locale/makefile.win index 4464105fceb..e6391394cf0 100644 --- a/mozilla/xpfe/components/prefwindow/resources/locale/makefile.win +++ b/mozilla/xpfe/components/prefwindow/resources/locale/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + DEPTH=..\..\..\..\.. diff --git a/mozilla/xpfe/components/prefwindow/resources/makefile.win b/mozilla/xpfe/components/prefwindow/resources/makefile.win index b3701185096..f0e4e454762 100644 --- a/mozilla/xpfe/components/prefwindow/resources/makefile.win +++ b/mozilla/xpfe/components/prefwindow/resources/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + DEPTH=..\..\..\.. diff --git a/mozilla/xpfe/components/prefwindow/src/makefile.win b/mozilla/xpfe/components/prefwindow/src/makefile.win index 6abaf17e1b2..b949c035cd8 100644 --- a/mozilla/xpfe/components/prefwindow/src/makefile.win +++ b/mozilla/xpfe/components/prefwindow/src/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// diff --git a/mozilla/xpfe/components/public/makefile.win b/mozilla/xpfe/components/public/makefile.win index 786640f83e7..eb9b48d13a8 100644 --- a/mozilla/xpfe/components/public/makefile.win +++ b/mozilla/xpfe/components/public/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + MODULE=xpfe\components diff --git a/mozilla/xpfe/components/sample/public/makefile.win b/mozilla/xpfe/components/sample/public/makefile.win index 2f191d725b4..ed79f12716b 100644 --- a/mozilla/xpfe/components/sample/public/makefile.win +++ b/mozilla/xpfe/components/sample/public/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + MODULE=xpfe\components diff --git a/mozilla/xpfe/components/sample/resources/makefile.win b/mozilla/xpfe/components/sample/resources/makefile.win index 03b0cd4bbf7..c9ec7d8abd7 100644 --- a/mozilla/xpfe/components/sample/resources/makefile.win +++ b/mozilla/xpfe/components/sample/resources/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + DEPTH=..\..\..\.. diff --git a/mozilla/xpfe/components/sample/src/makefile.win b/mozilla/xpfe/components/sample/src/makefile.win index 781251e86da..dc01b4de780 100644 --- a/mozilla/xpfe/components/sample/src/makefile.win +++ b/mozilla/xpfe/components/sample/src/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// diff --git a/mozilla/xpfe/components/ucth/public/makefile.win b/mozilla/xpfe/components/ucth/public/makefile.win index 90a30287164..9949c2a1d86 100644 --- a/mozilla/xpfe/components/ucth/public/makefile.win +++ b/mozilla/xpfe/components/ucth/public/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + MODULE=xpfe\components diff --git a/mozilla/xpfe/components/ucth/resources/makefile.win b/mozilla/xpfe/components/ucth/resources/makefile.win index 5166147e5e9..50f8bf68524 100644 --- a/mozilla/xpfe/components/ucth/resources/makefile.win +++ b/mozilla/xpfe/components/ucth/resources/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + DEPTH=..\..\..\.. diff --git a/mozilla/xpfe/components/ucth/src/makefile.win b/mozilla/xpfe/components/ucth/src/makefile.win index 4b7c577cb05..9da4a4641fd 100644 --- a/mozilla/xpfe/components/ucth/src/makefile.win +++ b/mozilla/xpfe/components/ucth/src/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// diff --git a/mozilla/xpfe/components/xfer/public/makefile.win b/mozilla/xpfe/components/xfer/public/makefile.win index dd6705ec121..d967b1608b8 100644 --- a/mozilla/xpfe/components/xfer/public/makefile.win +++ b/mozilla/xpfe/components/xfer/public/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + MODULE=xpfe\components diff --git a/mozilla/xpfe/components/xfer/resources/makefile.win b/mozilla/xpfe/components/xfer/resources/makefile.win index 598a5c773c0..aa16d29979d 100644 --- a/mozilla/xpfe/components/xfer/resources/makefile.win +++ b/mozilla/xpfe/components/xfer/resources/makefile.win @@ -15,7 +15,6 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 DEPTH=..\..\..\.. diff --git a/mozilla/xpfe/components/xfer/src/makefile.win b/mozilla/xpfe/components/xfer/src/makefile.win index 8c9954f9b8e..77de71abcd0 100644 --- a/mozilla/xpfe/components/xfer/src/makefile.win +++ b/mozilla/xpfe/components/xfer/src/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// diff --git a/mozilla/xpfe/global/resources/makefile.win b/mozilla/xpfe/global/resources/makefile.win index 9a549f69cad..7a3903b2d63 100644 --- a/mozilla/xpfe/global/resources/makefile.win +++ b/mozilla/xpfe/global/resources/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + DEPTH=..\..\.. diff --git a/mozilla/xpfe/main/makefile.win b/mozilla/xpfe/main/makefile.win index bc10d3ef068..674ea59cb10 100644 --- a/mozilla/xpfe/main/makefile.win +++ b/mozilla/xpfe/main/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + DEFINES=-DWIN32_LEAN_AND_MEAN MODULE=raptor diff --git a/mozilla/xpfe/tools/makefile.win b/mozilla/xpfe/tools/makefile.win index 5558c48cfd3..85cfa0e7618 100644 --- a/mozilla/xpfe/tools/makefile.win +++ b/mozilla/xpfe/tools/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + DEFINES=-DWIN32_LEAN_AND_MEAN MODULE=raptor