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

Cleanup the neckutil linking thing.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@47500 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ramiro%netscape.com
1999-09-15 02:15:11 +00:00
parent 1965cdbe07
commit e324fbd024
46 changed files with 126 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,10 @@ MOZ_MONOLITHIC_TOOLKIT = @MOZ_MONOLITHIC_TOOLKIT@
### XXX ### BROKEN MOZ_XLIBRGB_LDFLAGS = @MOZ_XLIBRGB_LDFLAGS@
### XXX ### BROKEN MOZ_USING_XLIBRGB = @MOZ_USING_XLIBRGB@
MOZ_TIMER_LIBS = @MOZ_TIMER_LIBS@
MOZ_TIMER_LIBS = @MOZ_TIMER_LIBS@
MOZ_NECKO_UTIL_LIBS = $(DIST)/lib/libneckoutil_s.a
MOZ_REGISTRY_LIBS = $(DIST)/lib/libmozreg_s.a
MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/libwidgetsupport_s.a
MOZ_GFX_TOOLKIT_LDFLAGS = -lgfx_$(MOZ_WIDGET_TOOLKIT) $(MOZ_XLIBRGB_LDFLAGS)
MOZ_WIDGET_TOOLKIT_LDFLAGS = -lwidget_$(MOZ_WIDGET_TOOLKIT)

2
mozilla/configure.in
View File

@@ -2717,7 +2717,7 @@ dnl =
dnl = Set the timer libs according to MOZ_MONOLITHIC_TOOLKIT
dnl =
dnl ========================================================
MOZ_TIMER_LIBS=-ltimer_s
MOZ_TIMER_LIBS='$(DIST)/lib/libtimer_s.a'
# Beos needs to link the timer in dynamically
case "$target" in

4
mozilla/dom/src/build/Makefile.in
View File

@@ -41,16 +41,14 @@ SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libjsdomrange_s.a \
$(DIST)/lib/libjsdomhtml_s.a \
$(DIST)/lib/libjsdomcss_s.a \
$(DIST)/lib/libneckoutil_s.a \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MKSHLIB_FORCE_ALL) \
$(SHARED_LIBRARY_LIBS) \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/lib \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
-L$(DIST)/bin \
$(NULL)
include $(topsrcdir)/config/rules.mk

3
mozilla/editor/base/Makefile.in
View File

@@ -65,8 +65,7 @@ CPPSRCS = \
$(NULL)
EXTRA_DSO_LDOPTS = \
-L$(DIST)/lib \
-lneckoutil_s \
$(MOZ_NECKO_UTIL_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

7
mozilla/gfx/src/Makefile.in
View File

@@ -72,11 +72,10 @@ CPPSRCS = \
$(NULL)
EXTRA_DSO_LDOPTS = \
-L$(DIST)/lib \
-limg_s \
-lneckoutil_s \
-lmozutil_s \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
$(DIST)/lib/libimg_s.a \
$(DIST)/lib/libmozutil_s.a \
$(NULL)
include $(topsrcdir)/config/rules.mk

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

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

7
mozilla/htmlparser/src/Makefile.in
View File

@@ -103,10 +103,9 @@ EXPORTS = \
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXTRA_DSO_LDOPTS = \
-L$(DIST)/lib \
-lexpat_s \
-lxmltok_s \
-lneckoutil_s \
$(MOZ_NECKO_UTIL_LIBS) \
$(DIST)/lib/libexpat_s.a \
$(DIST)/lib/libxmltok_s.a \
$(NULL)
include $(topsrcdir)/config/rules.mk

4
mozilla/intl/strres/src/Makefile.in
View File

@@ -28,7 +28,9 @@ IS_COMPONENT = 1
CPPSRCS = nsStringBundle.cpp
EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
EXTRA_DSO_LDOPTS =\
$(MOZ_NECKO_UTIL_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

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

@@ -37,7 +37,7 @@ EXPORT_RESOURCE = \
LIBS = \
-lmozjs \
-lxpcom \
-lneckoutil_s \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
$(NSPR_LIBS) \
$(NULL)

4
mozilla/intl/uconv/src/Makefile.in
View File

@@ -51,7 +51,9 @@ EXPORT_RESOURCE = \
$(srcdir)/charsetalias.properties \
$(NULL)
EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
EXTRA_DSO_LDOPTS =\
$(MOZ_NECKO_UTIL_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

4
mozilla/intl/unicharutil/src/Makefile.in
View File

@@ -36,7 +36,9 @@ CPPSRCS = \
nsEntityConverter.cpp \
$(NULL)
EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
EXTRA_DSO_LDOPTS =\
$(MOZ_NECKO_UTIL_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

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

@@ -29,14 +29,14 @@ CPPSRCS = TestSpaceManager.cpp
LOCAL_INCLUDES = -I$(srcdir)/../src
LIBS += \
$(DIST)/lib/libraptorlayout_s.a \
-lraptorgfx \
-lmozjs \
$(MOZ_TIMER_LIBS) \
-lxpcom \
$(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL)
$(DIST)/lib/libraptorlayout_s.a \
-lraptorgfx \
-lmozjs \
$(MOZ_TIMER_LIBS) \
-lxpcom \
$(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

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

@@ -52,13 +52,14 @@ SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libraptorxulcontent_s.a \
$(DIST)/lib/libraptorxulbase_s.a \
$(DIST)/lib/libraptorlayout_s.a \
$(DIST)/lib/libneckoutil_s.a \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MKSHLIB_FORCE_ALL) \
$(SHARED_LIBRARY_LIBS) \
$(MKSHLIB_UNFORCE_ALL) \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
-L$(DIST)/bin \
$(NSPR_LIBS) \
-lxpcom \
@@ -66,8 +67,6 @@ EXTRA_DSO_LDOPTS = \
-lraptorgfx \
-ljsdom \
-lmozjs \
-L$(DIST)/lib \
$(MOZ_TIMER_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

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

@@ -40,12 +40,12 @@ LIBS = \
$(DIST)/lib/libraptorhtmltable_s.a \
$(DIST)/lib/libraptorlayout_s.a \
$(DIST)/lib/libraptorevents_s.a \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
-lmozjs \
-lraptorgfx \
-lxpcom \
$(MOZ_TIMER_LIBS) \
$(TK_LIBS) \
$(DIST)/lib/libneckoutil_s.a \
$(NSPR_LIBS) \
$(NULL)

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

@@ -39,10 +39,10 @@ EXTRA_DSO_LDOPTS = \
$(MKSHLIB_FORCE_ALL) \
$(SHARED_LIBRARY_LIBS) \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
$(MOZ_TIMER_LIBS) \
$(MOZ_TIMER_LIBS) \
-L$(DIST)/bin \
-lxpcom \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(NULL)

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

@@ -26,7 +26,6 @@ PROGRAM = identity
CPPSRCS = identity.cpp
LIBS = \
-L$(DIST)/lib \
-L$(DIST)/bin \
-lxpcom \
-lmozjs \

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

@@ -27,21 +27,9 @@ PROGRAM = msgcomposetest2
CPPSRCS = test2.cpp
LIBS = \
-labouturl \
-lfileurl \
-lftpurl \
-lgophurl \
-lremoturl \
-lhttpurl \
-lsockstuburl \
-lnetcache \
-lmimetype \
-lnetcnvts \
-lnetwork \
-lnetlib \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
-lxpcom \
-lpwcac \
-lmozjs \
-lraptorgfx \
$(NULL)

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

@@ -28,22 +28,7 @@ CPPSRCS = \
geturl.cpp \
nsURLFetcher.cpp \
$(NULL)
LIBS = \
-lraptorplugin \
-labouturl \
-lfileurl \
-lftpurl \
-lgophurl \
-lhttpurl \
-lremoturl \
-lsockstuburl \
-lmimetype \
-lnetcache \
-lnetcnvts \
-lnetlib \
-lnetwork \
-lpwcac \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
-lmozjs \
$(NSPR_LIBS) \

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

@@ -27,24 +27,12 @@ PROGRAM = sendlatertest
CPPSRCS = test.cpp
LIBS = \
-labouturl \
-lfileurl \
-lftpurl \
-lgophurl \
-lremoturl \
-lhttpurl \
-lsockstuburl \
-lnetcache \
-lmimetype \
-lnetcnvts \
-lnetwork \
-lnetlib \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
-lraptorgfx \
-lxpcom \
-lpwcac \
-lmozjs \
$(NSPR_LIBS) \
-lraptorgfx \
$(NULL)
include $(topsrcdir)/config/rules.mk

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

@@ -27,8 +27,7 @@ PROGRAM = testimap
CPPSRCS = imapProtocolTest.cpp
LIBS = \
-L$(DIST)/lib \
LIBS = \
-L$(DIST)/bin \
-lxpcom \
-lmozjs \

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

@@ -25,24 +25,12 @@ include $(DEPTH)/config/autoconf.mk
PROGRAM = mimetest
CPPSRCS = mimetest.cpp
LIBS = \
-lraptorplugin \
-labouturl \
-lfileurl \
-lftpurl \
-lgophurl \
-lhttpurl \
-lremoturl \
-lsockstuburl \
-lmimetype \
-lnetcache \
-lnetcnvts \
-lnetlib \
-lnetwork \
-lpwcac \
$(MOZ_TIMER_LIBS) \
LIBS = \
-L$(DIST)/bin \
-lmozjs \
-lxpcom \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL)

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

@@ -26,24 +26,12 @@ PROGRAM = newsParserTest
CPPSRCS = newsParserTest.cpp
LIBS = \
-labouturl \
-lfileurl \
-lftpurl \
-lgophurl \
-lremoturl \
-lhttpurl \
-lsockstuburl \
-lnetcache \
-lmimetype \
-lnetcnvts \
-lnetwork \
-lnetlib \
-lpwcac \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
$(DIST)/lib/libmsgnews_s.a \
-lmozjs \
-lraptorgfx \
$(DIST)/lib/libmsgnews_s.a \
-lmsgbaseutil \
$(MOZ_TIMER_LIBS) \
-lxpcom \
$(NSPR_LIBS) \
$(NULL)

21
mozilla/mailnews/news/tests/nntp/Makefile.in
View File

@@ -25,16 +25,17 @@ include $(DEPTH)/config/autoconf.mk
PROGRAM = nntpTest
CPPSRCS = nntpTest.cpp
LIBS = \
-lxpcom \
-lmozjs \
-lmsgbaseutil \
$(MOZ_TIMER_LIBS) \
$(DIST)/lib/librdfbase_s.a \
$(NSPR_LIBS) \
$(TK_LIBS) \
-lneckoutil_s \
$(NULL)
LIBS = \
$(DIST)/lib/librdfbase_s.a \
-L$(DIST)/bin \
-lxpcom \
-lmozjs \
-lmsgbaseutil \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

4
mozilla/modules/plugin/base/src/Makefile.in
View File

@@ -44,7 +44,9 @@ EXPORTS = \
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
EXTRA_DSO_LDOPTS = \
$(MOZ_NECKO_UTIL_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

4
mozilla/modules/plugin/nglsrc/Makefile.in
View File

@@ -44,7 +44,9 @@ EXPORTS = \
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXTRA_DSO_LDOPTS = -L$(DIST)/lib -lneckoutil_s
EXTRA_DSO_LDOPTS = \
$(MOZ_NECKO_UTIL_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

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

@@ -43,7 +43,7 @@ endif
LIBS = \
-lmozjs \
-lxpcom \
-lneckoutil_s \
$(MOZ_NECKO_UTIL_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \
$(NULL)

7
mozilla/parser/htmlparser/src/Makefile.in
View File

@@ -103,10 +103,9 @@ EXPORTS = \
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
EXTRA_DSO_LDOPTS = \
-L$(DIST)/lib \
-lexpat_s \
-lxmltok_s \
-lneckoutil_s \
$(MOZ_NECKO_UTIL_LIBS) \
$(DIST)/lib/libexpat_s.a \
$(DIST)/lib/libxmltok_s.a \
$(NULL)
include $(topsrcdir)/config/rules.mk

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

@@ -37,15 +37,12 @@ CPPSRCS = \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MOZ_NECKO_UTIL_LIBS) \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(NSPR_LIBS) \
-lxpcom \
-lneckoutil_s \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk
ifeq ($(OS_ARCH), Linux)

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

@@ -30,14 +30,10 @@ CPPSRCS = \
$(NULL)
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-lxpcom \
-L$(DIST)/lib \
-lneckoutil_s \
$(NSPR_LIBS) \
$(MOZ_NECKO_UTIL_LIBS) \
-L$(DIST)/bin \
-lxpcom \
$(NSPR_LIBS) \
$(NULL)
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/config/rules.mk

3
mozilla/rdf/build/Makefile.in
View File

@@ -43,14 +43,13 @@ SHARED_LIBRARY_LIBS = \
$(DIST)/lib/librdfcontent_s.a \
$(DIST)/lib/librdfdatasource_s.a \
$(DIST)/lib/librdfutil_s.a \
$(DIST)/lib/libneckoutil_s.a \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MKSHLIB_FORCE_ALL) \
$(SHARED_LIBRARY_LIBS) \
$(MKSHLIB_UNFORCE_ALL) \
-L$(DIST)/lib \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
-L$(DIST)/bin \
-ljsdom \

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

@@ -26,7 +26,7 @@ PROGRAM = rdfcat
CPPSRCS = rdfcat.cpp
LIBS = \
-lneckoutil_s \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
-lmozjs \
-lxpcom \

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

@@ -26,9 +26,8 @@ PROGRAM = rdfpoll
CPPSRCS = rdfpoll.cpp
LIBS = \
-lneckoutil_s \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
$(IMGLIB_LIBS) \
-lmozjs \
-lxpcom \
$(NSPR_LIBS) \

6
mozilla/view/src/Makefile.in
View File

@@ -34,9 +34,9 @@ CPPSRCS = \
REQUIRES = raptor xpcom
EXTRA_DSO_LDOPTS = \
-L$(DIST)/lib \
$(MOZ_TIMER_LIBS) \
EXTRA_DSO_LDOPTS =\
$(MOZ_TIMER_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

15
mozilla/webshell/src/Makefile.in
View File

@@ -26,16 +26,15 @@ MODULE = raptor
LIBRARY_NAME = raptorwebwidget
CPPSRCS = \
dlldeps.cpp \
nsDLLFactory.cpp \
nsDocLoader.cpp \
nsThrobber.cpp \
nsWebShell.cpp \
$(NULL)
dlldeps.cpp \
nsDLLFactory.cpp \
nsDocLoader.cpp \
nsThrobber.cpp \
nsWebShell.cpp \
$(NULL)
EXTRA_DSO_LDOPTS =\
-L$(DIST)/lib \
-lneckoutil_s \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
-L$(DIST)/bin \
-ljsdom \

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

@@ -90,16 +90,20 @@ JSJ_LIB = -ljsj
endif
XP_DIST_LIBS = \
-lwidgetsupport_s \
-lraptorgfx \
-lneckoutil_s \
$(MOZ_TIMER_LIBS) \
-lmozjs \
-lxpcom \
$(JSJ_LIB) \
$(NULL)
XP_LIBS = \
XP_NS_UNDERBAR_CRAP = \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
$(MOZ_WIDGET_SUPPORT_LIBS) \
$(NULL)
XP_LIBS = \
$(XP_NS_UNDERBAR_CRAP) \
$(XP_DIST_LIBS) \
$(NSPR_LIBS) \
$(NULL)
@@ -125,6 +129,8 @@ EXTRA_DEPS = \
$(UNIX_VIEWER_TK_LIBS) \
$(NULL)
EXTRA_DEPS += $(XP_NS_UNDERBAR_CRAP)
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
@@ -166,3 +172,6 @@ ifdef MOZ_ENABLE_XLIB
install:: $(PROGRAM)_xlib
$(INSTALL) -m 555 $< $(DIST)/bin
endif
caca:
@echo $(EXTRA_DEPS)

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

@@ -30,11 +30,11 @@ CPPSRCS = \
$(NULL)
LIBS = \
$(MOZ_WIDGET_SUPPORT_LIBS) \
$(MOZ_TIMER_LIBS) \
-lxpcom \
-lmozjs \
-lwidgetsupport_s \
-lraptorgfx \
$(MOZ_TIMER_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL)

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

@@ -30,11 +30,11 @@ CPPSRCS = \
$(NULL)
LIBS = \
$(MOZ_TIMER_LIBS) \
$(MOZ_WIDGET_SUPPORT_LIBS) \
-lxpcom \
-lmozjs \
-lwidgetsupport_s \
-lraptorgfx \
$(MOZ_TIMER_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL)

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

@@ -62,10 +62,10 @@ CPPSRCS += \
endif
LIBS += \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
-lmozjs \
-lxpcom \
-lneckoutil_s \
$(MOZ_TIMER_LIBS) \
$(TK_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \

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

@@ -32,9 +32,7 @@ endif
LIBS += \
-lxpcom \
-lneckoutil_s \
-lmozjs \
$(MOZ_TIMER_LIBS) \
$(TK_LIBS) \
$(LOST_SYM_LIBS) \
$(NSPR_LIBS) \

15
mozilla/xpcom/tools/registry/regxpcom.cpp
View File

@@ -128,18 +128,3 @@ int main(int argc, char *argv[])
return ret;
}
#ifdef XP_UNIX
/* The timer code doesn't get linked in. Some components link with libraries
* in bin/ directory that assume that app that they are used in has libtimer_s.a
* So ensure libtimer_s.a gets linked in.
*/
#include "nsITimer.h"
void dummy()
{
nsITimer *timer;
(void) NS_NewTimer(&timer);
NS_IF_RELEASE(timer);
}
#endif /* XP_UNIX */

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

@@ -38,16 +38,22 @@ ifdef MOZ_OJI
OJI_LIBS = -ljsj
endif
XP_DIST_LIBS = \
-lraptorgfx \
$(MOZ_TIMER_LIBS) \
-lmozjs \
-lxpcom \
-lneckoutil_s \
$(OJI_LIBS) \
$(NULL)
XP_NS_UNDERBAR_CRAP = \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
$(NULL)
XP_LIBS = \
$(XP_NS_UNDERBAR_CRAP) \
$(XP_DIST_LIBS) \
$(NSPR_LIBS) \
$(NULL)
@@ -65,6 +71,8 @@ LIBS = $(XP_LIBS)
# cls/shaver are responsible for this amazingness
EXTRA_DEPS = $(addprefix $(DIST)/,$(patsubst -l%,bin/lib%.$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a)))
EXTRA_DEPS += $(XP_NS_UNDERBAR_CRAP)
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)

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

@@ -29,13 +29,12 @@ IS_COMPONENT = 1
CPPSRCS = nsBookmarksService.cpp
EXTRA_DSO_LDOPTS = \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_TIMER_LIBS) \
-L$(DIST)/bin \
-lxpcom \
-lmozjs \
$(NSPR_LIBS) \
-L$(DIST)/lib \
-lneckoutil_s \
$(MOZ_TIMER_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

3
mozilla/xpfe/components/directory/Makefile.in
View File

@@ -49,9 +49,8 @@ CHROME_L10N = \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MOZ_NECKO_UTIL_LIBS) \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lneckoutil_s \
-lxpcom \
$(NSPR_LIBS) \
$(NULL)

3
mozilla/xpfe/components/related/src/Makefile.in
View File

@@ -29,9 +29,8 @@ IS_COMPONENT = 1
CPPSRCS = nsRelatedLinksHandler.cpp
EXTRA_DSO_LDOPTS = \
$(MOZ_NECKO_UTIL_LIBS) \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lneckoutil_s \
-lxpcom \
$(NSPR_LIBS) \
$(NULL)

3
mozilla/xpfe/components/xfer/src/Makefile.in
View File

@@ -32,11 +32,10 @@ CPPSRCS = \
$(NULL)
EXTRA_DSO_LDOPTS = \
$(MOZ_NECKO_UTIL_LIBS) \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lxpcom \
-lmozjs \
-lneckoutil_s \
$(NSPR_LIBS) \
$(NULL)

5
mozilla/xpinstall/src/Makefile.in
View File

@@ -65,9 +65,8 @@ CPPSRCS = \
LOCAL_INCLUDES = -I$(srcdir)/../public
EXTRA_DSO_LDOPTS =\
-L$(DIST)/lib \
-lneckoutil_s \
-lmozreg_s \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_REGISTRY_LIBS) \
-L$(DIST)/bin \
-ljsdom \
$(ZLIB_LIBS)