bug 350616 - Need to figure out VC8 CRT issues with the XULRunner stub (and with embedding) - embed manifests in everything. r=bsmedberg
--- a/accessible/public/ia2/Makefile.in
+++ b/accessible/public/ia2/Makefile.in
@@ -94,18 +94,16 @@ CSRCS = \
MIDL_GENERATED_FILES = \
dlldata.c \
$(MIDL_INTERFACES:%.idl=%_p.c) \
$(MIDL_INTERFACES:%.idl=%_i.c) \
$(MIDL_INTERFACES:%.idl=%.h) \
$(MIDL_ENUMS:%.idl=%.h) \
$(NULL)
-EMBED_MANIFEST_AT = 2
-
include $(topsrcdir)/config/rules.mk
OS_LIBS = \
kernel32.lib \
rpcndr.lib \
rpcns4.lib \
rpcrt4.lib \
ole32.lib \
--- a/accessible/public/msaa/Makefile.in
+++ b/accessible/public/msaa/Makefile.in
@@ -114,12 +114,10 @@ EXPORTS = \
$(NULL)
export:: done_gen
# This marshall dll is also registered in the installer
register::
regsvr32 -s $(DIST)/bin/$(SHARED_LIBRARY)
-EMBED_MANIFEST_AT = 2
-
include $(topsrcdir)/config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1124,22 +1124,20 @@ ifdef NO_LD_ARCHIVE_FLAGS
ifdef SHARED_LIBRARY_LIBS
@rm -f $(SUB_SHLOBJS)
@for lib in $(SHARED_LIBRARY_LIBS); do $(AR_EXTRACT) $${lib}; $(CLEANUP2); done
endif # SHARED_LIBRARY_LIBS
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
@rm -f foodummyfilefoo $(SUB_SHLOBJS) $(DELETE_AFTER_LINK)
else # os2 vacpp
$(MKSHLIB) -O:$@ -DLL -INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
endif # !os2 vacpp
chmod +x $@
ifndef NO_COMPONENT_LINK_MAP
--- a/embedding/browser/activex/src/control/Makefile.in
+++ b/embedding/browser/activex/src/control/Makefile.in
@@ -109,18 +109,16 @@ OS_LIBS += \
shell32.lib \
$(NULL)
MIDL_GENERATED_FILES = MozillaControl_i.c MozillaControl.h
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"
LDFLAGS += -SUBSYSTEM:windows -DLL
ifdef MOZ_NO_DEBUG_RTL
DEFINES += -DMOZ_NO_DEBUG_RTL
endif
--- a/embedding/browser/activex/src/control_kicker/Makefile.in
+++ b/embedding/browser/activex/src/control_kicker/Makefile.in
@@ -59,18 +59,16 @@ OS_LIBS += \
ole32.lib \
oleaut32.lib \
uuid.lib \
shell32.lib \
$(NULL)
ENABLE_CXX_EXCEPTIONS = 1
-EMBED_MANIFEST_AT = 2
-
include $(topsrcdir)/config/rules.mk
CXXFLAGS += -D "WIN32" -GF -MT -O1
libs::
ifdef MOZ_ACTIVEX_REGISTRATION
ifneq ($(OS_TARGET),WIN98)
-regsvr32 -s -c $(DIST)/bin/$(SHARED_LIBRARY)
--- a/xpinstall/stub/Makefile.in
+++ b/xpinstall/stub/Makefile.in
@@ -62,10 +62,9 @@ CPPSRCS = \
$(NULL)
# LOCAL_INCLUDES = -I$(srcdir)/../public
EXTRA_DSO_LDOPTS= \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
-EMBED_MANIFEST_AT = 17
include $(topsrcdir)/config/rules.mk