From f0c83b3d5af8e11f54862016f0d90a0573ec4aab Mon Sep 17 00:00:00 2001 From: "jdunn%netscape.com" Date: Tue, 16 Nov 1999 06:02:31 +0000 Subject: [PATCH] Fixing all unresolved symbols on unix. The bug has the diff's r dp@netscape.com (ramiro helped me with it) # 18688 git-svn-id: svn://10.0.0.236/trunk@53637 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/autoconf.mk.in | 2 ++ mozilla/dom/src/build/Makefile.in | 2 ++ mozilla/dom/src/jsurl/Makefile.in | 2 ++ mozilla/editor/base/Makefile.in | 2 ++ mozilla/editor/txmgr/src/Makefile.in | 1 + mozilla/editor/txtsvc/src/Makefile.in | 1 + mozilla/extensions/wallet/build/Makefile.in | 1 + mozilla/extensions/wallet/src/Makefile.in | 2 ++ mozilla/gfx/src/Makefile.in | 1 + mozilla/gfx/src/gtk/Makefile.in | 4 ++++ mozilla/htmlparser/robot/Makefile.in | 2 ++ mozilla/htmlparser/src/Makefile.in | 2 ++ mozilla/intl/chardet/src/Makefile.in | 2 ++ mozilla/intl/locale/src/unix/Makefile.in | 4 +++- mozilla/intl/lwbrk/src/Makefile.in | 2 ++ mozilla/intl/strres/src/Makefile.in | 5 +++-- mozilla/intl/uconv/src/Makefile.in | 4 +++- mozilla/intl/uconv/ucvcn/Makefile.in | 2 ++ mozilla/intl/uconv/ucvja/Makefile.in | 2 ++ mozilla/intl/uconv/ucvko/Makefile.in | 2 ++ mozilla/intl/uconv/ucvlatin/Makefile.in | 2 ++ mozilla/intl/uconv/ucvtw/Makefile.in | 2 ++ mozilla/intl/uconv/ucvtw2/Makefile.in | 2 ++ mozilla/intl/unicharutil/src/Makefile.in | 5 +++-- mozilla/js/src/Makefile.in | 2 ++ mozilla/js/src/xpconnect/loader/Makefile.in | 5 +++++ mozilla/js/src/xpconnect/src/Makefile.in | 5 +++++ mozilla/js/src/xpconnect/tests/components/Makefile.in | 5 +++++ mozilla/mailnews/compose/build/Makefile.in | 1 + mozilla/modules/libimg/gifcom/Makefile.in | 2 ++ mozilla/modules/libimg/jpgcom/Makefile.in | 4 +++- mozilla/modules/libimg/pngcom/Makefile.in | 4 +++- mozilla/modules/plugin/base/src/Makefile.in | 5 +++-- mozilla/modules/plugin/nglsrc/Makefile.in | 5 +++-- mozilla/modules/zlib/src/Makefile.in | 2 ++ mozilla/netwerk/build/Makefile.in | 1 + mozilla/netwerk/mime/src/Makefile.in | 2 ++ mozilla/netwerk/protocol/about/src/Makefile.in | 2 ++ mozilla/netwerk/protocol/data/src/Makefile.in | 2 ++ mozilla/netwerk/protocol/file/src/Makefile.in | 2 ++ mozilla/netwerk/protocol/ftp/src/Makefile.in | 2 ++ mozilla/netwerk/protocol/http/src/Makefile.in | 2 ++ mozilla/netwerk/protocol/keyword/src/Makefile.in | 2 ++ mozilla/netwerk/protocol/resource/src/Makefile.in | 2 ++ mozilla/netwerk/streamconv/converters/Makefile.in | 2 ++ mozilla/netwerk/streamconv/src/Makefile.in | 2 ++ mozilla/parser/htmlparser/robot/Makefile.in | 2 ++ mozilla/parser/htmlparser/src/Makefile.in | 2 ++ mozilla/rdf/build/Makefile.in | 2 ++ mozilla/rdf/chrome/build/Makefile.in | 1 + mozilla/view/src/Makefile.in | 1 + mozilla/webshell/src/Makefile.in | 1 + .../widget/src/unix_services/toolkit_service/Makefile.in | 4 +++- mozilla/xpcom/build/Makefile.in | 2 ++ mozilla/xpcom/sample/Makefile.in | 2 ++ mozilla/xpcom/tests/dynamic/Makefile.in | 3 +++ mozilla/xpcom/tests/services/Makefile.in | 2 ++ mozilla/xpfe/AppCores/src/Makefile.in | 8 +++++++- mozilla/xpfe/appshell/src/Makefile.in | 5 ++++- mozilla/xpfe/components/directory/Makefile.in | 1 + mozilla/xpinstall/notifier/Makefile.in | 4 +++- mozilla/xpinstall/src/Makefile.in | 2 ++ 62 files changed, 143 insertions(+), 16 deletions(-) diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index aae9076db2a..fd4f519d15f 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/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 diff --git a/mozilla/dom/src/build/Makefile.in b/mozilla/dom/src/build/Makefile.in index 3bdaf19a981..69fb1f983e4 100644 --- a/mozilla/dom/src/build/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/dom/src/jsurl/Makefile.in b/mozilla/dom/src/jsurl/Makefile.in index f7ff78f27d9..b8d12dc9e3c 100644 --- a/mozilla/dom/src/jsurl/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/editor/base/Makefile.in b/mozilla/editor/base/Makefile.in index 11d63d4e8e8..20e39df6471 100644 --- a/mozilla/editor/base/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/editor/txmgr/src/Makefile.in b/mozilla/editor/txmgr/src/Makefile.in index d46a35a0539..dd6efe3968a 100644 --- a/mozilla/editor/txmgr/src/Makefile.in +++ b/mozilla/editor/txmgr/src/Makefile.in @@ -42,6 +42,7 @@ CPPSRCS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ + $(NSPR_LIBS) \ -lxpcom \ $(NULL) diff --git a/mozilla/editor/txtsvc/src/Makefile.in b/mozilla/editor/txtsvc/src/Makefile.in index 0362cb8d683..8c3083db982 100644 --- a/mozilla/editor/txtsvc/src/Makefile.in +++ b/mozilla/editor/txtsvc/src/Makefile.in @@ -41,6 +41,7 @@ CPPSRCS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ + $(NSPR_LIBS) \ -lxpcom \ $(NULL) diff --git a/mozilla/extensions/wallet/build/Makefile.in b/mozilla/extensions/wallet/build/Makefile.in index a210c1698e0..811c3c59678 100644 --- a/mozilla/extensions/wallet/build/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/extensions/wallet/src/Makefile.in b/mozilla/extensions/wallet/src/Makefile.in index 5d47b528f1e..1896e39cfd5 100644 --- a/mozilla/extensions/wallet/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/gfx/src/Makefile.in b/mozilla/gfx/src/Makefile.in index 4a355cced95..87701eddc4c 100644 --- a/mozilla/gfx/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/gfx/src/gtk/Makefile.in b/mozilla/gfx/src/gtk/Makefile.in index c1feae646de..f5c1b054743 100644 --- a/mozilla/gfx/src/gtk/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/htmlparser/robot/Makefile.in b/mozilla/htmlparser/robot/Makefile.in index ce78007de48..450647acb83 100644 --- a/mozilla/htmlparser/robot/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in index 7e7126c2fcf..209c647ffa2 100644 --- a/mozilla/htmlparser/src/Makefile.in +++ b/mozilla/htmlparser/src/Makefile.in @@ -119,6 +119,8 @@ EXTRA_DSO_LDOPTS += \ $(NULL) endif +EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) + include $(topsrcdir)/config/rules.mk # diff --git a/mozilla/intl/chardet/src/Makefile.in b/mozilla/intl/chardet/src/Makefile.in index e325823a669..a4af133b9bb 100644 --- a/mozilla/intl/chardet/src/Makefile.in +++ b/mozilla/intl/chardet/src/Makefile.in @@ -43,5 +43,7 @@ CPPSRCS = \ nsCyrillicDetector.cpp \ $(NULL) +EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/intl/locale/src/unix/Makefile.in b/mozilla/intl/locale/src/unix/Makefile.in index 12e9946ef8d..1aa482bf852 100644 --- a/mozilla/intl/locale/src/unix/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/intl/lwbrk/src/Makefile.in b/mozilla/intl/lwbrk/src/Makefile.in index c7bb1b9c3ed..be35e345e6f 100644 --- a/mozilla/intl/lwbrk/src/Makefile.in +++ b/mozilla/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))) diff --git a/mozilla/intl/strres/src/Makefile.in b/mozilla/intl/strres/src/Makefile.in index 79cda70495f..c525b18f385 100644 --- a/mozilla/intl/strres/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/intl/uconv/src/Makefile.in b/mozilla/intl/uconv/src/Makefile.in index fabe4b47a53..04762de428c 100644 --- a/mozilla/intl/uconv/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/intl/uconv/ucvcn/Makefile.in b/mozilla/intl/uconv/ucvcn/Makefile.in index d752f521f50..908c4ffdba6 100644 --- a/mozilla/intl/uconv/ucvcn/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/intl/uconv/ucvja/Makefile.in b/mozilla/intl/uconv/ucvja/Makefile.in index 3097f7b375f..f1d4f6ee582 100644 --- a/mozilla/intl/uconv/ucvja/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/intl/uconv/ucvko/Makefile.in b/mozilla/intl/uconv/ucvko/Makefile.in index d754beb640e..3602a3948d1 100644 --- a/mozilla/intl/uconv/ucvko/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/intl/uconv/ucvlatin/Makefile.in b/mozilla/intl/uconv/ucvlatin/Makefile.in index f687bf39db3..1f825ec0b28 100644 --- a/mozilla/intl/uconv/ucvlatin/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/intl/uconv/ucvtw/Makefile.in b/mozilla/intl/uconv/ucvtw/Makefile.in index 65246b7012a..c0d04f3d4b1 100644 --- a/mozilla/intl/uconv/ucvtw/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/intl/uconv/ucvtw2/Makefile.in b/mozilla/intl/uconv/ucvtw2/Makefile.in index bc26cfcc80d..cb697ea415c 100644 --- a/mozilla/intl/uconv/ucvtw2/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/intl/unicharutil/src/Makefile.in b/mozilla/intl/unicharutil/src/Makefile.in index 63750b3a1c0..bf851e4f0c2 100644 --- a/mozilla/intl/unicharutil/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/js/src/Makefile.in b/mozilla/js/src/Makefile.in index e81cf3d1187..0be0781d9ca 100644 --- a/mozilla/js/src/Makefile.in +++ b/mozilla/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)) diff --git a/mozilla/js/src/xpconnect/loader/Makefile.in b/mozilla/js/src/xpconnect/loader/Makefile.in index c1a190e3dc3..0d6732d5a3b 100644 --- a/mozilla/js/src/xpconnect/loader/Makefile.in +++ b/mozilla/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) + diff --git a/mozilla/js/src/xpconnect/src/Makefile.in b/mozilla/js/src/xpconnect/src/Makefile.in index 7a3d9c892d8..89c4fa500b5 100644 --- a/mozilla/js/src/xpconnect/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/js/src/xpconnect/tests/components/Makefile.in b/mozilla/js/src/xpconnect/tests/components/Makefile.in index cb63144c9de..0b0347395e4 100644 --- a/mozilla/js/src/xpconnect/tests/components/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/mailnews/compose/build/Makefile.in b/mozilla/mailnews/compose/build/Makefile.in index 5db3277e8d9..1418b04eaa7 100644 --- a/mozilla/mailnews/compose/build/Makefile.in +++ b/mozilla/mailnews/compose/build/Makefile.in @@ -44,6 +44,7 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ + -lmozjs \ -lmsgbaseutil \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/modules/libimg/gifcom/Makefile.in b/mozilla/modules/libimg/gifcom/Makefile.in index a25c5ed6894..b4df8d01523 100644 --- a/mozilla/modules/libimg/gifcom/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/modules/libimg/jpgcom/Makefile.in b/mozilla/modules/libimg/jpgcom/Makefile.in index 3df9f58ff2c..812efb7377b 100644 --- a/mozilla/modules/libimg/jpgcom/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/modules/libimg/pngcom/Makefile.in b/mozilla/modules/libimg/pngcom/Makefile.in index bc04feff4b7..601b94456fd 100644 --- a/mozilla/modules/libimg/pngcom/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index 164e831d712..9dc64ac4984 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/modules/plugin/nglsrc/Makefile.in b/mozilla/modules/plugin/nglsrc/Makefile.in index 164e831d712..9dc64ac4984 100644 --- a/mozilla/modules/plugin/nglsrc/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/modules/zlib/src/Makefile.in b/mozilla/modules/zlib/src/Makefile.in index ee732d31a7f..1b4be28209f 100644 --- a/mozilla/modules/zlib/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/netwerk/build/Makefile.in b/mozilla/netwerk/build/Makefile.in index 6fe6c569fc4..fae268d65c3 100644 --- a/mozilla/netwerk/build/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/netwerk/mime/src/Makefile.in b/mozilla/netwerk/mime/src/Makefile.in index 6375f28a63f..de14a385bf1 100644 --- a/mozilla/netwerk/mime/src/Makefile.in +++ b/mozilla/netwerk/mime/src/Makefile.in @@ -38,5 +38,7 @@ CPPSRCS = \ nsMIMEServiceFactory.cpp \ $(NULL) +EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/protocol/about/src/Makefile.in b/mozilla/netwerk/protocol/about/src/Makefile.in index 91a5f8c1d7f..77c4de644d8 100644 --- a/mozilla/netwerk/protocol/about/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/netwerk/protocol/data/src/Makefile.in b/mozilla/netwerk/protocol/data/src/Makefile.in index 3f5a92184ac..6754a9894e7 100644 --- a/mozilla/netwerk/protocol/data/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/netwerk/protocol/file/src/Makefile.in b/mozilla/netwerk/protocol/file/src/Makefile.in index 6427b91b74d..e8e3c5ed475 100644 --- a/mozilla/netwerk/protocol/file/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/netwerk/protocol/ftp/src/Makefile.in b/mozilla/netwerk/protocol/ftp/src/Makefile.in index 2dd7159fb55..1e7c1aaabc8 100644 --- a/mozilla/netwerk/protocol/ftp/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/netwerk/protocol/http/src/Makefile.in b/mozilla/netwerk/protocol/http/src/Makefile.in index cb21e758a56..80937daf1cd 100644 --- a/mozilla/netwerk/protocol/http/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/netwerk/protocol/keyword/src/Makefile.in b/mozilla/netwerk/protocol/keyword/src/Makefile.in index 42341fccead..d6256efca5e 100644 --- a/mozilla/netwerk/protocol/keyword/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/netwerk/protocol/resource/src/Makefile.in b/mozilla/netwerk/protocol/resource/src/Makefile.in index a5c1e0bd1db..9dc18ddaec0 100644 --- a/mozilla/netwerk/protocol/resource/src/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/netwerk/streamconv/converters/Makefile.in b/mozilla/netwerk/streamconv/converters/Makefile.in index 14afab941c6..3a08a260e1a 100644 --- a/mozilla/netwerk/streamconv/converters/Makefile.in +++ b/mozilla/netwerk/streamconv/converters/Makefile.in @@ -43,5 +43,7 @@ EXPORTS = \ nsFTPDirListingConv.h \ $(NULL) +EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/streamconv/src/Makefile.in b/mozilla/netwerk/streamconv/src/Makefile.in index 3ba431a1bff..d5a54d33875 100644 --- a/mozilla/netwerk/streamconv/src/Makefile.in +++ b/mozilla/netwerk/streamconv/src/Makefile.in @@ -37,5 +37,7 @@ CPPSRCS = \ nsStreamConvServiceFactory.cpp \ $(NULL) +EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/parser/htmlparser/robot/Makefile.in b/mozilla/parser/htmlparser/robot/Makefile.in index ce78007de48..450647acb83 100644 --- a/mozilla/parser/htmlparser/robot/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in index 7e7126c2fcf..209c647ffa2 100644 --- a/mozilla/parser/htmlparser/src/Makefile.in +++ b/mozilla/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 # diff --git a/mozilla/rdf/build/Makefile.in b/mozilla/rdf/build/Makefile.in index 62f3e4e1f42..f16dded2c2d 100644 --- a/mozilla/rdf/build/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/rdf/chrome/build/Makefile.in b/mozilla/rdf/chrome/build/Makefile.in index fbf692a3e85..56372e39e13 100644 --- a/mozilla/rdf/chrome/build/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/view/src/Makefile.in b/mozilla/view/src/Makefile.in index 0b46c26e3d6..53b7cbae008 100644 --- a/mozilla/view/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/webshell/src/Makefile.in b/mozilla/webshell/src/Makefile.in index 6a2c4654949..abbbaebe2a4 100644 --- a/mozilla/webshell/src/Makefile.in +++ b/mozilla/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 += \ diff --git a/mozilla/widget/src/unix_services/toolkit_service/Makefile.in b/mozilla/widget/src/unix_services/toolkit_service/Makefile.in index 46a66558f10..546565a80ac 100644 --- a/mozilla/widget/src/unix_services/toolkit_service/Makefile.in +++ b/mozilla/widget/src/unix_services/toolkit_service/Makefile.in @@ -38,7 +38,9 @@ CPPSRCS = \ EXPORTS = nsIUnixToolkitService.h -EXTRA_DSO_LDOPTS = $(TOOLKIT_TK_LIBS) +EXTRA_DSO_LDOPTS = $(TOOLKIT_TK_LIBS) \ + $(MOZ_COMPONENT_LIBS) \ + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/build/Makefile.in b/mozilla/xpcom/build/Makefile.in index 88595078011..83943e1a7b1 100644 --- a/mozilla/xpcom/build/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpcom/sample/Makefile.in b/mozilla/xpcom/sample/Makefile.in index 6259a9d6bcc..49783eb0bf3 100644 --- a/mozilla/xpcom/sample/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpcom/tests/dynamic/Makefile.in b/mozilla/xpcom/tests/dynamic/Makefile.in index f27b93b1b6a..0e20e860caa 100644 --- a/mozilla/xpcom/tests/dynamic/Makefile.in +++ b/mozilla/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) + + diff --git a/mozilla/xpcom/tests/services/Makefile.in b/mozilla/xpcom/tests/services/Makefile.in index 747aae470c2..cb327d5099c 100644 --- a/mozilla/xpcom/tests/services/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpfe/AppCores/src/Makefile.in b/mozilla/xpfe/AppCores/src/Makefile.in index f466b611fc5..7558161a174 100644 --- a/mozilla/xpfe/AppCores/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpfe/appshell/src/Makefile.in b/mozilla/xpfe/appshell/src/Makefile.in index 8fc2fd7592a..b1b82434972 100644 --- a/mozilla/xpfe/appshell/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpfe/components/directory/Makefile.in b/mozilla/xpfe/components/directory/Makefile.in index 492218ba5f7..0bfd2ec65bd 100644 --- a/mozilla/xpfe/components/directory/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpinstall/notifier/Makefile.in b/mozilla/xpinstall/notifier/Makefile.in index fe96e0b612c..4517a8db89c 100644 --- a/mozilla/xpinstall/notifier/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpinstall/src/Makefile.in b/mozilla/xpinstall/src/Makefile.in index fdfa1fe9149..4a5c3d3ba60 100644 --- a/mozilla/xpinstall/src/Makefile.in +++ b/mozilla/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)