diff --git a/mozilla/modules/libimg/gifcom/makefile.win b/mozilla/modules/libimg/gifcom/makefile.win index b802e1dcbee..32ad496ba4a 100644 --- a/mozilla/modules/libimg/gifcom/makefile.win +++ b/mozilla/modules/libimg/gifcom/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # #------------------------------------------------------------------------ diff --git a/mozilla/modules/libimg/jpgcom/makefile.win b/mozilla/modules/libimg/jpgcom/makefile.win index b257cd05c5d..c10d85407bd 100644 --- a/mozilla/modules/libimg/jpgcom/makefile.win +++ b/mozilla/modules/libimg/jpgcom/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # #------------------------------------------------------------------------ diff --git a/mozilla/modules/libimg/png/makefile.win b/mozilla/modules/libimg/png/makefile.win index 938081431c5..f82dfaef33c 100644 --- a/mozilla/modules/libimg/png/makefile.win +++ b/mozilla/modules/libimg/png/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # #----------------------------------------- diff --git a/mozilla/modules/libimg/pngcom/makefile.win b/mozilla/modules/libimg/pngcom/makefile.win index 0a8475d24c3..e4a4a59474c 100644 --- a/mozilla/modules/libimg/pngcom/makefile.win +++ b/mozilla/modules/libimg/pngcom/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # #------------------------------------------------------------------------ diff --git a/mozilla/modules/libimg/public/makefile.win b/mozilla/modules/libimg/public/makefile.win index 6f2536017e3..b049b8ceabf 100644 --- a/mozilla/modules/libimg/public/makefile.win +++ b/mozilla/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/mozilla/modules/libimg/public_com/makefile.win b/mozilla/modules/libimg/public_com/makefile.win index 55abbfc6fc0..2058ec956e0 100644 --- a/mozilla/modules/libimg/public_com/makefile.win +++ b/mozilla/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/mozilla/modules/libimg/src/makefile.win b/mozilla/modules/libimg/src/makefile.win index 046b40b68ce..714f8b8b3a3 100644 --- a/mozilla/modules/libimg/src/makefile.win +++ b/mozilla/modules/libimg/src/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # #------------------------------------------------------------------------ diff --git a/mozilla/modules/libjar/makefile.win b/mozilla/modules/libjar/makefile.win index 6a0e923468e..ef13f6c38e9 100644 --- a/mozilla/modules/libjar/makefile.win +++ b/mozilla/modules/libjar/makefile.win @@ -21,7 +21,7 @@ # Contributors: # Daniel Veditz -IGNORE_MANIFEST=1 + DIRS=standalone diff --git a/mozilla/modules/libjar/standalone/makefile.win b/mozilla/modules/libjar/standalone/makefile.win index 6fa39b0d5b2..ca5fcbf0892 100644 --- a/mozilla/modules/libjar/standalone/makefile.win +++ b/mozilla/modules/libjar/standalone/makefile.win @@ -21,7 +21,6 @@ # Contributors: # Daniel Veditz -IGNORE_MANIFEST=1 MODULE=jar DEPTH=..\..\.. diff --git a/mozilla/modules/libpref/admin/makefile.win b/mozilla/modules/libpref/admin/makefile.win index 2f76778de6d..c1999df1046 100644 --- a/mozilla/modules/libpref/admin/makefile.win +++ b/mozilla/modules/libpref/admin/makefile.win @@ -17,7 +17,7 @@ -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// diff --git a/mozilla/modules/libpref/makefile.win b/mozilla/modules/libpref/makefile.win index 1db534aaf3e..c62bb617391 100644 --- a/mozilla/modules/libpref/makefile.win +++ b/mozilla/modules/libpref/makefile.win @@ -17,7 +17,7 @@ -IGNORE_MANIFEST=1 + DEPTH = ..\.. diff --git a/mozilla/modules/libpref/src/makefile.win b/mozilla/modules/libpref/src/makefile.win index 9cdbd1d9b49..7bab0b6d3b1 100644 --- a/mozilla/modules/libpref/src/makefile.win +++ b/mozilla/modules/libpref/src/makefile.win @@ -17,7 +17,7 @@ -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// diff --git a/mozilla/modules/libreg/include/makefile.win b/mozilla/modules/libreg/include/makefile.win index 079d10b197f..1021643b437 100644 --- a/mozilla/modules/libreg/include/makefile.win +++ b/mozilla/modules/libreg/include/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # diff --git a/mozilla/modules/libutil/makefile.win b/mozilla/modules/libutil/makefile.win index eb4947e104d..eda21f56730 100644 --- a/mozilla/modules/libutil/makefile.win +++ b/mozilla/modules/libutil/makefile.win @@ -15,7 +15,7 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 + # DEPTH=..\.. diff --git a/mozilla/modules/libutil/public/makefile.win b/mozilla/modules/libutil/public/makefile.win index 9db72d41583..6adf5902bd6 100644 --- a/mozilla/modules/libutil/public/makefile.win +++ b/mozilla/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/mozilla/modules/libutil/src/makefile.win b/mozilla/modules/libutil/src/makefile.win index 8d1f24d139f..765705997cb 100644 --- a/mozilla/modules/libutil/src/makefile.win +++ b/mozilla/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/mozilla/modules/oji/public/makefile.win b/mozilla/modules/oji/public/makefile.win index 5832c5ec19c..869ee83ea2b 100644 --- a/mozilla/modules/oji/public/makefile.win +++ b/mozilla/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/mozilla/modules/oji/src/makefile.win b/mozilla/modules/oji/src/makefile.win index 509aded5f1b..ca2aa353ffc 100644 --- a/mozilla/modules/oji/src/makefile.win +++ b/mozilla/modules/oji/src/makefile.win @@ -1,4 +1,4 @@ -IGNORE_MANIFEST=1 + #//------------------------------------------------------------------------ #// #// Makefile to build diff --git a/mozilla/modules/plugin/base/public/makefile.win b/mozilla/modules/plugin/base/public/makefile.win index 7837e6a463e..6847e5d6116 100644 --- a/mozilla/modules/plugin/base/public/makefile.win +++ b/mozilla/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/mozilla/modules/plugin/base/src/makefile.win b/mozilla/modules/plugin/base/src/makefile.win index 96b9111b3cd..9cad9b99170 100644 --- a/mozilla/modules/plugin/base/src/makefile.win +++ b/mozilla/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/mozilla/modules/plugin/nglsrc/makefile.win b/mozilla/modules/plugin/nglsrc/makefile.win index 96b9111b3cd..9cad9b99170 100644 --- a/mozilla/modules/plugin/nglsrc/makefile.win +++ b/mozilla/modules/plugin/nglsrc/makefile.win @@ -17,7 +17,7 @@ DEPTH=..\..\.. include <$(DEPTH)/config/config.mak> -IGNORE_MANIFEST=1 + EXPORTS = \ nsPluginsCID.h \ diff --git a/mozilla/modules/plugin/public/makefile.win b/mozilla/modules/plugin/public/makefile.win index 7837e6a463e..6847e5d6116 100644 --- a/mozilla/modules/plugin/public/makefile.win +++ b/mozilla/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/mozilla/modules/plugin/src/makefile.win b/mozilla/modules/plugin/src/makefile.win index 83ff08ac706..146b790c2f4 100644 --- a/mozilla/modules/plugin/src/makefile.win +++ b/mozilla/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/mozilla/modules/security/freenav/makefile.win b/mozilla/modules/security/freenav/makefile.win index 67664238ab5..9f3c834caee 100644 --- a/mozilla/modules/security/freenav/makefile.win +++ b/mozilla/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/mozilla/silentdl/makefile.win b/mozilla/silentdl/makefile.win index 10ed49fbea7..8e1f72d0afc 100644 --- a/mozilla/silentdl/makefile.win +++ b/mozilla/silentdl/makefile.win @@ -17,7 +17,7 @@ DEPTH=.. -IGNORE_MANIFEST=1 + MAKE_OBJ_TYPE = DLL MODULE=silentdl diff --git a/mozilla/sun-java/makefile.win b/mozilla/sun-java/makefile.win index 5745d0ee700..0f17b9386cd 100644 --- a/mozilla/sun-java/makefile.win +++ b/mozilla/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/mozilla/sun-java/stubs/include/makefile.win b/mozilla/sun-java/stubs/include/makefile.win index 0bad021f01a..b235b48bc0b 100644 --- a/mozilla/sun-java/stubs/include/makefile.win +++ b/mozilla/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/mozilla/sun-java/stubs/jri/makefile.win b/mozilla/sun-java/stubs/jri/makefile.win index 9fe4dc084c4..61021803b0f 100644 --- a/mozilla/sun-java/stubs/jri/makefile.win +++ b/mozilla/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/mozilla/sun-java/stubs/src/makefile.win b/mozilla/sun-java/stubs/src/makefile.win index f6dee26dbc0..32246955ecb 100644 --- a/mozilla/sun-java/stubs/src/makefile.win +++ b/mozilla/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/mozilla/view/makefile.win b/mozilla/view/makefile.win index f1e7ad71a77..b54809a5cda 100644 --- a/mozilla/view/makefile.win +++ b/mozilla/view/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=.. -IGNORE_MANIFEST=1 + DIRS=public src diff --git a/mozilla/view/public/makefile.win b/mozilla/view/public/makefile.win index 99ca2db393d..72f802a4344 100644 --- a/mozilla/view/public/makefile.win +++ b/mozilla/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/mozilla/view/src/makefile.win b/mozilla/view/src/makefile.win index 8c367e56571..3d8e46e8716 100644 --- a/mozilla/view/src/makefile.win +++ b/mozilla/view/src/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + MAKE_OBJ_TYPE = DLL DLLNAME = raptorview diff --git a/mozilla/webshell/embed/ActiveX/makefile.win b/mozilla/webshell/embed/ActiveX/makefile.win index 35ac32f2fac..1b12ecfcb50 100644 --- a/mozilla/webshell/embed/ActiveX/makefile.win +++ b/mozilla/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/mozilla/webshell/embed/makefile.win b/mozilla/webshell/embed/makefile.win index 579de5f1973..3f0f7328dea 100644 --- a/mozilla/webshell/embed/makefile.win +++ b/mozilla/webshell/embed/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + !if defined(MOZ_ACTIVEX_SUPPORT) DIRS = $(DIRS) ActiveX diff --git a/mozilla/webshell/embed/ngprefs/makefile.win b/mozilla/webshell/embed/ngprefs/makefile.win index 35a29913135..c6829470d5d 100644 --- a/mozilla/webshell/embed/ngprefs/makefile.win +++ b/mozilla/webshell/embed/ngprefs/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + DIRS= win diff --git a/mozilla/webshell/embed/ngprefs/win/makefile.win b/mozilla/webshell/embed/ngprefs/win/makefile.win index b8a98c15b79..e05ceb29f28 100644 --- a/mozilla/webshell/embed/ngprefs/win/makefile.win +++ b/mozilla/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/mozilla/webshell/makefile.win b/mozilla/webshell/makefile.win index a9c0f3b262d..f301af0b23b 100644 --- a/mozilla/webshell/makefile.win +++ b/mozilla/webshell/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=.. -IGNORE_MANIFEST=1 + DIRS=public \ src \ diff --git a/mozilla/webshell/public/makefile.win b/mozilla/webshell/public/makefile.win index 95d947ff7cf..23a29e108b4 100644 --- a/mozilla/webshell/public/makefile.win +++ b/mozilla/webshell/public/makefile.win @@ -17,7 +17,7 @@ DEPTH=..\.. -IGNORE_MANIFEST=1 + MODULE=raptor diff --git a/mozilla/webshell/src/makefile.win b/mozilla/webshell/src/makefile.win index 01e993b3be3..547cff2490c 100644 --- a/mozilla/webshell/src/makefile.win +++ b/mozilla/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/mozilla/webshell/tests/makefile.win b/mozilla/webshell/tests/makefile.win index 0d40a270d39..ed977fb8d34 100644 --- a/mozilla/webshell/tests/makefile.win +++ b/mozilla/webshell/tests/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\.. -IGNORE_MANIFEST=1 + DIRS= viewer imgtest ComFactory diff --git a/mozilla/webshell/tests/viewer/makefile.win b/mozilla/webshell/tests/viewer/makefile.win index 35ab2cbf263..0c7069d86bc 100644 --- a/mozilla/webshell/tests/viewer/makefile.win +++ b/mozilla/webshell/tests/viewer/makefile.win @@ -16,7 +16,7 @@ # Reserved. DEPTH=..\..\.. -IGNORE_MANIFEST=1 + include <$(DEPTH)/config/config.mak> DIRS=public diff --git a/mozilla/webshell/tests/viewer/public/makefile.win b/mozilla/webshell/tests/viewer/public/makefile.win index c6d9a837f7e..0b42e7c4c09 100644 --- a/mozilla/webshell/tests/viewer/public/makefile.win +++ b/mozilla/webshell/tests/viewer/public/makefile.win @@ -17,7 +17,7 @@ DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 + MODULE=raptor