diff --git a/mozilla/dom/src/build/Makefile.in b/mozilla/dom/src/build/Makefile.in index e6f7ef49771..c87c05ab149 100644 --- a/mozilla/dom/src/build/Makefile.in +++ b/mozilla/dom/src/build/Makefile.in @@ -47,6 +47,7 @@ EXTRA_DSO_LDOPTS = \ $(MKSHLIB_FORCE_ALL) \ $(SHARED_LIBRARY_LIBS) \ $(MKSHLIB_UNFORCE_ALL) \ + -L$(DIST)/bin -ljsurl \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/editor/base/Makefile.in b/mozilla/editor/base/Makefile.in index ff3e97e51ed..18537d1183e 100644 --- a/mozilla/editor/base/Makefile.in +++ b/mozilla/editor/base/Makefile.in @@ -75,9 +75,12 @@ endif MODULE = editor -EXTRA_DSO_LDOPTS = -L$(DIST)/lib \ - -lneckoutil_s \ - $(NULL) +EXTRA_DSO_LDOPTS =\ + -L$(DIST)/lib \ + -lneckoutil_s \ + -L$(DIST)/bin \ + -lraptorhtmlpars \ + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index 2926752e0e9..e83d6fbfea3 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -62,7 +62,9 @@ EXTRA_DSO_LDOPTS = \ $(MKSHLIB_FORCE_ALL) \ $(SHARED_LIBRARY_LIBS) \ $(MKSHLIB_UNFORCE_ALL) \ - -L$(DIST)/bin -lraptorhtmlpars \ + -L$(DIST)/bin \ + -lraptorhtmlpars \ + -ljsdom \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/compose/tests/compose/Makefile.in b/mozilla/mailnews/compose/tests/compose/Makefile.in index 2b75c218ab9..b279d39e83a 100644 --- a/mozilla/mailnews/compose/tests/compose/Makefile.in +++ b/mozilla/mailnews/compose/tests/compose/Makefile.in @@ -32,8 +32,6 @@ LIBS = \ -lmozdbm \ -lxp \ -lmozjs \ - -ljsdom \ - -ljsurl \ $(TIMER_LIBS) \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/compose/tests/compose2/Makefile.in b/mozilla/mailnews/compose/tests/compose2/Makefile.in index d8f403c4c44..fc42cdc7913 100644 --- a/mozilla/mailnews/compose/tests/compose2/Makefile.in +++ b/mozilla/mailnews/compose/tests/compose2/Makefile.in @@ -45,8 +45,6 @@ LIBS = \ -lmozdbm \ -lxp \ -lmozjs \ - -ljsdom \ - -ljsurl \ -lraptorgfx \ -limg \ -lmozutil \ diff --git a/mozilla/mailnews/compose/tests/geturl/Makefile.in b/mozilla/mailnews/compose/tests/geturl/Makefile.in index c11490aecb7..61ec8b430ef 100644 --- a/mozilla/mailnews/compose/tests/geturl/Makefile.in +++ b/mozilla/mailnews/compose/tests/geturl/Makefile.in @@ -36,7 +36,6 @@ BASE_LIBS = \ $(NULL) GECKO_LIBS = \ - -ljsdom \ -lraptorplugin \ $(NULL) @@ -54,7 +53,6 @@ NETLIB_LIBS = \ -lnetlib \ -lnetwork \ -lxp \ - -ljsurl \ -lmozdbm \ -lpwcac \ $(NULL) diff --git a/mozilla/mailnews/compose/tests/sendlater/Makefile.in b/mozilla/mailnews/compose/tests/sendlater/Makefile.in index dcaea1dd3bf..3be21c9183b 100644 --- a/mozilla/mailnews/compose/tests/sendlater/Makefile.in +++ b/mozilla/mailnews/compose/tests/sendlater/Makefile.in @@ -45,8 +45,6 @@ LIBS = \ -lmozdbm \ -lxp \ -lmozjs \ - -ljsdom \ - -ljsurl \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ -lraptorgfx \ diff --git a/mozilla/mailnews/compose/tests/sendpage/Makefile.in b/mozilla/mailnews/compose/tests/sendpage/Makefile.in index aa38aabdc2e..ed8873f3bac 100644 --- a/mozilla/mailnews/compose/tests/sendpage/Makefile.in +++ b/mozilla/mailnews/compose/tests/sendpage/Makefile.in @@ -45,8 +45,6 @@ LIBS = \ -lmozdbm \ -lxp \ -lmozjs \ - -ljsdom \ - -ljsurl \ -lraptorgfx \ -limg \ -lmozutil \ diff --git a/mozilla/mailnews/compose/tests/smtp/Makefile.in b/mozilla/mailnews/compose/tests/smtp/Makefile.in index 4222e85454d..79541f12b25 100644 --- a/mozilla/mailnews/compose/tests/smtp/Makefile.in +++ b/mozilla/mailnews/compose/tests/smtp/Makefile.in @@ -31,8 +31,6 @@ LIBS = \ -lmozdbm \ -lxp \ -lmozjs \ - -ljsdom \ - -ljsurl \ -limg \ -lxp \ -lmozutil \ diff --git a/mozilla/mailnews/imap/tests/harness/Makefile.in b/mozilla/mailnews/imap/tests/harness/Makefile.in index 3d39745af40..2dbbd6b6218 100644 --- a/mozilla/mailnews/imap/tests/harness/Makefile.in +++ b/mozilla/mailnews/imap/tests/harness/Makefile.in @@ -34,8 +34,6 @@ LIBS = \ -lmozdbm \ -lxp \ -lmozjs \ - -ljsdom \ - -ljsurl \ -limg \ -lmozutil \ -lmsgbaseutil \ diff --git a/mozilla/mailnews/local/tests/pop3/Makefile.in b/mozilla/mailnews/local/tests/pop3/Makefile.in index d09bcff0af2..3da1a8a7a70 100644 --- a/mozilla/mailnews/local/tests/pop3/Makefile.in +++ b/mozilla/mailnews/local/tests/pop3/Makefile.in @@ -32,8 +32,6 @@ LIBS = \ -lmozdbm \ -lxp \ -lmozjs \ - -ljsdom \ - -ljsurl \ $(TIMER_LIBS) \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/mime/tests/mimetest/Makefile.in b/mozilla/mailnews/mime/tests/mimetest/Makefile.in index abe5950e9e7..86dd9adcd22 100644 --- a/mozilla/mailnews/mime/tests/mimetest/Makefile.in +++ b/mozilla/mailnews/mime/tests/mimetest/Makefile.in @@ -32,7 +32,6 @@ BASE_LIBS = \ $(NULL) GECKO_LIBS = \ - -ljsdom \ -lraptorplugin \ $(NULL) @@ -54,7 +53,6 @@ NETLIB_LIBS = \ -lnetlib \ -lnetwork \ -lxp \ - -ljsurl \ -lmozdbm \ -lpwcac \ $(NULL) diff --git a/mozilla/mailnews/news/tests/newsParser/Makefile.in b/mozilla/mailnews/news/tests/newsParser/Makefile.in index 769e711774f..65df8e05c6b 100644 --- a/mozilla/mailnews/news/tests/newsParser/Makefile.in +++ b/mozilla/mailnews/news/tests/newsParser/Makefile.in @@ -42,8 +42,6 @@ LIBS = \ -lmozdbm \ -lxp \ -lmozjs \ - -ljsdom \ - -ljsurl \ -lraptorgfx \ -limg \ -lmozutil \ diff --git a/mozilla/mailnews/news/tests/nntp/Makefile.in b/mozilla/mailnews/news/tests/nntp/Makefile.in index 8831f8fb945..99e0deab21b 100644 --- a/mozilla/mailnews/news/tests/nntp/Makefile.in +++ b/mozilla/mailnews/news/tests/nntp/Makefile.in @@ -30,8 +30,6 @@ LIBS = \ -lmozdbm \ -lxp \ -lmozjs \ - -ljsdom \ - -ljsurl \ -limg \ -lmozutil \ -lmsgbaseutil \ diff --git a/mozilla/rdf/build/Makefile.in b/mozilla/rdf/build/Makefile.in index 5fe7671e6cc..33ffdd0b901 100644 --- a/mozilla/rdf/build/Makefile.in +++ b/mozilla/rdf/build/Makefile.in @@ -52,7 +52,10 @@ endif EXTRA_DSO_LDOPTS = \ $(MKSHLIB_FORCE_ALL) \ $(SHARED_LIBRARY_LIBS) \ - $(MKSHLIB_UNFORCE_ALL) + $(MKSHLIB_UNFORCE_ALL) \ + -L$(DIST)/bin \ + -ljsdom \ + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/webshell/embed/gtk/lib/Makefile.am b/mozilla/webshell/embed/gtk/lib/Makefile.am index c2731394a8f..51b83176434 100644 --- a/mozilla/webshell/embed/gtk/lib/Makefile.am +++ b/mozilla/webshell/embed/gtk/lib/Makefile.am @@ -17,11 +17,6 @@ MOZILLA_INCLUDES = -I@MOZILLA_DIR@/dist/include NULL = NSPR_LIBS = -lplds3 -lplc3 -lnspr3 -lpthread -MOZ_LIB_JS_PREFIX=moz -MOZ_LIB_UTIL_PREFIX=moz - -ZLIB_LIBS = -lz - TIMER_LIBS = -ltimer_s BASE_LIBS = \ @@ -33,8 +28,6 @@ BASE_LIBS = \ GECKO_LIBS =\ -lraptorgfx \ - -ljsdom \ - -ljsurl \ $(NULL) IMGLIB_LIBS = \ diff --git a/mozilla/webshell/embed/gtk/lib/Makefile.in b/mozilla/webshell/embed/gtk/lib/Makefile.in index 41dbaff9cbe..b033ba6505f 100644 --- a/mozilla/webshell/embed/gtk/lib/Makefile.in +++ b/mozilla/webshell/embed/gtk/lib/Makefile.in @@ -91,17 +91,12 @@ MOZILLA_INCLUDES = -I@MOZILLA_DIR@/dist/include NULL = NSPR_LIBS = -lplds3 -lplc3 -lnspr3 -lpthread -MOZ_LIB_JS_PREFIX = moz -MOZ_LIB_UTIL_PREFIX = moz - -ZLIB_LIBS = -lz - TIMER_LIBS = -ltimer_s BASE_LIBS = -lmozjs $(TIMER_LIBS) -lxpcom -lmozutil $(NULL) -GECKO_LIBS = -lraptorgfx -ljsdom -ljsurl $(NULL) +GECKO_LIBS = -lraptorgfx $(NULL) IMGLIB_LIBS = -limg $(NULL) diff --git a/mozilla/webshell/src/Makefile.in b/mozilla/webshell/src/Makefile.in index 83b26f20848..06b14e4acf1 100644 --- a/mozilla/webshell/src/Makefile.in +++ b/mozilla/webshell/src/Makefile.in @@ -33,7 +33,10 @@ CPPSRCS = \ $(NULL) EXTRA_DSO_LDOPTS =\ - -L$(DIST)/lib -lneckoutil_s \ + -L$(DIST)/lib \ + -lneckoutil_s \ + -L$(DIST)/bin \ + -ljsdom \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in index 1a658da1ad4..5007a490cf4 100644 --- a/mozilla/webshell/tests/viewer/Makefile.in +++ b/mozilla/webshell/tests/viewer/Makefile.in @@ -100,7 +100,6 @@ GECKO_LIBS = \ -lwidgetsupport_s \ -lraptorgfx \ $(TIMER_LIBS) \ - -ljsdom \ $(NULL) IMGLIB_LIBS = \ @@ -126,11 +125,6 @@ NETLIB_LIBS = \ -lmozdbm \ -lpwcac \ $(NULL) -else -NETLIB_LIBS = \ - -lneckoutil_s \ - -ljsurl \ - $(NULL) endif LIBS = \ diff --git a/mozilla/widget/tests/scribble/Makefile.in b/mozilla/widget/tests/scribble/Makefile.in index 63ba8b6b510..193d6980973 100644 --- a/mozilla/widget/tests/scribble/Makefile.in +++ b/mozilla/widget/tests/scribble/Makefile.in @@ -47,8 +47,6 @@ NET_LIBS = \ -lnetwork \ -lnetcache \ $(NULL) -else -NET_LIBS = -lneckoutil_s endif LIBS = \ @@ -58,10 +56,7 @@ LIBS = \ -lmozjs \ -lwidgetsupport_s \ -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ $(TIMER_LIBS) \ - -ljsurl \ - -ljsdom \ $(NET_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ diff --git a/mozilla/widget/tests/widget/Makefile.in b/mozilla/widget/tests/widget/Makefile.in index 0893ff6702f..1cd2d7c42a2 100644 --- a/mozilla/widget/tests/widget/Makefile.in +++ b/mozilla/widget/tests/widget/Makefile.in @@ -47,8 +47,6 @@ NET_LIBS = \ -lnetwork \ -lnetcache \ $(NULL) -else -NET_LIBS = -lneckoutil_s endif LIBS = \ @@ -58,10 +56,7 @@ LIBS = \ -lmozjs \ -lwidgetsupport_s \ -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ $(TIMER_LIBS) \ - -ljsurl \ - -ljsdom \ $(NET_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ diff --git a/mozilla/xpfe/AppCores/src/Makefile.in b/mozilla/xpfe/AppCores/src/Makefile.in index ce4e5a94481..ab6ad5092ca 100644 --- a/mozilla/xpfe/AppCores/src/Makefile.in +++ b/mozilla/xpfe/AppCores/src/Makefile.in @@ -54,6 +54,9 @@ CPPSRCS= \ nsAppCores.cpp \ $(NULL) -include $(topsrcdir)/config/config.mk +EXTRA_DSO_LDOPTS =\ + -L$(DIST)/bin \ + -ljsdom \ + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/appshell/src/Makefile.in b/mozilla/xpfe/appshell/src/Makefile.in index 5e19507befd..3de82e89417 100644 --- a/mozilla/xpfe/appshell/src/Makefile.in +++ b/mozilla/xpfe/appshell/src/Makefile.in @@ -45,6 +45,9 @@ CPPSRCS= \ nsCommonDialogs.cpp \ $(NULL) -include $(topsrcdir)/config/config.mk +EXTRA_DSO_LDOPTS = \ + -L$(DIST)/bin \ + -ljsdom \ + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index bd43e27b947..ff6493c2dac 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -66,8 +66,6 @@ endif LIBS += \ -lraptorgfx \ $(TIMER_LIBS) \ - -ljsdom \ - -ljsurl \ -lmozjs \ $(OJI_LIBS) \ -limg \ diff --git a/mozilla/xpinstall/src/Makefile.in b/mozilla/xpinstall/src/Makefile.in index a39eab9e4cb..6bfb12bf3e5 100644 --- a/mozilla/xpinstall/src/Makefile.in +++ b/mozilla/xpinstall/src/Makefile.in @@ -67,6 +67,8 @@ LOCAL_INCLUDES = -I$(srcdir)/../public EXTRA_DSO_LDOPTS =\ -L$(DIST)/lib \ -lneckoutil_s \ + -L$(DIST)/bin \ + -ljsdom \ $(ZLIB_LIBS) include $(topsrcdir)/config/rules.mk