diff --git a/modules/libimg/gifcom/makefile.win b/modules/libimg/gifcom/makefile.win index b802e1dcbeeb..32ad496ba4a9 100644 --- a/modules/libimg/gifcom/makefile.win +++ b/modules/libimg/gifcom/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # #------------------------------------------------------------------------ diff --git a/modules/libimg/jpgcom/makefile.win b/modules/libimg/jpgcom/makefile.win index b257cd05c5db..c10d85407bde 100644 --- a/modules/libimg/jpgcom/makefile.win +++ b/modules/libimg/jpgcom/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # #------------------------------------------------------------------------ diff --git a/modules/libimg/png/makefile.win b/modules/libimg/png/makefile.win index 938081431c5e..f82dfaef33ce 100644 --- a/modules/libimg/png/makefile.win +++ b/modules/libimg/png/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # #----------------------------------------- diff --git a/modules/libimg/pngcom/makefile.win b/modules/libimg/pngcom/makefile.win index 0a8475d24c3a..e4a4a59474ce 100644 --- a/modules/libimg/pngcom/makefile.win +++ b/modules/libimg/pngcom/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # #------------------------------------------------------------------------ diff --git a/modules/libimg/public/makefile.win b/modules/libimg/public/makefile.win index 6f2536017e34..b049b8ceabf1 100644 --- a/modules/libimg/public/makefile.win +++ b/modules/libimg/public/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # DEPTH = ..\..\.. diff --git a/modules/libimg/public_com/makefile.win b/modules/libimg/public_com/makefile.win index 55abbfc6fc0d..2058ec956e04 100644 --- a/modules/libimg/public_com/makefile.win +++ b/modules/libimg/public_com/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # DEPTH = ..\..\.. diff --git a/modules/libimg/src/makefile.win b/modules/libimg/src/makefile.win index 046b40b68cef..714f8b8b3a32 100644 --- a/modules/libimg/src/makefile.win +++ b/modules/libimg/src/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # #------------------------------------------------------------------------ diff --git a/modules/libjar/makefile.win b/modules/libjar/makefile.win index 6a0e923468eb..ef13f6c38e93 100644 --- a/modules/libjar/makefile.win +++ b/modules/libjar/makefile.win @@ -21,7 +21,7 @@ # Contributors: # Daniel Veditz -IGNORE_MANIFEST=1 + DIRS=standalone diff --git a/modules/libjar/standalone/makefile.win b/modules/libjar/standalone/makefile.win index 6fa39b0d5b24..ca5fcbf0892f 100644 --- a/modules/libjar/standalone/makefile.win +++ b/modules/libjar/standalone/makefile.win @@ -21,7 +21,6 @@ # Contributors: # Daniel Veditz -IGNORE_MANIFEST=1 MODULE=jar DEPTH=..\..\.. diff --git a/modules/libpref/admin/makefile.win b/modules/libpref/admin/makefile.win index 2f76778de6d2..c1999df10466 100644 --- a/modules/libpref/admin/makefile.win +++ b/modules/libpref/admin/makefile.win @@ -17,7 +17,7 @@ -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// diff --git a/modules/libpref/makefile.win b/modules/libpref/makefile.win index 1db534aaf3e8..c62bb6173911 100644 --- a/modules/libpref/makefile.win +++ b/modules/libpref/makefile.win @@ -17,7 +17,7 @@ -IGNORE_MANIFEST=1 + DEPTH = ..\.. diff --git a/modules/libpref/src/makefile.win b/modules/libpref/src/makefile.win index 9cdbd1d9b494..7bab0b6d3b1e 100644 --- a/modules/libpref/src/makefile.win +++ b/modules/libpref/src/makefile.win @@ -17,7 +17,7 @@ -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// diff --git a/modules/libreg/include/makefile.win b/modules/libreg/include/makefile.win index 079d10b197f2..1021643b437e 100644 --- a/modules/libreg/include/makefile.win +++ b/modules/libreg/include/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # diff --git a/modules/libutil/makefile.win b/modules/libutil/makefile.win index eb4947e104d4..eda21f567307 100644 --- a/modules/libutil/makefile.win +++ b/modules/libutil/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # DEPTH=..\.. diff --git a/modules/libutil/public/makefile.win b/modules/libutil/public/makefile.win index 9db72d41583f..6adf5902bd63 100644 --- a/modules/libutil/public/makefile.win +++ b/modules/libutil/public/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # MODULE=util diff --git a/modules/libutil/src/makefile.win b/modules/libutil/src/makefile.win index 8d1f24d139f1..765705997cbb 100644 --- a/modules/libutil/src/makefile.win +++ b/modules/libutil/src/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # MODULE=util diff --git a/modules/oji/public/makefile.win b/modules/oji/public/makefile.win index 5832c5ec19cd..869ee83ea2b5 100644 --- a/modules/oji/public/makefile.win +++ b/modules/oji/public/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + DEPTH = ..\..\.. diff --git a/modules/oji/src/makefile.win b/modules/oji/src/makefile.win index 509aded5f1bc..ca2aa353ffc7 100644 --- a/modules/oji/src/makefile.win +++ b/modules/oji/src/makefile.win @@ -1,4 +1,4 @@ -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// #// Makefile to build diff --git a/modules/plugin/base/public/makefile.win b/modules/plugin/base/public/makefile.win index 7837e6a463e9..6847e5d61166 100644 --- a/modules/plugin/base/public/makefile.win +++ b/modules/plugin/base/public/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + DEPTH = ..\..\.. diff --git a/modules/plugin/base/src/makefile.win b/modules/plugin/base/src/makefile.win index 96b9111b3cde..9cad9b991708 100644 --- a/modules/plugin/base/src/makefile.win +++ b/modules/plugin/base/src/makefile.win @@ -17,7 +17,7 @@ DEPTH=..\..\.. include <$(DEPTH)/config/config.mak> -IGNORE_MANIFEST=1 + EXPORTS = \ nsPluginsCID.h \ diff --git a/modules/plugin/nglsrc/makefile.win b/modules/plugin/nglsrc/makefile.win index 96b9111b3cde..9cad9b991708 100644 --- a/modules/plugin/nglsrc/makefile.win +++ b/modules/plugin/nglsrc/makefile.win @@ -17,7 +17,7 @@ DEPTH=..\..\.. include <$(DEPTH)/config/config.mak> -IGNORE_MANIFEST=1 + EXPORTS = \ nsPluginsCID.h \ diff --git a/modules/plugin/public/makefile.win b/modules/plugin/public/makefile.win index 7837e6a463e9..6847e5d61166 100644 --- a/modules/plugin/public/makefile.win +++ b/modules/plugin/public/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + DEPTH = ..\..\.. diff --git a/modules/plugin/src/makefile.win b/modules/plugin/src/makefile.win index 83ff08ac7064..146b790c2f4b 100644 --- a/modules/plugin/src/makefile.win +++ b/modules/plugin/src/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + DEPTH= ..\..\.. diff --git a/modules/security/freenav/makefile.win b/modules/security/freenav/makefile.win index 67664238ab50..9f3c834caeec 100644 --- a/modules/security/freenav/makefile.win +++ b/modules/security/freenav/makefile.win @@ -1,4 +1,4 @@ -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 diff --git a/silentdl/makefile.win b/silentdl/makefile.win index 10ed49fbea79..8e1f72d0afcd 100644 --- a/silentdl/makefile.win +++ b/silentdl/makefile.win @@ -17,7 +17,7 @@ DEPTH=.. -IGNORE_MANIFEST=1 + MAKE_OBJ_TYPE = DLL MODULE=silentdl diff --git a/sun-java/makefile.win b/sun-java/makefile.win index 5745d0ee7004..0f17b9386cdd 100644 --- a/sun-java/makefile.win +++ b/sun-java/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// #// Makefile to build the SUN-JAVA tree diff --git a/sun-java/stubs/include/makefile.win b/sun-java/stubs/include/makefile.win index 0bad021f01a4..b235b48bc0b4 100644 --- a/sun-java/stubs/include/makefile.win +++ b/sun-java/stubs/include/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// #// Makefile to build the java stub public directory diff --git a/sun-java/stubs/jri/makefile.win b/sun-java/stubs/jri/makefile.win index 9fe4dc084c4d..61021803b0fc 100644 --- a/sun-java/stubs/jri/makefile.win +++ b/sun-java/stubs/jri/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// #// Makefile to build the java stub jri headers diff --git a/sun-java/stubs/src/makefile.win b/sun-java/stubs/src/makefile.win index f6dee26dbc0a..32246955ecbc 100644 --- a/sun-java/stubs/src/makefile.win +++ b/sun-java/stubs/src/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// #// Makefile to build the java stub library diff --git a/view/makefile.win b/view/makefile.win index f1e7ad71a774..b54809a5cda3 100644 --- a/view/makefile.win +++ b/view/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=.. -IGNORE_MANIFEST=1 + DIRS=public src diff --git a/view/public/makefile.win b/view/public/makefile.win index 99ca2db393d5..72f802a4344e 100644 --- a/view/public/makefile.win +++ b/view/public/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + DEFINES=-D_IMPL_NS_UI EXPORTS=nsIView.h nsIViewManager.h nsIScrollableView.h nsViewsCID.h nsIViewObserver.h \ diff --git a/view/src/makefile.win b/view/src/makefile.win index 8c367e565710..3d8e46e87162 100644 --- a/view/src/makefile.win +++ b/view/src/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + MAKE_OBJ_TYPE = DLL DLLNAME = raptorview diff --git a/webshell/embed/ActiveX/makefile.win b/webshell/embed/ActiveX/makefile.win index 35ac32f2fac7..1b12ecfcb503 100644 --- a/webshell/embed/ActiveX/makefile.win +++ b/webshell/embed/ActiveX/makefile.win @@ -22,7 +22,7 @@ DLLNAME = npmozctl QUIET = DEPTH =..\..\.. -IGNORE_MANIFEST=1 + # The default is to include control support unless told to do otherwise !ifndef MOZ_ACTIVEX_NO_CONTROL_SUPPORT diff --git a/webshell/embed/makefile.win b/webshell/embed/makefile.win index 579de5f1973f..3f0f7328dea0 100644 --- a/webshell/embed/makefile.win +++ b/webshell/embed/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + !if defined(MOZ_ACTIVEX_SUPPORT) DIRS = $(DIRS) ActiveX diff --git a/webshell/embed/ngprefs/makefile.win b/webshell/embed/ngprefs/makefile.win index 35a29913135e..c6829470d5d0 100644 --- a/webshell/embed/ngprefs/makefile.win +++ b/webshell/embed/ngprefs/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DIRS= win diff --git a/webshell/embed/ngprefs/win/makefile.win b/webshell/embed/ngprefs/win/makefile.win index b8a98c15b792..e05ceb29f28b 100644 --- a/webshell/embed/ngprefs/win/makefile.win +++ b/webshell/embed/ngprefs/win/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + MAKE_OBJ_TYPE = DLL diff --git a/webshell/makefile.win b/webshell/makefile.win index a9c0f3b262db..f301af0b23bf 100644 --- a/webshell/makefile.win +++ b/webshell/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=.. -IGNORE_MANIFEST=1 + DIRS=public \ src \ diff --git a/webshell/public/makefile.win b/webshell/public/makefile.win index 95d947ff7cf9..23a29e108b40 100644 --- a/webshell/public/makefile.win +++ b/webshell/public/makefile.win @@ -17,7 +17,7 @@ DEPTH=..\.. -IGNORE_MANIFEST=1 + MODULE=raptor diff --git a/webshell/src/makefile.win b/webshell/src/makefile.win index 01e993b3be3e..547cff2490cb 100644 --- a/webshell/src/makefile.win +++ b/webshell/src/makefile.win @@ -17,7 +17,7 @@ DEPTH=..\.. include <$(DEPTH)/config/config.mak> -IGNORE_MANIFEST=1 + DEFINES=-D_IMPL_NS_WEB -DWIN32_LEAN_AND_MEAN MODULE=raptor diff --git a/webshell/tests/makefile.win b/webshell/tests/makefile.win index 0d40a270d39c..ed977fb8d34e 100644 --- a/webshell/tests/makefile.win +++ b/webshell/tests/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + DIRS= viewer imgtest ComFactory diff --git a/webshell/tests/viewer/makefile.win b/webshell/tests/viewer/makefile.win index 35ab2cbf2634..0c7069d86bc9 100644 --- a/webshell/tests/viewer/makefile.win +++ b/webshell/tests/viewer/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + include <$(DEPTH)/config/config.mak> DIRS=public diff --git a/webshell/tests/viewer/public/makefile.win b/webshell/tests/viewer/public/makefile.win index c6d9a837f7e6..0b42e7c4c096 100644 --- a/webshell/tests/viewer/public/makefile.win +++ b/webshell/tests/viewer/public/makefile.win @@ -17,7 +17,7 @@ DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 + MODULE=raptor