Fixing all unresolved symbols on unix. The bug has the diff's

r dp@netscape.com (ramiro helped me with it) # 18688
1999-11-16 06:02:31 +00:00 · 1999-11-16 06:02:31 +00:00 · d70d78c6bf
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@ -71,6 +71,8 @@ USE_IMPLICIT_ARCHIVE = @USE_IMPLICIT_ARCHIVE@

 MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@

+MOZ_COMPONENT_NSPR_LIBS = @MOZ_COMPONENT_NSPR_LIBS@
+MOZ_COMPONENT_XPCOM_LIBS = @MOZ_COMPONENT_XPCOM_LIBS@
 MOZ_COMPONENT_LIBS = @MOZ_COMPONENT_LIBS@

 ClientWallet=1
--- a/dom/src/build/Makefile.in
+++ b/dom/src/build/Makefile.in
@ -53,6 +53,8 @@ EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_UNFORCE_ALL) \
 		$(MOZ_NECKO_UTIL_LIBS) \
 		$(MOZ_TIMER_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		-lmozjs \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@ -40,5 +40,7 @@ CPPSRCS		= nsJSProtocolHandler.cpp

 EXPORTS		= $(srcdir)/nsJSProtocolHandler.h

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/editor/base/Makefile.in
+++ b/editor/base/Makefile.in
@ -68,6 +68,8 @@ CPPSRCS		= \

 EXTRA_DSO_LDOPTS = \
 		$(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		-lmozjs \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@ -42,6 +42,7 @@ CPPSRCS		= \
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
+		$(NSPR_LIBS) \
 		-lxpcom \
 		$(NULL)

--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@ -41,6 +41,7 @@ CPPSRCS		= \
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
+		$(NSPR_LIBS) \
 		-lxpcom \
 		$(NULL)

--- a/extensions/wallet/build/Makefile.in
+++ b/extensions/wallet/build/Makefile.in
@ -43,6 +43,7 @@ EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
 		$(MKSHLIB_UNFORCE_ALL) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/extensions/wallet/src/Makefile.in
+++ b/extensions/wallet/src/Makefile.in
@ -52,6 +52,8 @@ CHROME_FILES	= \

 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
+		$(NSPR_LIBS) \
+		-lxpcom \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@ -81,6 +81,7 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_TIMER_LIBS) \
 		$(DIST)/lib/libimg_s.a \
 		$(DIST)/lib/libmozutil_s.a \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/gfx/src/gtk/Makefile.in
+++ b/gfx/src/gtk/Makefile.in
@ -58,6 +58,10 @@ CXXFLAGS	+= $(TK_CFLAGS)
 CFLAGS		+= $(TK_CFLAGS)
 endif

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
+		-lraptorgfx \
+		$(NULL)
+
 DEFINES		+= -D_IMPL_NS_GFXNONXP
 ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_BSD_SOURCE
--- a/htmlparser/robot/Makefile.in
+++ b/htmlparser/robot/Makefile.in
@ -34,4 +34,6 @@ ifdef ENABLE_TESTS
 DIRS		= test
 endif

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk
--- a/htmlparser/src/Makefile.in
+++ b/htmlparser/src/Makefile.in
@ -119,6 +119,8 @@ EXTRA_DSO_LDOPTS += \
 		$(NULL)
 endif

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

 #
--- a/intl/chardet/src/Makefile.in
+++ b/intl/chardet/src/Makefile.in
@ -43,5 +43,7 @@ CPPSRCS		= \
 		nsCyrillicDetector.cpp \
 		$(NULL)

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/intl/locale/src/unix/Makefile.in
+++ b/intl/locale/src/unix/Makefile.in
@ -41,7 +41,9 @@ CPPSRCS		= \
 		nsPosixLocaleFactory.cpp \
 		$(NULL)

-EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lnslocale_s
+EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lnslocale_s \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk

--- a/intl/lwbrk/src/Makefile.in
+++ b/intl/lwbrk/src/Makefile.in
@ -45,6 +45,8 @@ include $(topsrcdir)/config/rules.mk

 CFLAGS		+= -DUSE_NSREG

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 # Reserved name __STDC__ cannot be defined as a macro name on AIX or OpenVMS.
 # QNX simply objects to the way it's being redefined.
 ifeq (,$(filter AIX OpenVMS QNX,$(OS_ARCH)))
--- a/intl/strres/src/Makefile.in
+++ b/intl/strres/src/Makefile.in
@ -33,8 +33,9 @@ IS_COMPONENT	= 1
 CPPSRCS		= nsStringBundle.cpp

 EXTRA_DSO_LDOPTS =\
-				$(MOZ_NECKO_UTIL_LIBS) \
-				$(NULL)
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk

--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@ -57,7 +57,9 @@ EXPORT_RESOURCE	= \
 		$(srcdir)/charsetalias.properties \
 		$(NULL)

-EXTRA_DSO_LDOPTS = $(MOZ_NECKO_UTIL_LIBS)
+EXTRA_DSO_LDOPTS = $(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk

--- a/intl/uconv/ucvcn/Makefile.in
+++ b/intl/uconv/ucvcn/Makefile.in
@ -53,5 +53,7 @@ CPPSRCS		= \
 EXPORTS		= nsUCvCnCID.h
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/intl/uconv/ucvja/Makefile.in
+++ b/intl/uconv/ucvja/Makefile.in
@ -56,5 +56,7 @@ EXPORTS		= \

 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/intl/uconv/ucvko/Makefile.in
+++ b/intl/uconv/ucvko/Makefile.in
@ -48,5 +48,7 @@ CPPSRCS		= \
 EXPORTS		= nsUCvKOCID.h
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@ -148,5 +148,7 @@ CPPSRCS		= \
 EXPORTS		= nsUCvLatinCID.h
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/intl/uconv/ucvtw/Makefile.in
+++ b/intl/uconv/ucvtw/Makefile.in
@ -45,5 +45,7 @@ CPPSRCS		= \
 EXPORTS		= nsUCvTWCID.h
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/intl/uconv/ucvtw2/Makefile.in
+++ b/intl/uconv/ucvtw2/Makefile.in
@ -49,5 +49,7 @@ CPPSRCS		= \
 EXPORTS		= nsUCvTW2CID.h
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/intl/unicharutil/src/Makefile.in
+++ b/intl/unicharutil/src/Makefile.in
@ -42,8 +42,9 @@ CPPSRCS		= \
 		$(NULL)

 EXTRA_DSO_LDOPTS =\
-				$(MOZ_NECKO_UTIL_LIBS) \
-				$(NULL)
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk

--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@ -147,6 +147,8 @@ endif
 OS_CFLAGS	+= -tm-
 endif

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS)
+
 # When using gcc the assembly is inlined in the C-file (see jslock.c)
 ifdef NS_USE_NATIVE
 ASFILES		= $(notdir $(wildcard $(srcdir)/*_$(OS_ARCH).s))
--- a/js/src/xpconnect/loader/Makefile.in
+++ b/js/src/xpconnect/loader/Makefile.in
@ -36,3 +36,8 @@ ifneq ($(OS_ARCH),BeOS)
 LIBS		+= -lmozjs -lxpcom $(NSPR_LIBS)
 endif

+EXTRA_DSO_LDOPTS += \
+		$(MOZ_COMPONENT_LIBS) \
+		-lmozjs \
+		$(NULL)
+
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@ -163,6 +163,11 @@ LIBS		+= \
 		$(NULL)
 endif

+EXTRA_DSO_LDOPTS += \
+		$(MOZ_COMPONENT_LIBS) \
+		-lmozjs \
+		$(NULL)
+
 include $(topsrcdir)/config/rules.mk

 DEFINES		+= -DJSFILE -DJS_THREADSAFE
--- a/js/src/xpconnect/tests/components/Makefile.in
+++ b/js/src/xpconnect/tests/components/Makefile.in
@ -63,5 +63,10 @@ LIBS += \
 		$(MOZ_TIMER_LIBS) \
 		$(NULL)

+EXTRA_DSO_LDOPTS += \
+		$(MOZ_COMPONENT_LIBS) \
+		-lmozjs \
+		$(NULL)
+
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/compose/build/Makefile.in
+++ b/mailnews/compose/build/Makefile.in
@ -44,6 +44,7 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		-lxpcom \
+		-lmozjs \
 		-lmsgbaseutil \
 		$(NSPR_LIBS) \
 		$(NULL)
--- a/modules/libimg/gifcom/Makefile.in
+++ b/modules/libimg/gifcom/Makefile.in
@ -42,6 +42,8 @@ LOCAL_INCLUDES	= -I$(srcdir)

 EXTRA_LIBS	= $(NSPR_LIBS)

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 ifndef MOZ_JAVA
 LOCAL_JMC_SUBDIR = .
 endif
--- a/modules/libimg/jpgcom/Makefile.in
+++ b/modules/libimg/jpgcom/Makefile.in
@ -40,7 +40,9 @@ CPPSRCS		= \

 LOCAL_INCLUDES	= -I$(srcdir)

-EXTRA_DSO_LDOPTS = $(JPEG_LIBS)
+EXTRA_DSO_LDOPTS = $(JPEG_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)

 EXTRA_LIBS	= $(NSPR_LIBS)

--- a/modules/libimg/pngcom/Makefile.in
+++ b/modules/libimg/pngcom/Makefile.in
@ -40,7 +40,9 @@ CPPSRCS		= \

 LOCAL_INCLUDES	= -I$(srcdir)

-EXTRA_DSO_LDOPTS = $(PNG_LIBS) $(ZLIB_LIBS)
+EXTRA_DSO_LDOPTS = $(PNG_LIBS) $(ZLIB_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)

 EXTRA_LIBS	= $(NSPR_LIBS)

--- a/modules/plugin/base/src/Makefile.in
+++ b/modules/plugin/base/src/Makefile.in
@ -49,8 +49,9 @@ EXPORTS		= \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 EXTRA_DSO_LDOPTS = \
-				$(MOZ_NECKO_UTIL_LIBS) \
-				$(NULL)
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk

--- a/modules/plugin/nglsrc/Makefile.in
+++ b/modules/plugin/nglsrc/Makefile.in
@ -49,8 +49,9 @@ EXPORTS		= \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 EXTRA_DSO_LDOPTS = \
-				$(MOZ_NECKO_UTIL_LIBS) \
-				$(NULL)
+		$(MOZ_NECKO_UTIL_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk

--- a/modules/zlib/src/Makefile.in
+++ b/modules/zlib/src/Makefile.in
@ -54,5 +54,7 @@ EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 # need a static lib for some components (pngcom, say)
 override NO_STATIC_LIB=

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@ -48,6 +48,7 @@ EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
 		$(MKSHLIB_UNFORCE_ALL) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/netwerk/mime/src/Makefile.in
+++ b/netwerk/mime/src/Makefile.in
@ -38,5 +38,7 @@ CPPSRCS		= \
 		nsMIMEServiceFactory.cpp \
 		$(NULL)

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/netwerk/protocol/about/src/Makefile.in
+++ b/netwerk/protocol/about/src/Makefile.in
@ -39,5 +39,7 @@ CPPSRCS		= \
 		nsAboutBloat.cpp \
 		$(NULL)

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/netwerk/protocol/data/src/Makefile.in
+++ b/netwerk/protocol/data/src/Makefile.in
@ -36,5 +36,7 @@ CPPSRCS		= \
 		nsDataModule.cpp \
 		$(NULL)

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/netwerk/protocol/file/src/Makefile.in
+++ b/netwerk/protocol/file/src/Makefile.in
@ -38,5 +38,7 @@ CPPSRCS		= \
 		nsFileProtocolModule.cpp \
 		$(NULL)

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/netwerk/protocol/ftp/src/Makefile.in
+++ b/netwerk/protocol/ftp/src/Makefile.in
@ -37,5 +37,7 @@ CPPSRCS		= \
 		nsFtpModule.cpp \
 		$(NULL)

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/netwerk/protocol/http/src/Makefile.in
+++ b/netwerk/protocol/http/src/Makefile.in
@ -49,5 +49,7 @@ CPPSRCS		= \

 EXPORTS		= nsHTTPCID.h

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/netwerk/protocol/keyword/src/Makefile.in
+++ b/netwerk/protocol/keyword/src/Makefile.in
@ -37,5 +37,7 @@ CPPSRCS		= \
 		nsKeywordProtocolFactory.cpp \
 		$(NULL)

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/netwerk/protocol/resource/src/Makefile.in
+++ b/netwerk/protocol/resource/src/Makefile.in
@ -37,6 +37,8 @@ CPPSRCS		= \
 		nsResourceProtocolModule.cpp \
 		$(NULL)

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

 ifeq ($(OS_ARCH), Linux)
--- a/netwerk/streamconv/converters/Makefile.in
+++ b/netwerk/streamconv/converters/Makefile.in
@ -43,5 +43,7 @@ EXPORTS		= \
 		nsFTPDirListingConv.h \
 		$(NULL)

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/netwerk/streamconv/src/Makefile.in
+++ b/netwerk/streamconv/src/Makefile.in
@ -37,5 +37,7 @@ CPPSRCS		= \
 		nsStreamConvServiceFactory.cpp \
 		$(NULL)

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/parser/htmlparser/robot/Makefile.in
+++ b/parser/htmlparser/robot/Makefile.in
@ -34,4 +34,6 @@ ifdef ENABLE_TESTS
 DIRS		= test
 endif

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@ -119,6 +119,8 @@ EXTRA_DSO_LDOPTS += \
 		$(NULL)
 endif

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 include $(topsrcdir)/config/rules.mk

 #
--- a/rdf/build/Makefile.in
+++ b/rdf/build/Makefile.in
@ -56,6 +56,8 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_TIMER_LIBS) \
 		-L$(DIST)/bin \
 		-ljsdom \
+		-lmozjs \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/rdf/chrome/build/Makefile.in
+++ b/rdf/chrome/build/Makefile.in
@ -42,6 +42,7 @@ EXTRA_DSO_LDOPTS = \
 		$(MKSHLIB_FORCE_ALL) \
 		$(SHARED_LIBRARY_LIBS) \
 		$(MKSHLIB_UNFORCE_ALL) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@ -44,6 +44,7 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-lraptorgfx	\
 		$(MOZ_TIMER_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/webshell/src/Makefile.in
+++ b/webshell/src/Makefile.in
@ -41,6 +41,7 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_TIMER_LIBS) \
 		-L$(DIST)/bin \
 		-ljsdom \
+		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)
 ifdef MOZ_PERF
 EXTRA_DSO_LDOPTS += \
--- a/widget/src/unix_services/toolkit_service/Makefile.in
+++ b/widget/src/unix_services/toolkit_service/Makefile.in
@ -1,48 +0,0 @@
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= toolkit_service
-IS_COMPONENT	= 1
-
-REQUIRES	= xpcom
-
-CPPSRCS		= \
-		nsUnixToolkitService.cpp \
-		nsUnixToolkitServiceFactory.cpp \
-		$(NULL)
-
-EXPORTS		= nsIUnixToolkitService.h
-
-EXTRA_DSO_LDOPTS = $(TOOLKIT_TK_LIBS)
-
-include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -D_IMPL_NS_TIMER
-CXXFLAGS	+= $(TK_CFLAGS)
-INCLUDES	+= $(TK_CFLAGS) -I$(srcdir)/.. -I$(srcdir)/../../xpwidgets
-
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@ -80,5 +80,7 @@ ifeq ($(OS_ARCH),BeOS)
 EXTRA_DSO_LDOPTS += -lbe
 endif

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS)
+
 $(LIBRARY) $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS) Makefile

--- a/xpcom/sample/Makefile.in
+++ b/xpcom/sample/Makefile.in
@ -41,6 +41,8 @@ XPIDLSRCS	= nsISample.idl

 include $(topsrcdir)/config/rules.mk

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
 install:: $(TARGETS)
 	$(INSTALL) $(srcdir)/xpconnect-sample.html $(DIST)/bin/res/samples
 	$(INSTALL) $(srcdir)/nsSample.js $(DIST)/bin/components
--- a/xpcom/tests/dynamic/Makefile.in
+++ b/xpcom/tests/dynamic/Makefile.in
@ -34,3 +34,6 @@ LOCAL_INCLUDES	= -I$(srcdir)/.. -I$(srcdir)/../../public

 include $(topsrcdir)/config/rules.mk

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+
+
--- a/xpcom/tests/services/Makefile.in
+++ b/xpcom/tests/services/Makefile.in
@ -32,5 +32,7 @@ CPPSRCS		= MyService.cpp

 LOCAL_INCLUDES	= -I$(srcdir)/..

+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_XPCOM_LIBS)
+
 include $(topsrcdir)/config/rules.mk

--- a/xpfe/AppCores/src/Makefile.in
+++ b/xpfe/AppCores/src/Makefile.in
@ -45,7 +45,13 @@ CPPSRCS		= \
 		nsAppCores.cpp \
 		$(NULL)

-EXTRA_DSO_LDOPTS = -L$(DIST)/bin -ljsdom
+EXTRA_DSO_LDOPTS += \
+		-L$(DIST)/bin \
+                $(MOZ_COMPONENT_LIBS) \
+                -lmozjs \
+                -ljsdom \
+                $(NULL)
+

 include $(topsrcdir)/config/rules.mk

--- a/xpfe/appshell/src/Makefile.in
+++ b/xpfe/appshell/src/Makefile.in
@ -51,7 +51,10 @@ CPPSRCS		= \
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin -ljsdom \
 		$(MOZ_NECKO_UTIL_LIBS) \
-		$(FULLCIRCLE_LIBS)
+		$(FULLCIRCLE_LIBS) \
+		$(MOZ_COMPONENT_LIBS) \
+		-lmozjs \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk

--- a/xpfe/components/directory/Makefile.in
+++ b/xpfe/components/directory/Makefile.in
@ -53,6 +53,7 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-lxpcom \
 		$(NSPR_LIBS) \
+		-lmozjs \
 		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/xpinstall/notifier/Makefile.in
+++ b/xpinstall/notifier/Makefile.in
@ -38,7 +38,9 @@ EXPORT_RESOURCE_NOTIFIER = \
 		$(srcdir)/notification.gif \
 		$(NULL)

-EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lmozreg_s
+EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lmozreg_s \
+		$(MOZ_COMPONENT_LIBS) \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk

--- a/xpinstall/src/Makefile.in
+++ b/xpinstall/src/Makefile.in
@ -70,6 +70,8 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_REGISTRY_LIBS) \
 		-L$(DIST)/bin \
 		-ljsdom \
+		-lmozjs \
+		$(MOZ_COMPONENT_LIBS) \
 		$(ZLIB_LIBS) \
 		$(NULL)