From 784b0ad1e37b79081e052afb17e2473e3107fc76 Mon Sep 17 00:00:00 2001 From: "scott%scott-macgregor.org" Date: Mon, 18 Jul 2005 22:56:19 +0000 Subject: [PATCH] Bug #300655 --> more changes to move gnome integration to shell --- mail/components/build/Makefile.in | 2 +- mail/components/shell/Makefile.in | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mail/components/build/Makefile.in b/mail/components/build/Makefile.in index 50384dcfab7e..10a0d6532ea2 100644 --- a/mail/components/build/Makefile.in +++ b/mail/components/build/Makefile.in @@ -76,7 +76,7 @@ SHARED_LIBRARY_LIBS = \ $(NULL) ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2) -SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)mail_gnome_s.$(LIB_SUFFIX) +SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX) endif EXTRA_DSO_LDOPTS += \ diff --git a/mail/components/shell/Makefile.in b/mail/components/shell/Makefile.in index 697858eeb1ec..2211807e015c 100644 --- a/mail/components/shell/Makefile.in +++ b/mail/components/shell/Makefile.in @@ -42,9 +42,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = mail_gnome -LIBRARY_NAME = mail_gnome_s -MODULE_NAME = nsMailGNOMEModule +MODULE = shellservice +LIBRARY_NAME = shellservice_s +MODULE_NAME = nsMailShellModule MOZILLA_INTERNAL_API = 1 REQUIRES = \ @@ -60,7 +60,9 @@ REQUIRES = \ embed_base \ $(NULL) +ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2) CPPSRCS = nsMailGNOMEIntegration.cpp +endif FORCE_STATIC_LIB = 1