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

Moved static MOZ_COMPONENT_NSPR_LIBS, MOZ_COMPONENT_XPCOM_LIBS, MOZ_COMPONENT_LIBS definitions from configure.in to config.mk. Replaced -lxpcom in Makefiles to $(XPCOM_LIBS) so that we can optionally link against -lboehm when needed. Bug #31287

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@65143 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org
2000-04-04 04:46:38 +00:00
parent c4f7587cf1
commit a26020ddae
111 changed files with 425 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/caps/src/Makefile.in
View File

@@ -48,7 +48,7 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(ZLIB_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
$(NSPR_LIBS) \
$(NULL)

9
mozilla/config/autoconf.mk.in
View File

@@ -67,10 +67,6 @@ NEED_BASE_DLL_NAME_ALSO = @NEED_BASE_DLL_NAME_ALSO@
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
CookieManagement=1
SingleSignon=1
@@ -228,11 +224,6 @@ GTK_CONFIG = @GTK_CONFIG@
TK_CFLAGS = @TK_CFLAGS@
TK_LIBS = @TK_LIBS@
MOZ_TOOLKIT_REGISTRY_CFLAGS = \
-DWIDGET_DLL=\"libwidget_$(MOZ_WIDGET_TOOLKIT).$(DLL_SUFFIX)\" \
-DGFXWIN_DLL=\"libgfx_$(MOZ_GFX_TOOLKIT).$(DLL_SUFFIX)\" \
$(TK_CFLAGS)
MOZ_ENABLE_GTK = @MOZ_ENABLE_GTK@
MOZ_ENABLE_MOTIF = @MOZ_ENABLE_MOTIF@
MOZ_ENABLE_XLIB = @MOZ_ENABLE_XLIB@

23
mozilla/config/config.mk
View File

@@ -305,6 +305,29 @@ PUBLIC = $(DIST)/include
DEPENDENCIES = .md
# ========================================================
# MOZ_COMPONENTS_LIBS
#
# 'extra' link flags iff this is a component
# See the IS_COMPONENT rule in rules.mk
# ========================================================
MOZ_COMPONENT_NSPR_LIBS =-L$(DIST)/bin $(NSPR_LIBS)
MOZ_COMPONENT_XPCOM_LIBS=-L$(DIST)/bin -lxpcom
MOZ_COMPONENT_LIBS=$(MOZ_COMPONENT_NSPR_LIBS) $(MOZ_COMPONENT_XPCOM_LIBS)
XPCOM_LIBS=-L$(DIST)/bin -lxpcom
ifdef GC_LEAK_DETECTOR
MOZ_COMPONENT_XPCOM_LIBS += -lboehm
XPCOM_LIBS += -lboehm
endif
MOZ_TOOLKIT_REGISTRY_CFLAGS = \
-DWIDGET_DLL=\"libwidget_$(MOZ_WIDGET_TOOLKIT)$(DLL_SUFFIX)\" \
-DGFXWIN_DLL=\"libgfx_$(MOZ_GFX_TOOLKIT)$(DLL_SUFFIX)\" \
$(TK_CFLAGS)
ifneq ($(OS_ARCH),WINNT)
ifdef MOZ_NATIVE_MAKEDEPEND

586
mozilla/configure vendored
View File

File diff suppressed because it is too large Load Diff

19
mozilla/configure.in
View File

@@ -456,18 +456,6 @@ case "$host" in
esac
dnl ========================================================
dnl MOZ_COMPONENTS_LIBS
dnl
dnl 'extra' link flags iff this is a component
dnl See the IS_COMPONENT rule in rules.mk
dnl ========================================================
MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)'
MOZ_COMPONENT_XPCOM_LIBS='-L$(DIST)/bin -lxpcom'
MOZ_COMPONENT_LIBS='$(MOZ_COMPONENT_NSPR_LIBS) $(MOZ_COMPONENT_XPCOM_LIBS)'
dnl ========================================================
dnl Check which style vtables we're using on Solaris
dnl Options current are:
@@ -2795,7 +2783,8 @@ MOZ_ARG_ENABLE_BOOL(profile,
MOZ_ARG_ENABLE_BOOL(boehm,
[ --enable-boehm Enable the Boehm Garbage Collector],
AC_DEFINE(GC_LEAK_DETECTOR)
GC_LEAK_DETECTOR=1)
GC_LEAK_DETECTOR=1
)
dnl This will enable logging of addref, release, ctor, dtor.
MOZ_ARG_ENABLE_BOOL(logrefcnt,
@@ -3065,10 +3054,6 @@ AC_SUBST(BUILD_IDLC)
AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
AC_SUBST(MOZ_COMPONENT_NSPR_LIBS)
AC_SUBST(MOZ_COMPONENT_XPCOM_LIBS)
AC_SUBST(MOZ_COMPONENT_LIBS)
AC_SUBST(MOZ_GLE)
AC_SUBST(MOZ_BUILD_ROOT)

2
mozilla/db/mork/build/Makefile.in
View File

@@ -45,7 +45,7 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

4
mozilla/editor/txmgr/src/Makefile.in
View File

@@ -40,10 +40,8 @@ CPPSRCS = \
$(NULL)
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
-lxpcom \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
mozilla/editor/txmgr/tests/Makefile.in
View File

@@ -30,7 +30,7 @@ PROGRAM = TestTXMgr
CPPSRCS = TestTXMgr.cpp
LIBS = -lxpcom $(NSPR_LIBS)
LIBS = $(XPCOM_LIBS) $(NSPR_LIBS)
include $(topsrcdir)/config/rules.mk

2
mozilla/editor/txtsvc/src/Makefile.in
View File

@@ -41,8 +41,8 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
-lxpcom \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
mozilla/extensions/cookie/Makefile.in
View File

@@ -52,8 +52,8 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
-lxpcom \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
mozilla/extensions/cookie/tests/Makefile.in
View File

@@ -31,7 +31,7 @@ CPPSRCS = TestCookie.cpp
REQUIRES = js cookie pref xpcom include
LIBS = -lxpcom $(NSPR_LIBS)
LIBS = $(XPCOM_LIBS) $(NSPR_LIBS)
include $(topsrcdir)/config/rules.mk

2
mozilla/extensions/pics/tests/Makefile.in
View File

@@ -33,7 +33,7 @@ CPPSRCS = TestPICS.cpp
REQUIRES = js pics pref xpcom include
LIBS = \
-lxpcom \
$(XPCOM_LIBS) \
-lpics \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/extensions/wallet/src/Makefile.in
View File

@@ -55,7 +55,7 @@ CHROME_FILES = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
$(NSPR_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
mozilla/extensions/xmlterm/geckoterm/Makefile.in
View File

@@ -71,7 +71,7 @@ GTK_GLUE = -lgtksuperwin
XP_DIST_LIBS = \
-lraptorgfx \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(JSJ_LIB) \
$(NULL)

2
mozilla/gfx/tests/Makefile.in
View File

@@ -36,7 +36,7 @@ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=)
LIBS = \
-lraptorgfx \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
$(MOZ_TIMER_LIBS) \
$(TK_LIBS) \

2
mozilla/gfx/tests/coverage/Makefile.in
View File

@@ -34,7 +34,7 @@ CPPSRCS = \
$(NULL)
LIBS = \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
$(MOZ_WIDGET_SUPPORT_LIBS) \
-lraptorgfx \

2
mozilla/htmlparser/robot/test/Makefile.in
View File

@@ -34,7 +34,7 @@ CPPSRCS = RobotMain.cpp
LIBS = \
-lDebugRobot \
-lxpcom \
$(XPCOM_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/htmlparser/tests/logparse/Makefile.in
View File

@@ -32,7 +32,7 @@ CPPSRCS = logparse.cpp
LIBS = \
-lraptorhtmlpars \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/htmlparser/tests/outsinks/Makefile.in
View File

@@ -34,7 +34,7 @@ CPPSRCS = \
$(NULL)
LIBS = \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/intl/chardet/tests/Makefile.in
View File

@@ -30,7 +30,7 @@ PROGRAM = DetectCharset
CPPSRCS = DetectCharset.cpp
LIBS = -lxpcom $(NSPR_LIBS)
LIBS = $(XPCOM_LIBS) $(NSPR_LIBS)
include $(topsrcdir)/config/rules.mk

2
mozilla/intl/locale/tests/Makefile.in
View File

@@ -35,7 +35,7 @@ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=)
LOCAL_INCLUDES = -I$(srcdir)/../src
LIBS = -lxpcom $(NSPR_LIBS)
LIBS = $(XPCOM_LIBS) $(NSPR_LIBS)
include $(topsrcdir)/config/rules.mk

2
mozilla/intl/lwbrk/tests/Makefile.in
View File

@@ -30,7 +30,7 @@ PROGRAM = TestLineBreak
CPPSRCS = TestLineBreak.cpp
LIBS = -lxpcom $(NSPR_LIBS)
LIBS = $(XPCOM_LIBS) $(NSPR_LIBS)
include $(topsrcdir)/config/rules.mk

2
mozilla/intl/strres/tests/Makefile.in
View File

@@ -40,7 +40,7 @@ EXPORT_RESOURCE = \
LIBS = \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(MOZ_TIMER_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/intl/unicharutil/tests/Makefile.in
View File

@@ -35,7 +35,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s
endif
LIBS = \
-lxpcom \
$(XPCOM_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/js/src/xpconnect/loader/Makefile.in
View File

@@ -33,7 +33,7 @@ include $(topsrcdir)/config/rules.mk
DEFINES += -DJSFILE -DJS_THREADSAFE
ifneq ($(OS_ARCH),BeOS)
LIBS += -lmozjs -lxpcom $(NSPR_LIBS)
LIBS += -lmozjs $(XPCOM_LIBS) $(NSPR_LIBS)
endif
EXTRA_DSO_LDOPTS += \

2
mozilla/js/src/xpconnect/shell/Makefile.in
View File

@@ -45,7 +45,7 @@ CPPSRCS = xpcshell.cpp
LIBS = \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/js/src/xpconnect/src/Makefile.in
View File

@@ -76,7 +76,7 @@ IS_COMPONENT = 1
ifneq ($(OS_ARCH),BeOS)
LIBS += \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)
endif

2
mozilla/js/src/xpconnect/tests/Makefile.in
View File

@@ -49,7 +49,7 @@ LIBS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/layout/base/tests/Makefile.in
View File

@@ -37,7 +37,7 @@ LIBS += \
-lraptorgfx \
-lmozjs \
$(MOZ_TIMER_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL)

2
mozilla/layout/build/Makefile.in
View File

@@ -88,7 +88,7 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_TIMER_LIBS) \
-L$(DIST)/bin \
$(NSPR_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
-lraptorgfx \
-ljsdom \
-lmozjs \

2
mozilla/layout/html/tests/Makefile.in
View File

@@ -47,7 +47,7 @@ LIBS = \
$(MOZ_TIMER_LIBS) \
-lmozjs \
-lraptorgfx \
-lxpcom \
$(XPCOM_LIBS) \
$(TK_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \

2
mozilla/mailnews/addrbook/build/Makefile.in
View File

@@ -44,7 +44,7 @@ EXTRA_DSO_LDOPTS = \
$(DIST)/lib/librdfutil_s.a \
-L$(DIST)/bin \
$(NSPR_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
mozilla/mailnews/base/build/Makefile.in
View File

@@ -46,7 +46,7 @@ EXTRA_DSO_LDOPTS = \
$(DIST)/lib/librdfutil_s.a \
$(MOZ_TIMER_LIBS) \
-L$(DIST)/bin \
-lxpcom \
$(XPCOM_LIBS) \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/mailnews/base/tests/Makefile.in
View File

@@ -37,7 +37,7 @@ LIBS = \
-L$(DIST)/lib \
-L$(DIST)/bin \
$(NSPR_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
mozilla/mailnews/base/tests/identity/Makefile.in
View File

@@ -31,7 +31,7 @@ CPPSRCS = identity.cpp
LIBS = \
-L$(DIST)/bin \
-lxpcom \
$(XPCOM_LIBS) \
$(MOZ_TIMER_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/mailnews/base/util/Makefile.in
View File

@@ -70,7 +70,7 @@ EXPORTS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
-lrdfutil_s \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/mailnews/compose/build/Makefile.in
View File

@@ -43,7 +43,7 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
-lmsgbaseutil \
$(NSPR_LIBS) \

2
mozilla/mailnews/compose/tests/compose/Makefile.in
View File

@@ -32,7 +32,7 @@ CPPSRCS = test.cpp
LIBS = \
-lmsgbaseutil \
-lxpcom \
$(XPCOM_LIBS) \
$(MOZ_TIMER_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \

2
mozilla/mailnews/compose/tests/compose2/Makefile.in
View File

@@ -33,7 +33,7 @@ CPPSRCS = test2.cpp
LIBS = \
$(MOZ_TIMER_LIBS) \
$(NSPR_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
-lraptorgfx \
-lmsgbaseutil \

2
mozilla/mailnews/compose/tests/geturl/Makefile.in
View File

@@ -35,7 +35,7 @@ CPPSRCS = \
LIBS = \
$(MOZ_TIMER_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
$(NSPR_LIBS) \
$(TK_LIBS) \

2
mozilla/mailnews/compose/tests/sendlater/Makefile.in
View File

@@ -33,7 +33,7 @@ CPPSRCS = test.cpp
LIBS = \
$(MOZ_TIMER_LIBS) \
-lraptorgfx \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
-lmsgbaseutil \
$(NSPR_LIBS) \

2
mozilla/mailnews/compose/tests/sendpage/Makefile.in
View File

@@ -32,7 +32,7 @@ CPPSRCS = Test.cpp
LIBS = \
$(MOZ_TIMER_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
-lmsgbaseutil \
$(NSPR_LIBS) \

2
mozilla/mailnews/compose/tests/smtp/Makefile.in
View File

@@ -31,7 +31,7 @@ PROGRAM = smtpTest
CPPSRCS = smtpTest.cpp
LIBS = \
-lxpcom \
$(XPCOM_LIBS) \
$(MOZ_TIMER_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \

2
mozilla/mailnews/db/msgdb/build/Makefile.in
View File

@@ -41,7 +41,7 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/mailnews/imap/build/Makefile.in
View File

@@ -43,7 +43,7 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
-lrdfutil_s \
-lmsgbaseutil \
$(NSPR_LIBS) \

2
mozilla/mailnews/imap/tests/harness/Makefile.in
View File

@@ -33,7 +33,7 @@ CPPSRCS = imapProtocolTest.cpp
LIBS = \
-L$(DIST)/bin \
-lxpcom \
$(XPCOM_LIBS) \
-lmsgbaseutil \
$(MOZ_TIMER_LIBS) \
$(NSPR_LIBS) \

2
mozilla/mailnews/import/src/Makefile.in
View File

@@ -54,7 +54,7 @@ include $(topsrcdir)/config/rules.mk
EXTRA_DSO_LDOPTS += \
-L$(DIST)/bin \
$(NSPR_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
$(NULL)

2
mozilla/mailnews/import/text/src/Makefile.in
View File

@@ -41,7 +41,7 @@ CPPSRCS = nsTextFactory.cpp \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
$(NSPR_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
mozilla/mailnews/local/build/Makefile.in
View File

@@ -44,7 +44,7 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/lib \
$(DIST)/lib/librdfutil_s.a \
-L$(DIST)/bin \
-lxpcom \
$(XPCOM_LIBS) \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/mailnews/local/tests/mailbox/Makefile.in
View File

@@ -46,7 +46,7 @@ LIBS = \
-lnetcnvts \
-lnetwork \
-lnetlib \
-lxpcom \
$(XPCOM_LIBS) \
-lpwcac \
-lmozjs \
-lmork \

2
mozilla/mailnews/local/tests/mboxParser/Makefile.in
View File

@@ -42,7 +42,7 @@ LIBS = \
-lnetcnvts \
-lnetwork \
-lnetlib \
-lxpcom \
$(XPCOM_LIBS) \
-lpwcac \
-lmozjs \
$(NSPR_LIBS) \

2
mozilla/mailnews/local/tests/pop3/Makefile.in
View File

@@ -31,7 +31,7 @@ CPPSRCS = pop3Test.cpp
LIBS = \
-lmsgbaseutil \
-lxpcom \
$(XPCOM_LIBS) \
$(MOZ_TIMER_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \

2
mozilla/mailnews/mime/abstatus/build/Makefile.in
View File

@@ -35,7 +35,7 @@ CPPSRCS = nsMiscStatusFactory.cpp
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
-labstat_s \
$(NULL)

2
mozilla/mailnews/mime/abstatus/src/Makefile.in
View File

@@ -36,7 +36,7 @@ EXPORTS = nsMimeMiscStatus.h
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.

2
mozilla/mailnews/mime/build/Makefile.in
View File

@@ -43,7 +43,7 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/mailnews/mime/cthandlers/calendar/Makefile.in
View File

@@ -40,7 +40,7 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/mailnews/mime/cthandlers/signstub/Makefile.in
View File

@@ -40,7 +40,7 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/mailnews/mime/cthandlers/smimestub/Makefile.in
View File

@@ -40,7 +40,7 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/mailnews/mime/cthandlers/vcard/Makefile.in
View File

@@ -42,7 +42,7 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/mailnews/mime/emitters/build/Makefile.in
View File

@@ -43,7 +43,7 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/bin \
$(NSPR_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
mozilla/mailnews/mime/emitters/src/Makefile.in
View File

@@ -52,7 +52,7 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.

2
mozilla/mailnews/mime/tests/mimetest/Makefile.in
View File

@@ -32,7 +32,7 @@ CPPSRCS = mimetest.cpp
LIBS = \
-L$(DIST)/bin \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(MOZ_TIMER_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \

2
mozilla/mailnews/news/build/Makefile.in
View File

@@ -40,7 +40,7 @@ EXTRA_DSO_LDOPTS = \
$(SHARED_LIBRARY_LIBS) \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/bin \
-lxpcom \
$(XPCOM_LIBS) \
-lmsgbaseutil \
-L$(DIST)/lib \
-lrdfutil_s \

2
mozilla/mailnews/news/src/Makefile.in
View File

@@ -63,7 +63,7 @@ EXPORTS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-lxpcom \
$(XPCOM_LIBS) \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/mailnews/news/tests/newsParser/Makefile.in
View File

@@ -35,7 +35,7 @@ LIBS = \
-lmozjs \
-lraptorgfx \
-lmsgbaseutil \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/modules/libjar/Makefile.in
View File

@@ -51,7 +51,7 @@ XPIDLSRCS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
$(ZLIB_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/modules/libpref/src/Makefile.in
View File

@@ -69,7 +69,7 @@ endif
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
$(NSPR_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
$(NULL)

2
mozilla/netwerk/cache/filecache/test/Makefile.in vendored
View File

@@ -36,7 +36,7 @@ endif
LIBS = \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
-lmozdbm_s \
$(MOZ_NECKO_UTIL_LIBS) \
$(LOST_SYM_LIBS) \

2
mozilla/netwerk/streamconv/test/Makefile.in
View File

@@ -41,7 +41,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s
endif
LIBS = \
-lxpcom \
$(XPCOM_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/netwerk/test/Makefile.in
View File

@@ -52,7 +52,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxpcomio_s -lxptinfo -lmozreg_s
endif
LIBS = \
-lxpcom \
$(XPCOM_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/parser/htmlparser/robot/test/Makefile.in
View File

@@ -34,7 +34,7 @@ CPPSRCS = RobotMain.cpp
LIBS = \
-lDebugRobot \
-lxpcom \
$(XPCOM_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/parser/htmlparser/tests/logparse/Makefile.in
View File

@@ -32,7 +32,7 @@ CPPSRCS = logparse.cpp
LIBS = \
-lraptorhtmlpars \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/parser/htmlparser/tests/outsinks/Makefile.in
View File

@@ -34,7 +34,7 @@ CPPSRCS = \
$(NULL)
LIBS = \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/profile/pref-migrator/src/Makefile.in
View File

@@ -42,7 +42,7 @@ EXPORTS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
$(NSPR_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

2
mozilla/profile/src/Makefile.in
View File

@@ -36,7 +36,7 @@ CPPSRCS = nsProfile.cpp \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/rdf/tests/domds/Makefile.in
View File

@@ -48,7 +48,7 @@ XPIDLSRCS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
-lrdfutil_s \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/rdf/tests/dsds/Makefile.in
View File

@@ -43,7 +43,7 @@ RESOURCE_SAMPLES = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/rdf/tests/localfile/Makefile.in
View File

@@ -30,7 +30,7 @@ PROGRAM = localfile
CPPSRCS = localfile.cpp
LIBS = \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/rdf/tests/rdfcat/Makefile.in
View File

@@ -32,7 +32,7 @@ CPPSRCS = rdfcat.cpp
LIBS = \
$(MOZ_TIMER_LIBS) \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL)

2
mozilla/rdf/tests/rdfpoll/Makefile.in
View File

@@ -32,7 +32,7 @@ CPPSRCS = rdfpoll.cpp
LIBS = \
$(MOZ_TIMER_LIBS) \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(TK_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \

2
mozilla/rdf/tests/rdfsink/Makefile.in
View File

@@ -30,7 +30,7 @@ PROGRAM = rdfsink
CPPSRCS = rdfsink.cpp
LIBS = \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/uriloader/build/Makefile.in
View File

@@ -42,7 +42,7 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/lib \
-L$(DIST)/bin \
-lxpcom \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/webshell/embed/gtk/lib/Makefile.in
View File

@@ -94,7 +94,7 @@ MOZILLA_INCLUDES = -I@MOZILLA_DIR@/include -I@NSPR_DIR@/include
NULL =
NSPR_LIBS = -L@NSPR_DIR@/lib -lplds$(NSPR_VERSION) -lplc$(NSPR_VERSION) -lnspr$(NSPR_VERSION) @LIBPTHREAD@
BASE_LIBS = -lmozjs -lxpcom $(NULL)
BASE_LIBS = -lmozjs $(XPCOM_LIBS) $(NULL)
GECKO_LIBS = -lraptorgfx $(NULL)

2
mozilla/webshell/embed/xlib/gtk/Makefile.in
View File

@@ -38,7 +38,7 @@ LIBS = \
$(MOZ_TIMER_LIBS) \
$(NETLIB_LIBS) \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(JSJ_LIB) \
$(NSPR_LIBS) \
$(MOZ_GTK_LDFLAGS) -lxlibrgb \

2
mozilla/webshell/embed/xlib/motif/Makefile.in
View File

@@ -40,7 +40,7 @@ LIBS = \
$(MOZ_TIMER_LIBS) \
$(NETLIB_LIBS) \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(JSJ_LIB) \
$(NSPR_LIBS) \
$(MOZ_MOTIF_LDFLAGS) -lxlibrgb \

2
mozilla/webshell/embed/xlib/qt/Makefile.in
View File

@@ -47,7 +47,7 @@ LIBS = \
$(MOZ_TIMER_LIBS) \
$(NETLIB_LIBS) \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(JSJ_LIB) \
$(NSPR_LIBS) \
$(MOZ_QT_LDFLAGS) -lxlibrgb \

2
mozilla/webshell/embed/xlib/xt/Makefile.in
View File

@@ -39,7 +39,7 @@ LIBS = \
$(MOZ_TIMER_LIBS) \
$(NETLIB_LIBS) \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(JSJ_LIB) \
$(NSPR_LIBS) \
$(MOZ_MOTIF_LDFLAGS) -lxlibrgb \

6
mozilla/webshell/tests/viewer/Makefile.in
View File

@@ -103,7 +103,7 @@ endif
XP_DIST_LIBS = \
-lraptorgfx \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(JSJ_LIB) \
$(NULL)
@@ -135,8 +135,10 @@ QT_LIBS = -lviewer_qt_s $(XP_LIBS) $(MOZ_QT_LDFLAGS)
XLIB_LIBS = -lviewer_xlib_s $(XP_LIBS) $(MOZ_XLIB_LDFLAGS)
GTK_LIBS = -lviewer_gtk_s -lgtksuperwin $(XP_LIBS) $(MOZ_GTK_LDFLAGS)
XP_DIST_DEP_LIBS := $(filter-out -L$(DIST)/bin -L$(DIST)/lib, $(XP_DIST_LIBS))
EXTRA_DEPS = \
$(addprefix $(DIST)/,$(patsubst -l%,bin/lib%$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a))) \
$(addprefix $(DIST)/,$(patsubst -l%,bin/lib%$(DLL_SUFFIX),$(XP_DIST_DEP_LIBS:-l%_s=lib/lib%_s.a))) \
$(UNIX_VIEWER_TK_LIBS) \
$(XP_NS_UNDERBAR_CRAP) \
$(NULL)

2
mozilla/widget/src/rhapsody/Makefile.in
View File

@@ -33,7 +33,7 @@ REQUIRES = util img xpcom raptor netlib
CPPSRCS = nsObject.cpp
EXTRA_DSO_LDOPTS = -L$(DIST)/bin -lxpcom $(NSPR_LIBS)
EXTRA_DSO_LDOPTS = -L$(DIST)/bin $(XPCOM_LIBS) $(NSPR_LIBS)
include $(topsrcdir)/config/rules.mk

2
mozilla/widget/tests/scribble/Makefile.in
View File

@@ -36,7 +36,7 @@ CPPSRCS = \
LIBS = \
$(MOZ_WIDGET_SUPPORT_LIBS) \
$(MOZ_TIMER_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
-lraptorgfx \
$(NSPR_LIBS) \

2
mozilla/widget/tests/widget/Makefile.in
View File

@@ -36,7 +36,7 @@ CPPSRCS = \
LIBS = \
$(MOZ_TIMER_LIBS) \
$(MOZ_WIDGET_SUPPORT_LIBS) \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
-lraptorgfx \
$(NSPR_LIBS) \

2
mozilla/xpcom/base/Makefile.in
View File

@@ -74,7 +74,7 @@ XPIDLSRCS = \
$(NULL)
ifdef GC_LEAK_DETECTOR
XPIDLSRCS = nsILeakDetector.idl
XPIDLSRCS += nsILeakDetector.idl
endif
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

2
mozilla/xpcom/proxy/tests/Makefile.in
View File

@@ -38,7 +38,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s
endif
LIBS = \
-lxpcom \
$(XPCOM_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

4
mozilla/xpcom/reflect/xptcall/tests/Makefile.in
View File

@@ -36,9 +36,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s
endif
LIBS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

4
mozilla/xpcom/reflect/xptinfo/tests/Makefile.in
View File

@@ -37,9 +37,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s
endif
LIBS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

2
mozilla/xpcom/tests/Makefile.in
View File

@@ -71,7 +71,7 @@ endif
LIBS += \
$(MOZ_TIMER_LIBS) \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(TK_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \

2
mozilla/xpcom/tools/registry/Makefile.in
View File

@@ -35,7 +35,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lmozreg_s
endif
LIBS = \
-lxpcom \
$(XPCOM_LIBS) \
$(LOST_SYM_LIBS) \
$(TK_LIBS) \
$(NSPR_LIBS) \

4
mozilla/xpcom/typelib/xpt/tests/Makefile.in
View File

@@ -38,9 +38,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s
endif
LIBS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(XPCOM_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

6
mozilla/xpfe/bootstrap/Makefile.in
View File

@@ -38,7 +38,7 @@ CPPSRCS = \
XP_DIST_LIBS = \
-lraptorgfx \
-lmozjs \
-lxpcom \
$(XPCOM_LIBS) \
$(OJI_LIBS) \
$(NULL)
@@ -82,8 +82,10 @@ ifdef GC_LEAK_DETECTOR
LIBS += -lboehm
endif
XP_DIST_DEP_LIBS := $(filter-out -L$(DIST)/bin -L$(DIST)/lib, $(XP_DIST_LIBS))
EXTRA_DEPS = \
$(addprefix $(DIST)/,$(patsubst -l%,bin/lib%$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a))) \
$(addprefix $(DIST)/,$(patsubst -l%,bin/lib%$(DLL_SUFFIX),$(XP_DIST_DEP_LIBS:-l%_s=lib/lib%_s.a))) \
$(XP_NS_UNDERBAR_CRAP) \
$(NULL)

2
mozilla/xpfe/components/bookmarks/src/Makefile.in
View File

@@ -35,7 +35,7 @@ CPPSRCS = nsBookmarksService.cpp
EXTRA_DSO_LDOPTS = \
$(MOZ_TIMER_LIBS) \
-L$(DIST)/bin \
-lxpcom \
$(XPCOM_LIBS) \
-lmozjs \
$(NSPR_LIBS) \
$(NULL)

Some files were not shown because too many files have changed in this diff Show More