diff --git a/mozilla/dom/tools/Makefile.in b/mozilla/dom/tools/Makefile.in index 92d03e841cf..4027ace04b2 100644 --- a/mozilla/dom/tools/Makefile.in +++ b/mozilla/dom/tools/Makefile.in @@ -47,6 +47,5 @@ include $(topsrcdir)/config/rules.mk LIBS += \ $(NSPR_LIBS) \ -lxpcom \ - -lmozreg \ $(NULL) diff --git a/mozilla/extensions/cookie/tests/Makefile.in b/mozilla/extensions/cookie/tests/Makefile.in index c8b386a5ab2..26258d01d29 100644 --- a/mozilla/extensions/cookie/tests/Makefile.in +++ b/mozilla/extensions/cookie/tests/Makefile.in @@ -29,12 +29,9 @@ REQUIRES = js cookie pref xpcom include LIBS = \ -lxpcom \ - -lmozreg \ $(NSPR_LIBS) \ $(NULL) -include $(topsrcdir)/config/config.mk - # hack until necko lands ifndef NECKO PUBLIC = $(DEPTH)/netwerk/dist/include diff --git a/mozilla/gfx/tests/Makefile.in b/mozilla/gfx/tests/Makefile.in index 24e72c9b40e..de8d8a8b075 100644 --- a/mozilla/gfx/tests/Makefile.in +++ b/mozilla/gfx/tests/Makefile.in @@ -57,7 +57,6 @@ endif LIBS = \ -lraptorgfx \ -lxpcom \ - -lmozreg \ -lmozjs \ -limg \ $(JPEG_LIBS) \ diff --git a/mozilla/htmlparser/robot/Makefile.in b/mozilla/htmlparser/robot/Makefile.in index b1f2ef767d2..f154183e0ed 100644 --- a/mozilla/htmlparser/robot/Makefile.in +++ b/mozilla/htmlparser/robot/Makefile.in @@ -52,7 +52,6 @@ LIBS = \ -limg \ -lmozutil \ -lxpcom \ - -lmozreg \ $(TIMER_LIBS) \ $(TK_LIBS) \ $(NULL) diff --git a/mozilla/htmlparser/robot/test/Makefile.in b/mozilla/htmlparser/robot/test/Makefile.in index 7072b056109..b02e8822166 100644 --- a/mozilla/htmlparser/robot/test/Makefile.in +++ b/mozilla/htmlparser/robot/test/Makefile.in @@ -30,7 +30,6 @@ CPPSRCS = RobotMain.cpp LIBS = \ -lDebugRobot \ - -lmozreg \ -lxpcom \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/htmlparser/tests/logparse/Makefile.in b/mozilla/htmlparser/tests/logparse/Makefile.in index 9ded444e55a..8009036ad10 100644 --- a/mozilla/htmlparser/tests/logparse/Makefile.in +++ b/mozilla/htmlparser/tests/logparse/Makefile.in @@ -29,7 +29,6 @@ CPPSRCS = logparse.cpp LIBS = \ -lraptorhtmlpars \ -lxpcom \ - -lmozreg \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/intl/uconv/tests/Makefile.in b/mozilla/intl/uconv/tests/Makefile.in index f08c654ee15..e44dab43c69 100644 --- a/mozilla/intl/uconv/tests/Makefile.in +++ b/mozilla/intl/uconv/tests/Makefile.in @@ -34,7 +34,7 @@ INCLUDES += \ -I$(srcdir)/../ucvja \ $(NULL) -LIBS += $(NSPR_LIBS) -L$(DIST)/bin -lxpcom -lmozreg -luconv +LIBS += $(NSPR_LIBS) -L$(DIST)/bin -lxpcom -luconv # needed for mac linux ifeq ($(OS_ARCH),Linux) diff --git a/mozilla/js/src/xpconnect/shell/Makefile.in b/mozilla/js/src/xpconnect/shell/Makefile.in index 191649d821d..46a9c29d30d 100644 --- a/mozilla/js/src/xpconnect/shell/Makefile.in +++ b/mozilla/js/src/xpconnect/shell/Makefile.in @@ -32,7 +32,6 @@ LIBS = \ -L$(DIST)/lib \ -lmozjs \ -lxpcom \ - -lmozreg \ -lmozutil \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/js/src/xpconnect/src/Makefile.in b/mozilla/js/src/xpconnect/src/Makefile.in index 90b715fe459..b5345d9c815 100644 --- a/mozilla/js/src/xpconnect/src/Makefile.in +++ b/mozilla/js/src/xpconnect/src/Makefile.in @@ -129,17 +129,16 @@ IS_COMPONENT = 1 endif endif -include $(topsrcdir)/config/rules.mk - # this is automatically discovered under BeOS ifneq ($(OS_ARCH),BeOS) LIBS += \ -lmozjs \ -lxpcom \ - -lmozreg \ $(NSPR_LIBS) \ $(NULL) endif +include $(topsrcdir)/config/rules.mk + DEFINES += -DJSFILE -DJS_THREADSAFE diff --git a/mozilla/layout/base/tests/Makefile.in b/mozilla/layout/base/tests/Makefile.in index f2531c51e12..39be618f4f2 100644 --- a/mozilla/layout/base/tests/Makefile.in +++ b/mozilla/layout/base/tests/Makefile.in @@ -28,7 +28,6 @@ CPPSRCS = TestSpaceManager.cpp LOCAL_INCLUDES = -I$(srcdir)/../src -include $(topsrcdir)/config/rules.mk LIBS += \ -lnetlib \ @@ -53,7 +52,6 @@ LIBS += \ -lmozjs \ $(TIMER_LIBS) \ -lxpcom \ - -lmozreg \ -lxp \ -ljsurl \ -ljsdom \ @@ -62,3 +60,4 @@ LIBS += \ $(TK_LIBS) \ $(NULL) +include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/base/build/Makefile.in b/mozilla/mailnews/base/build/Makefile.in index 5039bd7ca1a..6e7f34d387a 100644 --- a/mozilla/mailnews/base/build/Makefile.in +++ b/mozilla/mailnews/base/build/Makefile.in @@ -32,7 +32,7 @@ EXPORTS = nsMsgBaseCID.h SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libmsgbase_s.a \ $(DIST)/lib/librdfutil_s.a \ - $(DIST)/lib/libmsgsearch_s.a \ + $(DIST)/lib/libmsgsearch_s.a \ $(NULL) EXTRA_DSO_LDOPTS = \ @@ -41,7 +41,6 @@ EXTRA_DSO_LDOPTS = \ $(MKSHLIB_UNFORCE_ALL) \ -L$(DIST)/bin \ -lxpcom \ - -lmozreg \ -lmsgbaseutil \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/base/tests/identity/Makefile.in b/mozilla/mailnews/base/tests/identity/Makefile.in index 0d5296a2660..0f6e734ae83 100644 --- a/mozilla/mailnews/base/tests/identity/Makefile.in +++ b/mozilla/mailnews/base/tests/identity/Makefile.in @@ -29,7 +29,6 @@ LIBS = \ -L$(DIST)/lib \ -L$(DIST)/bin \ -lxpcom \ - -lmozreg \ -lmozjs \ $(TIMER_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/base/util/Makefile.in b/mozilla/mailnews/base/util/Makefile.in index 3382620c0ae..84900f1a264 100644 --- a/mozilla/mailnews/base/util/Makefile.in +++ b/mozilla/mailnews/base/util/Makefile.in @@ -65,7 +65,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ - -lmozreg \ -lrdfutil_s \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/compose/build/Makefile.in b/mozilla/mailnews/compose/build/Makefile.in index a590b7272fb..c368b23d5c8 100644 --- a/mozilla/mailnews/compose/build/Makefile.in +++ b/mozilla/mailnews/compose/build/Makefile.in @@ -40,7 +40,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ - -lmozreg \ -lmsgbaseutil \ -lraptorhtmlpars \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/compose/tests/compose/Makefile.in b/mozilla/mailnews/compose/tests/compose/Makefile.in index d20ecfdbb64..2b75c218ab9 100644 --- a/mozilla/mailnews/compose/tests/compose/Makefile.in +++ b/mozilla/mailnews/compose/tests/compose/Makefile.in @@ -28,7 +28,6 @@ CPPSRCS = test.cpp LIBS = \ -lmsgbaseutil \ - -lmozreg \ -lxpcom \ -lmozdbm \ -lxp \ diff --git a/mozilla/mailnews/compose/tests/compose2/Makefile.in b/mozilla/mailnews/compose/tests/compose2/Makefile.in index 2b2f1cb1e21..d8f403c4c44 100644 --- a/mozilla/mailnews/compose/tests/compose2/Makefile.in +++ b/mozilla/mailnews/compose/tests/compose2/Makefile.in @@ -39,7 +39,6 @@ LIBS = \ -lnetcnvts \ -lnetwork \ -lnetlib \ - -lmozreg \ $(TIMER_LIBS) \ -lxpcom \ -lpwcac \ diff --git a/mozilla/mailnews/compose/tests/geturl/Makefile.in b/mozilla/mailnews/compose/tests/geturl/Makefile.in index 2b7c92a0b13..c11490aecb7 100644 --- a/mozilla/mailnews/compose/tests/geturl/Makefile.in +++ b/mozilla/mailnews/compose/tests/geturl/Makefile.in @@ -30,7 +30,6 @@ CPPSRCS = \ $(NULL) BASE_LIBS = \ - -lmozreg \ -lmozjs \ -lxpcom \ -lmozutil \ diff --git a/mozilla/mailnews/compose/tests/sendlater/Makefile.in b/mozilla/mailnews/compose/tests/sendlater/Makefile.in index b8b3835b512..dcaea1dd3bf 100644 --- a/mozilla/mailnews/compose/tests/sendlater/Makefile.in +++ b/mozilla/mailnews/compose/tests/sendlater/Makefile.in @@ -39,7 +39,6 @@ LIBS = \ -lnetcnvts \ -lnetwork \ -lnetlib \ - -lmozreg \ $(TIMER_LIBS) \ -lxpcom \ -lpwcac \ diff --git a/mozilla/mailnews/compose/tests/sendpage/Makefile.in b/mozilla/mailnews/compose/tests/sendpage/Makefile.in index 052d6be609e..aa38aabdc2e 100644 --- a/mozilla/mailnews/compose/tests/sendpage/Makefile.in +++ b/mozilla/mailnews/compose/tests/sendpage/Makefile.in @@ -39,7 +39,6 @@ LIBS = \ -lnetcnvts \ -lnetwork \ -lnetlib \ - -lmozreg \ $(TIMER_LIBS) \ -lxpcom \ -lpwcac \ diff --git a/mozilla/mailnews/compose/tests/smtp/Makefile.in b/mozilla/mailnews/compose/tests/smtp/Makefile.in index 33537737be2..4222e85454d 100644 --- a/mozilla/mailnews/compose/tests/smtp/Makefile.in +++ b/mozilla/mailnews/compose/tests/smtp/Makefile.in @@ -36,7 +36,6 @@ LIBS = \ -limg \ -lxp \ -lmozutil \ - -lmozreg \ $(TIMER_LIBS) \ $(ZLIB_LIBS) \ $(DIST)/lib/librdfbase_s.a \ diff --git a/mozilla/mailnews/imap/build/Makefile.in b/mozilla/mailnews/imap/build/Makefile.in index 0a961e7346f..8524547cab8 100644 --- a/mozilla/mailnews/imap/build/Makefile.in +++ b/mozilla/mailnews/imap/build/Makefile.in @@ -40,7 +40,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ - -lmozreg \ -lrdfutil_s \ -lmsgbaseutil \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/imap/tests/harness/Makefile.in b/mozilla/mailnews/imap/tests/harness/Makefile.in index 2648e626ea7..3d39745af40 100644 --- a/mozilla/mailnews/imap/tests/harness/Makefile.in +++ b/mozilla/mailnews/imap/tests/harness/Makefile.in @@ -30,7 +30,6 @@ CPPSRCS = imapProtocolTest.cpp LIBS = \ -L$(DIST)/lib \ -L$(DIST)/bin \ - -lmozreg \ -lxpcom \ -lmozdbm \ -lxp \ diff --git a/mozilla/mailnews/local/build/Makefile.in b/mozilla/mailnews/local/build/Makefile.in index 0c8a82d85a3..429121d3931 100644 --- a/mozilla/mailnews/local/build/Makefile.in +++ b/mozilla/mailnews/local/build/Makefile.in @@ -41,7 +41,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ - -lmozreg \ -lmsgbaseutil \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/local/tests/mailbox/Makefile.in b/mozilla/mailnews/local/tests/mailbox/Makefile.in index 31e01d3ff75..b00b15a7519 100644 --- a/mozilla/mailnews/local/tests/mailbox/Makefile.in +++ b/mozilla/mailnews/local/tests/mailbox/Makefile.in @@ -42,7 +42,6 @@ LIBS = \ -lnetcnvts \ -lnetwork \ -lnetlib \ - -lmozreg \ -lxpcom \ -lpwcac \ -lmozdbm \ diff --git a/mozilla/mailnews/local/tests/mboxParser/Makefile.in b/mozilla/mailnews/local/tests/mboxParser/Makefile.in index 1a5457fc398..2043756de7d 100644 --- a/mozilla/mailnews/local/tests/mboxParser/Makefile.in +++ b/mozilla/mailnews/local/tests/mboxParser/Makefile.in @@ -38,7 +38,6 @@ LIBS = \ -lnetcnvts \ -lnetwork \ -lnetlib \ - -lmozreg \ -lxpcom \ -lpwcac \ -lmozdbm \ diff --git a/mozilla/mailnews/local/tests/pop3/Makefile.in b/mozilla/mailnews/local/tests/pop3/Makefile.in index dc348368406..d09bcff0af2 100644 --- a/mozilla/mailnews/local/tests/pop3/Makefile.in +++ b/mozilla/mailnews/local/tests/pop3/Makefile.in @@ -28,7 +28,6 @@ CPPSRCS = pop3Test.cpp LIBS = \ -lmsgbaseutil \ - -lmozreg \ -lxpcom \ -lmozdbm \ -lxp \ diff --git a/mozilla/mailnews/mime/abstatus/build/Makefile.in b/mozilla/mailnews/mime/abstatus/build/Makefile.in index 5ac67f9598a..12176e33f1c 100644 --- a/mozilla/mailnews/mime/abstatus/build/Makefile.in +++ b/mozilla/mailnews/mime/abstatus/build/Makefile.in @@ -40,7 +40,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/lib \ -lxpcom \ -labstat_s \ - -lmozreg \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/mime/cthandlers/calendar/Makefile.in b/mozilla/mailnews/mime/cthandlers/calendar/Makefile.in index bd131832a58..5e546442d9c 100644 --- a/mozilla/mailnews/mime/cthandlers/calendar/Makefile.in +++ b/mozilla/mailnews/mime/cthandlers/calendar/Makefile.in @@ -38,7 +38,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/lib \ -lxp \ -lxpcom \ - -lmozreg \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in b/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in index 73035edcbc4..c145fdce472 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in +++ b/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in @@ -39,7 +39,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ - -lmozreg \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/mime/emitters/build/Makefile.in b/mozilla/mailnews/mime/emitters/build/Makefile.in index 5f7a83247c6..c9ec85e1629 100644 --- a/mozilla/mailnews/mime/emitters/build/Makefile.in +++ b/mozilla/mailnews/mime/emitters/build/Makefile.in @@ -40,7 +40,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ - -lmozreg \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/mime/src/Makefile.in b/mozilla/mailnews/mime/src/Makefile.in index 2195b406b19..db2171e062e 100644 --- a/mozilla/mailnews/mime/src/Makefile.in +++ b/mozilla/mailnews/mime/src/Makefile.in @@ -98,7 +98,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/lib \ -lmozjs \ -lxpcom \ - -lmozreg \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/mime/tests/mimetest/Makefile.in b/mozilla/mailnews/mime/tests/mimetest/Makefile.in index 50e78bb2a90..abe5950e9e7 100644 --- a/mozilla/mailnews/mime/tests/mimetest/Makefile.in +++ b/mozilla/mailnews/mime/tests/mimetest/Makefile.in @@ -26,7 +26,6 @@ PROGRAM = mimetest CPPSRCS = mimetest.cpp BASE_LIBS = \ - -lmozreg \ -lmozjs \ -lxpcom \ -lmozutil \ diff --git a/mozilla/mailnews/news/build/Makefile.in b/mozilla/mailnews/news/build/Makefile.in index ee213bf939f..08e47319b0e 100644 --- a/mozilla/mailnews/news/build/Makefile.in +++ b/mozilla/mailnews/news/build/Makefile.in @@ -38,7 +38,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ - -lmozreg \ -lmsgbaseutil \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/news/tests/newsParser/Makefile.in b/mozilla/mailnews/news/tests/newsParser/Makefile.in index 8b17adc5100..769e711774f 100644 --- a/mozilla/mailnews/news/tests/newsParser/Makefile.in +++ b/mozilla/mailnews/news/tests/newsParser/Makefile.in @@ -38,7 +38,6 @@ LIBS = \ -lnetcnvts \ -lnetwork \ -lnetlib \ - -lmozreg \ -lpwcac \ -lmozdbm \ -lxp \ diff --git a/mozilla/mailnews/news/tests/nntp/Makefile.in b/mozilla/mailnews/news/tests/nntp/Makefile.in index 0e3b0ab58ce..8831f8fb945 100644 --- a/mozilla/mailnews/news/tests/nntp/Makefile.in +++ b/mozilla/mailnews/news/tests/nntp/Makefile.in @@ -26,7 +26,6 @@ PROGRAM = nntpTest CPPSRCS = nntpTest.cpp LIBS = \ - -lmozreg \ -lxpcom \ -lmozdbm \ -lxp \ diff --git a/mozilla/modules/libreg/src/Makefile.in b/mozilla/modules/libreg/src/Makefile.in index 91c1bae7cd6..0cb0554e4fc 100644 --- a/mozilla/modules/libreg/src/Makefile.in +++ b/mozilla/modules/libreg/src/Makefile.in @@ -23,7 +23,7 @@ srcdir = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE = libreg -LIBRARY_NAME = mozreg +LIBRARY_NAME = mozreg_s REQUIRES = libreg pref js @@ -32,7 +32,10 @@ CSRCS = reg.c VerReg.c vr_stubs.c BIN_SRCS = VerReg.c reg.c vr_stubs.c BIN_OBJS = $(addprefix R_,$(BIN_SRCS:.c=.o)) -# force the creation of a static lib. +MKSHLIB := + +# We don't want a shared lib. Static lib only. +override NO_SHARED_LIB=1 override NO_STATIC_LIB= include $(topsrcdir)/config/rules.mk diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in index c6e43f4b558..b7631fa12be 100644 --- a/mozilla/netwerk/test/Makefile.in +++ b/mozilla/netwerk/test/Makefile.in @@ -41,7 +41,6 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo endif LIBS = \ - -lmozreg \ -lmozjs \ -lxpcom \ -lmozutil \ diff --git a/mozilla/parser/htmlparser/robot/Makefile.in b/mozilla/parser/htmlparser/robot/Makefile.in index b1f2ef767d2..f154183e0ed 100644 --- a/mozilla/parser/htmlparser/robot/Makefile.in +++ b/mozilla/parser/htmlparser/robot/Makefile.in @@ -52,7 +52,6 @@ LIBS = \ -limg \ -lmozutil \ -lxpcom \ - -lmozreg \ $(TIMER_LIBS) \ $(TK_LIBS) \ $(NULL) diff --git a/mozilla/parser/htmlparser/robot/test/Makefile.in b/mozilla/parser/htmlparser/robot/test/Makefile.in index 7072b056109..b02e8822166 100644 --- a/mozilla/parser/htmlparser/robot/test/Makefile.in +++ b/mozilla/parser/htmlparser/robot/test/Makefile.in @@ -30,7 +30,6 @@ CPPSRCS = RobotMain.cpp LIBS = \ -lDebugRobot \ - -lmozreg \ -lxpcom \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/parser/htmlparser/tests/logparse/Makefile.in b/mozilla/parser/htmlparser/tests/logparse/Makefile.in index 9ded444e55a..8009036ad10 100644 --- a/mozilla/parser/htmlparser/tests/logparse/Makefile.in +++ b/mozilla/parser/htmlparser/tests/logparse/Makefile.in @@ -29,7 +29,6 @@ CPPSRCS = logparse.cpp LIBS = \ -lraptorhtmlpars \ -lxpcom \ - -lmozreg \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/rdf/tests/localfile/Makefile.in b/mozilla/rdf/tests/localfile/Makefile.in index 96d995cb8e0..0a0f1e4dffd 100644 --- a/mozilla/rdf/tests/localfile/Makefile.in +++ b/mozilla/rdf/tests/localfile/Makefile.in @@ -27,7 +27,6 @@ CPPSRCS = localfile.cpp LIBS = \ -lxpcom \ - -lmozreg \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/rdf/tests/rdfcat/Makefile.in b/mozilla/rdf/tests/rdfcat/Makefile.in index bc615e9b14e..a518a15cca6 100644 --- a/mozilla/rdf/tests/rdfcat/Makefile.in +++ b/mozilla/rdf/tests/rdfcat/Makefile.in @@ -27,7 +27,6 @@ CPPSRCS = rdfcat.cpp BASE_LIBS = \ $(ZLIB_LIBS) \ - -lmozreg \ -lmozjs \ -lxpcom \ -lmozutil \ diff --git a/mozilla/rdf/tests/rdfpoll/Makefile.in b/mozilla/rdf/tests/rdfpoll/Makefile.in index f525293e47c..13b0692cc31 100644 --- a/mozilla/rdf/tests/rdfpoll/Makefile.in +++ b/mozilla/rdf/tests/rdfpoll/Makefile.in @@ -27,7 +27,6 @@ CPPSRCS = rdfpoll.cpp BASE_LIBS = \ $(ZLIB_LIBS) \ - -lmozreg \ -lmozjs \ -lxpcom \ -lmozutil \ diff --git a/mozilla/rdf/tests/rdfsink/Makefile.in b/mozilla/rdf/tests/rdfsink/Makefile.in index 1e2340cdad0..951b9f765ae 100644 --- a/mozilla/rdf/tests/rdfsink/Makefile.in +++ b/mozilla/rdf/tests/rdfsink/Makefile.in @@ -27,7 +27,6 @@ CPPSRCS = rdfsink.cpp LIBS = \ -lxpcom \ - -lmozreg \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/webshell/embed/gtk/lib/Makefile.am b/mozilla/webshell/embed/gtk/lib/Makefile.am index 9484ac57088..e9652ec0fa1 100644 --- a/mozilla/webshell/embed/gtk/lib/Makefile.am +++ b/mozilla/webshell/embed/gtk/lib/Makefile.am @@ -25,7 +25,6 @@ ZLIB_LIBS = -lz TIMER_LIBS = -ltimer_s BASE_LIBS = \ - -lmozreg \ -lmozjs \ $(TIMER_LIBS) \ -lxpcom \ diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in index e6332de4371..6f0f5a2dae1 100644 --- a/mozilla/webshell/tests/viewer/Makefile.in +++ b/mozilla/webshell/tests/viewer/Makefile.in @@ -90,7 +90,6 @@ JSJ_LIB = -ljsj endif BASE_LIBS = \ - -lmozreg \ -lmozjs \ -lxpcom \ -lmozutil \ diff --git a/mozilla/widget/src/rhapsody/Makefile.in b/mozilla/widget/src/rhapsody/Makefile.in index 147d952c98b..045f81ef1c0 100644 --- a/mozilla/widget/src/rhapsody/Makefile.in +++ b/mozilla/widget/src/rhapsody/Makefile.in @@ -33,5 +33,5 @@ include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_WIDGET -EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxpcom -lmozreg $(NSPR_LIBS) +EXTRA_DSO_LDOPTS += -L$(DIST)/bin -lxpcom $(NSPR_LIBS) diff --git a/mozilla/widget/tests/scribble/Makefile.in b/mozilla/widget/tests/scribble/Makefile.in index adcfdcb0080..63ba8b6b510 100644 --- a/mozilla/widget/tests/scribble/Makefile.in +++ b/mozilla/widget/tests/scribble/Makefile.in @@ -55,7 +55,6 @@ LIBS = \ -lmozutil \ -limg \ -lxpcom \ - -lmozreg \ -lmozjs \ -lwidgetsupport_s \ -lraptorgfx \ diff --git a/mozilla/widget/tests/widget/Makefile.in b/mozilla/widget/tests/widget/Makefile.in index 31aec2fe3d3..0893ff6702f 100644 --- a/mozilla/widget/tests/widget/Makefile.in +++ b/mozilla/widget/tests/widget/Makefile.in @@ -55,7 +55,6 @@ LIBS = \ -lmozutil \ -limg \ -lxpcom \ - -lmozreg \ -lmozjs \ -lwidgetsupport_s \ -lraptorgfx \ diff --git a/mozilla/xpcom/build/Makefile.in b/mozilla/xpcom/build/Makefile.in index b4fd574f124..34173813a7e 100644 --- a/mozilla/xpcom/build/Makefile.in +++ b/mozilla/xpcom/build/Makefile.in @@ -40,7 +40,6 @@ SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libxptinfo.a \ $(DIST)/lib/libxpt.a \ $(DIST)/lib/libxptcmd.a \ - $(DIST)/lib/libmozreg.a \ $(NULL) LOCAL_INCLUDES = \ @@ -56,6 +55,8 @@ EXTRA_DSO_LDOPTS = \ $(MKSHLIB_FORCE_ALL) \ $(SHARED_LIBRARY_LIBS) \ $(MKSHLIB_UNFORCE_ALL) \ + -L$(DIST)/lib \ + -lmozreg_s \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index 5f7f14542b2..bd43e27b947 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -66,7 +66,6 @@ endif LIBS += \ -lraptorgfx \ $(TIMER_LIBS) \ - -lmozreg \ -ljsdom \ -ljsurl \ -lmozjs \ diff --git a/mozilla/xpfe/components/find/src/Makefile.in b/mozilla/xpfe/components/find/src/Makefile.in index c7e5123e602..5654d46bb68 100644 --- a/mozilla/xpfe/components/find/src/Makefile.in +++ b/mozilla/xpfe/components/find/src/Makefile.in @@ -32,7 +32,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ - -lmozreg \ -lmozjs \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/xpfe/components/prefwindow/src/Makefile.in b/mozilla/xpfe/components/prefwindow/src/Makefile.in index f1aa80f634f..3b3a1eb061b 100644 --- a/mozilla/xpfe/components/prefwindow/src/Makefile.in +++ b/mozilla/xpfe/components/prefwindow/src/Makefile.in @@ -35,7 +35,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ - -lmozreg \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpfe/components/sample/src/Makefile.in b/mozilla/xpfe/components/sample/src/Makefile.in index 33f22c47734..dd71f0f13f9 100644 --- a/mozilla/xpfe/components/sample/src/Makefile.in +++ b/mozilla/xpfe/components/sample/src/Makefile.in @@ -32,7 +32,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ - -lmozreg \ -lnetlib \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/xpfe/components/ucth/src/Makefile.in b/mozilla/xpfe/components/ucth/src/Makefile.in index 8c7e936e9b2..5691d98cb1d 100644 --- a/mozilla/xpfe/components/ucth/src/Makefile.in +++ b/mozilla/xpfe/components/ucth/src/Makefile.in @@ -32,7 +32,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ - -lmozreg \ -lmozjs \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/xpfe/components/xfer/src/Makefile.in b/mozilla/xpfe/components/xfer/src/Makefile.in index f6f4ea48fb9..415ea2fe8b8 100644 --- a/mozilla/xpfe/components/xfer/src/Makefile.in +++ b/mozilla/xpfe/components/xfer/src/Makefile.in @@ -35,7 +35,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lxpcom \ - -lmozreg \ -lmozjs \ -lneckoutil_s \ $(ZLIB_LIBS) \ diff --git a/mozilla/xpinstall/src/Makefile.in b/mozilla/xpinstall/src/Makefile.in index 05c8245e006..a39eab9e4cb 100644 --- a/mozilla/xpinstall/src/Makefile.in +++ b/mozilla/xpinstall/src/Makefile.in @@ -64,7 +64,10 @@ CPPSRCS = \ LOCAL_INCLUDES = -I$(srcdir)/../public -EXTRA_DSO_LDOPTS = -L$(DIST)/lib $(ZLIB_LIBS) -lneckoutil_s +EXTRA_DSO_LDOPTS =\ + -L$(DIST)/lib \ + -lneckoutil_s \ + $(ZLIB_LIBS) include $(topsrcdir)/config/rules.mk