bug 350616 - embed manifests in all DLLs when building. r+a=bsmedberg

accessible/public/ia2/Makefile.in

@@ -99,8 +99,6 @@ MIDL_GENERATED_FILES = \
   $(MIDL_ENUMS:%.idl=%.h) \
   $(NULL)
 
-EMBED_MANIFEST_AT = 2
-
 include $(topsrcdir)/config/rules.mk
 
 OS_LIBS = \

accessible/public/msaa/Makefile.in

@@ -119,7 +119,5 @@ export:: done_gen
 register::
 	regsvr32 -s $(DIST)/bin/$(SHARED_LIBRARY)
 
-EMBED_MANIFEST_AT = 2
-
 include $(topsrcdir)/config/rules.mk
 

config/rules.mk

@@ -1069,12 +1069,10 @@ endif # NO_LD_ARCHIVE_FLAGS
 	$(MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 ifdef MSMANIFEST_TOOL
-ifdef EMBED_MANIFEST_AT
 	@if test -f $@.manifest; then \
-		mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;$(EMBED_MANIFEST_AT); \
+		mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;2; \
 		rm -f $@.manifest; \
 	fi
-endif   # embed manifest
 endif	# MSVC with manifest tool
 endif	# WINNT && !GCC
 ifeq ($(OS_ARCH),Darwin)

embedding/browser/activex/src/control/Makefile.in

@@ -114,8 +114,6 @@ GARBAGE	+= $(DEFFILE) $(MIDL_GENERATED_FILES) done_gen
 
 ENABLE_CXX_EXCEPTIONS = 1
 
-EMBED_MANIFEST_AT = 2
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += -D "WIN32" -U "ClientWallet"

embedding/browser/activex/src/control_kicker/Makefile.in

@@ -64,8 +64,6 @@ OS_LIBS	+= \
 	
 ENABLE_CXX_EXCEPTIONS = 1
 
-EMBED_MANIFEST_AT = 2
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += -D "WIN32" -GF -MT -O1

mailnews/mapi/mapiDll/Makefile.in

@@ -61,8 +61,6 @@ OS_LIBS		+= ole32.lib
 FORCE_USE_PIC	= 1 
 FORCE_SHARED_LIB = 1
 
-EMBED_MANIFEST_AT = 2
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES	+= -DUNICODE -D_UNICODE

mailnews/mapi/mapihook/build/Makefile.in

@@ -70,8 +70,6 @@ FORCE_USE_PIC	= 1
 FORCE_SHARED_LIB = 1
 SRCS_IN_OBJDIR	= 1
 
-EMBED_MANIFEST_AT = 2
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x400

xpinstall/stub/Makefile.in

@@ -1,71 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla Communicator client code, released
-# March 31, 1998.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Samir Gehani <sgehani@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-# Make this a true dynamic component even in static builds because
-# this component is shared by installer
-BUILD_STATIC_LIBS=
-MOZILLA_INTERNAL_API = 1
-
-MODULE		= xpistub
-LIBRARY_NAME	= xpistub
-REQUIRES	= xpcom \
-		  string \
-		  xpinstall \
-		  $(NULL)
-
-CPPSRCS		= \
-		nsStubNotifier.cpp \
-		xpistub.cpp \
-		$(NULL)
-
-# LOCAL_INCLUDES	= -I$(srcdir)/../public
-
-EXTRA_DSO_LDOPTS= \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-
-EMBED_MANIFEST_AT = 17
-include $(topsrcdir)/config/rules.mk