From e8178dc136f6e3a7d2b3e1b2d373d415deaea05d Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Mon, 7 Jun 1999 21:04:04 +0000 Subject: [PATCH] remove IGNORE_MANIFEST --- mailnews/addrbook/prefs/resources/content/makefile.win | 2 -- mailnews/addrbook/resources/content/makefile.win | 4 +--- mailnews/addrbook/resources/skin/makefile.win | 5 +---- mailnews/base/prefs/resources/content/makefile.win | 4 +--- mailnews/base/prefs/resources/skin/makefile.win | 4 +--- mailnews/base/resources/content/makefile.win | 4 +--- mailnews/base/resources/skin/makefile.win | 4 +--- mailnews/base/search/resources/content/makefile.win | 9 ++++----- mailnews/base/tests/makefile.win | 2 -- mailnews/base/util/makefile.win | 8 ++------ 10 files changed, 12 insertions(+), 34 deletions(-) diff --git a/mailnews/addrbook/prefs/resources/content/makefile.win b/mailnews/addrbook/prefs/resources/content/makefile.win index f253fc5e14b..9d622b4d148 100644 --- a/mailnews/addrbook/prefs/resources/content/makefile.win +++ b/mailnews/addrbook/prefs/resources/content/makefile.win @@ -16,9 +16,7 @@ # Reserved. DEPTH=..\..\..\..\.. -IGNORE_MANIFEST=1 -DEFINES=-DWIN32_LEAN_AND_MEAN MODULE=mailnews include <$(DEPTH)\config\rules.mak> diff --git a/mailnews/addrbook/resources/content/makefile.win b/mailnews/addrbook/resources/content/makefile.win index 7bb29c2b72f..e33ae7e5b86 100644 --- a/mailnews/addrbook/resources/content/makefile.win +++ b/mailnews/addrbook/resources/content/makefile.win @@ -16,10 +16,8 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 -DEFINES=-DWIN32_LEAN_AND_MEAN -MODULE=mailnews +MODULE=addrbook include <$(DEPTH)\config\rules.mak> diff --git a/mailnews/addrbook/resources/skin/makefile.win b/mailnews/addrbook/resources/skin/makefile.win index 42ba064205a..53c7b9012ba 100644 --- a/mailnews/addrbook/resources/skin/makefile.win +++ b/mailnews/addrbook/resources/skin/makefile.win @@ -16,10 +16,7 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 - -DEFINES=-DWIN32_LEAN_AND_MEAN -MODULE=mailnews +MODULE=addrbook include <$(DEPTH)\config\rules.mak> diff --git a/mailnews/base/prefs/resources/content/makefile.win b/mailnews/base/prefs/resources/content/makefile.win index 64b0459ad34..de6a34958de 100644 --- a/mailnews/base/prefs/resources/content/makefile.win +++ b/mailnews/base/prefs/resources/content/makefile.win @@ -16,10 +16,8 @@ # Reserved. DEPTH=..\..\..\..\.. -IGNORE_MANIFEST=1 -DEFINES=-DWIN32_LEAN_AND_MEAN -MODULE=mailnews +MODULE=msgbase include <$(DEPTH)\config\rules.mak> diff --git a/mailnews/base/prefs/resources/skin/makefile.win b/mailnews/base/prefs/resources/skin/makefile.win index 258677ac5af..1e064dfe27d 100644 --- a/mailnews/base/prefs/resources/skin/makefile.win +++ b/mailnews/base/prefs/resources/skin/makefile.win @@ -16,10 +16,8 @@ # Reserved. DEPTH=..\..\..\..\.. -IGNORE_MANIFEST=1 -DEFINES=-DWIN32_LEAN_AND_MEAN -MODULE=mailnews +MODULE=msgbase include <$(DEPTH)\config\rules.mak> diff --git a/mailnews/base/resources/content/makefile.win b/mailnews/base/resources/content/makefile.win index 2f9bbb6d1f4..b8fdfb61489 100644 --- a/mailnews/base/resources/content/makefile.win +++ b/mailnews/base/resources/content/makefile.win @@ -16,10 +16,8 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 -DEFINES=-DWIN32_LEAN_AND_MEAN -MODULE=mailnews +MODULE=msgbase include <$(DEPTH)\config\rules.mak> diff --git a/mailnews/base/resources/skin/makefile.win b/mailnews/base/resources/skin/makefile.win index 6efac8fa007..92467a28004 100644 --- a/mailnews/base/resources/skin/makefile.win +++ b/mailnews/base/resources/skin/makefile.win @@ -16,10 +16,8 @@ # Reserved. DEPTH=..\..\..\.. -IGNORE_MANIFEST=1 -DEFINES=-DWIN32_LEAN_AND_MEAN -MODULE=mailnews +MODULE=msgbase include <$(DEPTH)\config\rules.mak> diff --git a/mailnews/base/search/resources/content/makefile.win b/mailnews/base/search/resources/content/makefile.win index 1c930ba8839..b50af554c6a 100644 --- a/mailnews/base/search/resources/content/makefile.win +++ b/mailnews/base/search/resources/content/makefile.win @@ -16,18 +16,17 @@ # Reserved. DEPTH=..\..\..\..\.. -IGNORE_MANIFEST=1 DEFINES=-DWIN32_LEAN_AND_MEAN -MODULE=mailnews +MODULE=msgbase include <$(DEPTH)\config\rules.mak> install:: - $(MAKE_INSTALL) SearchDialog.xul $(DIST)\bin\chrome\messenger\content\default + $(MAKE_INSTALL) SearchDialog.xul $(DIST)\bin\chrome\messenger\content\default $(MAKE_INSTALL) FilterListDialog.xul $(DIST)\bin\chrome\messenger\content\default - $(MAKE_INSTALL) FilterEditor.xul $(DIST)\bin\chrome\messenger\content\default - $(MAKE_INSTALL) FilterEditor.js $(DIST)\bin\chrome\messenger\content\default + $(MAKE_INSTALL) FilterEditor.xul $(DIST)\bin\chrome\messenger\content\default + $(MAKE_INSTALL) FilterEditor.js $(DIST)\bin\chrome\messenger\content\default clobber:: rm -f $(DIST)\chrome\messenger\content\default\SearchDialog.xul diff --git a/mailnews/base/tests/makefile.win b/mailnews/base/tests/makefile.win index c6525f192cd..4d690a00919 100644 --- a/mailnews/base/tests/makefile.win +++ b/mailnews/base/tests/makefile.win @@ -13,8 +13,6 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST = 1 - #//------------------------------------------------------------------------ #// # New build system where zip dll is build indepenant of java stubs. diff --git a/mailnews/base/util/makefile.win b/mailnews/base/util/makefile.win index a46d3aa9921..2750d64b39a 100644 --- a/mailnews/base/util/makefile.win +++ b/mailnews/base/util/makefile.win @@ -15,14 +15,9 @@ # Copyright (C) 1998 Netscape Communications Corporation. All Rights # Reserved. -IGNORE_MANIFEST=1 - DEPTH=..\..\.. MODULE= msgbaseutil -LIBNAME = .\$(OBJDIR)\msgbaseutil -DLL = $(LIBNAME).dll - include <$(DEPTH)\config\config.mak> ################################################################################ @@ -47,7 +42,8 @@ EXPORTS= \ ################################################################################ ## library -LIBRARY_NAME=msgbase_s +LIBNAME = .\$(OBJDIR)\msgbaseutil +DLL = $(LIBNAME).dll DEFINES=-D_IMPL_NS_MSG_BASE