Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remaining Fixes for #68720 - EmbedAPI should use generic startup observers

Browse Source 
r=ccarlen,sr=alecf


git-svn-id: svn://10.0.0.236/trunk@89459 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
chak%netscape.com
2001-03-13 06:29:32 +00:00
parent f77098da23
commit cc9b998e09
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/embedding/components/Makefile.in
View File

@@ -24,6 +24,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = windowwatcher build
DIRS = windowwatcher appstartup build
include $(topsrcdir)/config/rules.mk

4
mozilla/embedding/components/build/Makefile.in
View File

@@ -27,7 +27,7 @@ MODULE = embedcomponents
LIBRARY_NAME = embedcomponents
SHORT_LIBNAME = embedcmp
IS_COMPONENT = 1
REQUIRES = js xpcom string windowwatcher embed_base
REQUIRES = js xpcom string windowwatcher appstartupnotifier embed_base
CPPSRCS = nsModule.cpp
@@ -42,6 +42,7 @@ else
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libwindowwatcher_s.$(LIB_SUFFIX) \
$(DIST)/lib/libappstartupnotifier_s.$(LIB_SUFFIX) \
$(NULL)
ifdef MOZ_PERF_METRICS
@@ -52,6 +53,7 @@ endif
LOCAL_INCLUDES = \
-I$(srcdir)/../windowwatcher/src \
-I$(srcdir)/../appstartup/src \
$(NULL)
EXTRA_DSO_LDOPTS = \

2
mozilla/embedding/components/build/makefile.win
View File

@@ -36,10 +36,12 @@ LLIBS = \
$(DIST)\lib\js3250.lib \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\windowwatcher_s.lib \
$(DIST)\lib\appstartupnotifier_s.lib \
$(NULL)
INCS = $(INCS) \
-I$(DEPTH)\embedding\components\windowwatcher\src \
-I$(DEPTH)\embedding\components\appstartup\src \
$(NULL)
include <$(DEPTH)\config\rules.mak>

8
mozilla/embedding/components/build/nsModule.cpp
View File

@@ -22,13 +22,15 @@
#include "nsIGenericFactory.h"
#include "nsWindowWatcher.h"
#include "nsAppStartupNotifier.h"
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowWatcher, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppStartupNotifier)
static nsModuleComponentInfo components[] = {
{ "Window Watcher", NS_WINDOWWATCHER_CID, NS_WINDOWWATCHER_CONTRACTID, nsWindowWatcherConstructor }
{ "Window Watcher", NS_WINDOWWATCHER_CID, NS_WINDOWWATCHER_CONTRACTID, nsWindowWatcherConstructor },
{ NS_APPSTARTUPNOTIFIER_CLASSNAME, NS_APPSTARTUPNOTIFIER_CID, NS_APPSTARTUPNOTIFIER_CONTRACTID, nsAppStartupNotifierConstructor }
};
NS_IMPL_NSGETMODULE("windowwatcher", components)
NS_IMPL_NSGETMODULE("embedcomponents", components)

1
mozilla/embedding/components/makefile.win
View File

@@ -22,6 +22,7 @@ DEPTH=..\..
DIRS= \
windowwatcher \
appstartup \
build \
$(NULL)