diff --git a/Makefile.in b/Makefile.in index 4681da3ba7cc..5b81d13da7a5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -79,6 +79,7 @@ DIRS += \ silentdl \ xpinstall \ sun-java \ + timer \ profile \ $(NULL) diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 219e9472ab3a..dffc01976dd5 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -27,6 +27,8 @@ MOZ_LIB_DBM_PREFIX = moz MOZ_GFX_TOOLKIT = @MOZ_GFX_TOOLKIT@ MOZ_WIDGET_TOOLKIT = @MOZ_WIDGET_TOOLKIT@ +TIMER_LIBS = -ltimer_s + MOZ_XLIBRGB_LDFLAGS = @MOZ_XLIBRGB_LDFLAGS@ MOZ_USING_XLIBRGB = @MOZ_USING_XLIBRGB@ diff --git a/dom/src/build/Makefile.in b/dom/src/build/Makefile.in index b9b910e45382..d944637dd0a6 100644 --- a/dom/src/build/Makefile.in +++ b/dom/src/build/Makefile.in @@ -41,8 +41,6 @@ CPPSRCS=nsDOMFactory.cpp \ INCLUDES += -I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor \ -I$(PUBLIC)/dom -I$(PUBLIC)/js -I$(srcdir)/../base -I$(PUBLIC)/jsurl -GFX_DSO_FLAGS = $(addprefix -lgfx, $(MOZ_GFX_TOOLKIT)) - SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libjsdombase_s.a \ $(DIST)/lib/libjsdomcore_s.a \ diff --git a/gfx/public/Makefile.in b/gfx/public/Makefile.in index d42813c2439e..057c5a628c2f 100644 --- a/gfx/public/Makefile.in +++ b/gfx/public/Makefile.in @@ -49,8 +49,6 @@ EXPORTS = \ nsIDeviceContextSpecFactory.h \ nsIDrawingSurface.h \ nsColorNameIDs.h \ - nsITimer.h \ - nsITimerCallback.h \ $(NULL) EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) diff --git a/gfx/src/beos/Makefile.in b/gfx/src/beos/Makefile.in index ca955a9df657..c4360fcb81cb 100644 --- a/gfx/src/beos/Makefile.in +++ b/gfx/src/beos/Makefile.in @@ -44,7 +44,6 @@ CPPSRCS = \ nsRenderingContextBeOS.cpp \ nsImageBeOS.cpp \ nsRegionBeOS.cpp \ - nsTimer.cpp \ $(NULL) # nsGraphicsStateGTK.cpp \ diff --git a/gfx/src/gtk/Makefile.in b/gfx/src/gtk/Makefile.in index 90a29f99ab0f..004016a87a50 100644 --- a/gfx/src/gtk/Makefile.in +++ b/gfx/src/gtk/Makefile.in @@ -45,7 +45,6 @@ CPPSRCS = \ nsImageGTK.cpp \ nsRegionGTK.cpp \ nsRenderingContextGTK.cpp \ - nsTimer.cpp \ $(NULL) CSRCS = \ diff --git a/gfx/src/motif/Makefile.in b/gfx/src/motif/Makefile.in index 8c92c7168881..fdfff4588ddf 100644 --- a/gfx/src/motif/Makefile.in +++ b/gfx/src/motif/Makefile.in @@ -43,7 +43,6 @@ EXTRA_DSO_LDOPTS+= $(XLDFLAGS) $(XLIBS) CPPSRCS=nsDeviceContextMotif.cpp nsFontMetricsMotif.cpp nsGfxFactoryMotif.cpp \ - nsTimer.cpp \ nsRenderingContextMotif.cpp nsRegionMotif.cpp nsImageMotif.cpp include $(topsrcdir)/config/rules.mk diff --git a/gfx/src/os2/Makefile.in b/gfx/src/os2/Makefile.in index bb7643a2cbc0..ca5a69bf2132 100644 --- a/gfx/src/os2/Makefile.in +++ b/gfx/src/os2/Makefile.in @@ -51,7 +51,6 @@ CPPSRCS = \ nsDeviceContextSpecOS2.cpp \ nsDrawingSurfaceOS2.cpp \ nsGfxFactoryOS2.cpp \ - nsTimerOS2.cpp \ $(NULL) CSRCS = libprint.c diff --git a/gfx/src/photon/Makefile.in b/gfx/src/photon/Makefile.in index b93d9a7dda36..c677c417633e 100644 --- a/gfx/src/photon/Makefile.in +++ b/gfx/src/photon/Makefile.in @@ -49,7 +49,7 @@ CPPSRCS = \ nsImagePh.cpp \ nsRegionPh.cpp \ nsRenderingContextPh.cpp \ - nsTimer.cpp + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/gfx/src/rhapsody/Makefile.in b/gfx/src/rhapsody/Makefile.in index 4475de9e8474..d2fde538fc30 100644 --- a/gfx/src/rhapsody/Makefile.in +++ b/gfx/src/rhapsody/Makefile.in @@ -42,7 +42,6 @@ MODULE=raptor nsGfxFactoryUnix.cpp \ nsRenderingContextUnix.cpp \ nsRegionUnix.cpp \ - nsTimer.cpp \ nsImageUnix.cpp include $(topsrcdir)/config/rules.mk diff --git a/gfx/src/xlib/Makefile.in b/gfx/src/xlib/Makefile.in index adc6a11c25b3..0a916741976b 100644 --- a/gfx/src/xlib/Makefile.in +++ b/gfx/src/xlib/Makefile.in @@ -47,9 +47,6 @@ CPPSRCS =\ nsRenderingContextXlib.cpp \ $(NULL) -CPPSRCS +=\ - nsTimer_$(MOZ_WIDGET_TOOLKIT).cpp - include $(topsrcdir)/config/rules.mk diff --git a/gfx/tests/Makefile.in b/gfx/tests/Makefile.in index 4b018024910a..fc689f64bd80 100644 --- a/gfx/tests/Makefile.in +++ b/gfx/tests/Makefile.in @@ -58,8 +58,6 @@ endif LIBS = \ -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ - $(TK_LIBS) \ -lxpcom \ -lreg \ -lpref \ @@ -70,6 +68,8 @@ LIBS = \ $(PNG_LIBS) \ -l$(MOZ_LIB_UTIL_PREFIX)util \ -lxp \ + $(TIMER_LIBS) \ + $(TK_LIBS) \ $(NSPR_LIBS) \ $(NET_LIBS) \ $(ZLIB_LIBS) \ diff --git a/htmlparser/robot/Makefile.in b/htmlparser/robot/Makefile.in index 4a799e9dde9b..3d6324724ddf 100644 --- a/htmlparser/robot/Makefile.in +++ b/htmlparser/robot/Makefile.in @@ -54,12 +54,11 @@ LIBS = \ -lhttpurl \ -lpwcac \ -l$(MOZ_LIB_JS_PREFIX)js \ - -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ -limg \ -lmozutil \ -lxpcom \ -lreg \ + $(TIMER_LIBS) \ $(TK_LIBS) \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in index 1e3bd2a78c50..0493c922bab1 100644 --- a/layout/base/tests/Makefile.in +++ b/layout/base/tests/Makefile.in @@ -50,12 +50,12 @@ LIBS = \ -lpref \ -lsecfree \ -lraptorgfx \ - -lgfx$(MOZ_GFX_TOOLKIT) \ -limg \ -l$(MOZ_LIB_UTIL_PREFIX)util \ $(PNG_LIBS) \ $(JPEG_LIBS) \ -l$(MOZ_LIB_JS_PREFIX)js \ + -ltimer_s \ -lxpcom \ -lreg \ -lxp \ @@ -64,7 +64,6 @@ LIBS = \ -lxmltok \ -ljsurl \ -ljsdom \ - -lraptorgfx \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ diff --git a/layout/html/tests/Makefile.in b/layout/html/tests/Makefile.in index 22ab2cfc9e9b..150265fea588 100644 --- a/layout/html/tests/Makefile.in +++ b/layout/html/tests/Makefile.in @@ -66,7 +66,6 @@ LIBS = \ -l$(MOZ_LIB_JS_PREFIX)js \ -ljsdom \ -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ -lxpcom \ -lxp \ -lraptorhtmlpars \ @@ -74,6 +73,7 @@ LIBS = \ -lexpat \ -lxmltok \ -ljsurl \ + $(TIMER_LIBS) \ $(TK_LIBS) \ $(NET_LIBS) \ $(ZLIB_LIBS) \ diff --git a/mailnews/compose/tests/compose/Makefile.in b/mailnews/compose/tests/compose/Makefile.in index 1c1824645c52..05bd6e476c78 100644 --- a/mailnews/compose/tests/compose/Makefile.in +++ b/mailnews/compose/tests/compose/Makefile.in @@ -56,10 +56,9 @@ LIBS = \ -ljsdom \ -ljsurl \ -lsecfree \ + $(TIMER_LIBS) \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ - -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ -limg \ -lmozutil \ $(TK_LIBS) \ diff --git a/mailnews/compose/tests/compose2/Makefile.in b/mailnews/compose/tests/compose2/Makefile.in index 951695278c7d..5fd71a7e5ece 100644 --- a/mailnews/compose/tests/compose2/Makefile.in +++ b/mailnews/compose/tests/compose2/Makefile.in @@ -46,6 +46,7 @@ LIBS = \ -lnetwork \ -lnetlib \ -lreg \ + -ltimer_s \ -lxpcom \ -lpwcac \ -lmozdbm \ @@ -57,11 +58,9 @@ LIBS = \ -lsecfree \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ - -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -limg \ -lmozutil \ - $(TK_LIBS) \ $(NULL) include $(topsrcdir)/config/config.mk diff --git a/mailnews/compose/tests/geturl/Makefile.in b/mailnews/compose/tests/geturl/Makefile.in index 3f67401fca84..5d2658b0c017 100644 --- a/mailnews/compose/tests/geturl/Makefile.in +++ b/mailnews/compose/tests/geturl/Makefile.in @@ -41,23 +41,13 @@ BASE_LIBS = \ $(NULL) GECKO_LIBS = \ - -lraptorwebwidget \ - -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ -lraptorhtmlpars \ -lexpat \ -lxmltok \ - -lraptorview \ -ljsdom \ -lraptorplugin \ $(NULL) -IMGLIB_LIBS = \ - -limg \ - $(JPEG_LIBS) \ - $(PNG_LIBS) \ - $(NULL) - NETLIB_LIBS = \ -labouturl \ -lfileurl \ @@ -80,7 +70,7 @@ NETLIB_LIBS = \ LIBS = \ $(GECKO_LIBS) \ $(NETLIB_LIBS) \ - $(IMGLIB_LIBS) \ + $(TIMER_LIBS) \ $(BASE_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ diff --git a/mailnews/compose/tests/sendlater/Makefile.in b/mailnews/compose/tests/sendlater/Makefile.in index e230082a055c..8293c79e656b 100644 --- a/mailnews/compose/tests/sendlater/Makefile.in +++ b/mailnews/compose/tests/sendlater/Makefile.in @@ -46,9 +46,10 @@ LIBS = \ -lnetwork \ -lnetlib \ -lreg \ + -ltimer_s \ -lxpcom \ -lpwcac \ - -lmozdbm \ + -lmozdbm \ -lxp \ -lpref \ -lmozjs \ @@ -57,11 +58,9 @@ LIBS = \ -lsecfree \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ - -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -limg \ -lmozutil \ - $(TK_LIBS) \ $(NULL) include $(topsrcdir)/config/config.mk diff --git a/mailnews/compose/tests/sendpage/Makefile.in b/mailnews/compose/tests/sendpage/Makefile.in index 559771b06907..7e25328819c4 100644 --- a/mailnews/compose/tests/sendpage/Makefile.in +++ b/mailnews/compose/tests/sendpage/Makefile.in @@ -46,9 +46,10 @@ LIBS = \ -lnetwork \ -lnetlib \ -lreg \ + -ltimer_s \ -lxpcom \ -lpwcac \ - -lmozdbm \ + -lmozdbm \ -lxp \ -lpref \ -lmozjs \ @@ -57,11 +58,9 @@ LIBS = \ -lsecfree \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ - -lgfx$(MOZ_GFX_TOOLKIT) \ -lraptorgfx \ -limg \ -lmozutil \ - $(TK_LIBS) \ $(NULL) include $(topsrcdir)/config/config.mk diff --git a/mailnews/compose/tests/smtp/Makefile.in b/mailnews/compose/tests/smtp/Makefile.in index 48bea074871a..8577eb15e86a 100644 --- a/mailnews/compose/tests/smtp/Makefile.in +++ b/mailnews/compose/tests/smtp/Makefile.in @@ -58,13 +58,10 @@ LIBS = \ -ljsdom \ -ljsurl \ -limg \ - $(PNG_LIBS) \ - $(JPEG_LIBS) \ -lxp \ - -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ -lmozutil \ -lsecfree \ + $(TIMER_LIBS) \ $(ZLIB_LIBS) \ $(DIST)/lib/librdfbase_s.a \ $(NSPR_LIBS) \ diff --git a/mailnews/imap/tests/harness/Makefile.in b/mailnews/imap/tests/harness/Makefile.in index b42696c6ee67..b779d7dcd204 100644 --- a/mailnews/imap/tests/harness/Makefile.in +++ b/mailnews/imap/tests/harness/Makefile.in @@ -58,12 +58,9 @@ LIBS = \ -lexpat \ -lxmltok \ -limg \ - -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ -lmozutil \ -lmsgbaseutil \ - $(JPEG_LIBS) \ - $(PNG_LIBS) \ + $(TIMER_LIBS) \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ diff --git a/mailnews/local/tests/pop3/Makefile.in b/mailnews/local/tests/pop3/Makefile.in index ffd0d5350a06..0e25b3c1f516 100644 --- a/mailnews/local/tests/pop3/Makefile.in +++ b/mailnews/local/tests/pop3/Makefile.in @@ -56,10 +56,9 @@ LIBS = \ -ljsdom \ -ljsurl \ -lsecfree \ + $(TIMER_LIBS) \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ - -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ -limg \ -lmozutil \ $(TK_LIBS) \ diff --git a/mailnews/mime/tests/mimetest/Makefile.in b/mailnews/mime/tests/mimetest/Makefile.in index 55468026a2c2..77ed9040f645 100644 --- a/mailnews/mime/tests/mimetest/Makefile.in +++ b/mailnews/mime/tests/mimetest/Makefile.in @@ -39,14 +39,9 @@ BASE_LIBS = \ $(NULL) GECKO_LIBS = \ - -lraptorwebwidget \ - $(MOZ_WIDGET_TOOLKIT_LDFLAGS) \ - -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ -lraptorhtmlpars \ -lexpat \ -lxmltok \ - -lraptorview \ -ljsdom \ -lraptorplugin \ $(NULL) @@ -79,6 +74,7 @@ NETLIB_LIBS = \ LIBS = \ $(GECKO_LIBS) \ $(NETLIB_LIBS) \ + $(TIMER_LIBS) \ $(IMGLIB_LIBS) \ $(BASE_LIBS) \ $(NSPR_LIBS) \ diff --git a/mailnews/news/tests/newsParser/Makefile.in b/mailnews/news/tests/newsParser/Makefile.in index 0b70cf4926fd..07faaa67def4 100644 --- a/mailnews/news/tests/newsParser/Makefile.in +++ b/mailnews/news/tests/newsParser/Makefile.in @@ -59,17 +59,15 @@ LIBS = \ -lxmltok \ -lraptorgfx \ -limg \ - -lgfx$(MOZ_GFX_TOOLKIT) \ - -lraptorgfx \ -lmozutil \ $(DIST)/lib/libmsgnews_s.a \ -lmsgbaseutil \ + -ltimer_s \ -lxpcom \ $(JPEG_LIBS) \ $(PNG_LIBS) \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ - $(TK_LIBS) \ $(NULL) include $(topsrcdir)/config/config.mk diff --git a/mailnews/news/tests/nntp/Makefile.in b/mailnews/news/tests/nntp/Makefile.in index 5485aba3e509..caa75ad358ce 100644 --- a/mailnews/news/tests/nntp/Makefile.in +++ b/mailnews/news/tests/nntp/Makefile.in @@ -59,13 +59,9 @@ LIBS = \ -ljsdom \ -ljsurl \ -limg \ - $(PNG_LIBS) \ - $(JPEG_LIBS) \ - $(MOZ_WIDGET_TOOLKIT_LDFLAGS) \ - -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ -lmozutil \ -lmsgbaseutil \ + $(TIMER_LIBS) \ $(ZLIB_LIBS) \ $(DIST)/lib/librdfbase_s.a \ $(NSPR_LIBS) \ diff --git a/network/module/tests/Makefile.in b/network/module/tests/Makefile.in index 4c2fd1beab59..d57e8e16acbe 100644 --- a/network/module/tests/Makefile.in +++ b/network/module/tests/Makefile.in @@ -33,8 +33,6 @@ LOCAL_INCLUDES := -I$(srcdir)/../src REQUIRES = raptor netlib xpcom reg pref LIBS = \ - -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ -lnetlib \ -labouturl \ -lfileurl \ @@ -48,7 +46,6 @@ LIBS = \ -lhttpurl \ -lnetwork \ -lnetcache \ - $(TK_LIBS) \ -lpref \ -lsecfree \ -l$(MOZ_LIB_JS_PREFIX)js \ @@ -56,6 +53,8 @@ LIBS = \ -l$(MOZ_LIB_UTIL_PREFIX)util \ -lxp \ -lxpcom \ + $(TIMER_LIBS) \ + $(TK_LIBS) \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/parser/htmlparser/robot/Makefile.in b/parser/htmlparser/robot/Makefile.in index 4a799e9dde9b..3d6324724ddf 100644 --- a/parser/htmlparser/robot/Makefile.in +++ b/parser/htmlparser/robot/Makefile.in @@ -54,12 +54,11 @@ LIBS = \ -lhttpurl \ -lpwcac \ -l$(MOZ_LIB_JS_PREFIX)js \ - -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ -limg \ -lmozutil \ -lxpcom \ -lreg \ + $(TIMER_LIBS) \ $(TK_LIBS) \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ diff --git a/rdf/tests/rdfcat/Makefile.in b/rdf/tests/rdfcat/Makefile.in index 815d22c603bf..789031215bab 100644 --- a/rdf/tests/rdfcat/Makefile.in +++ b/rdf/tests/rdfcat/Makefile.in @@ -38,23 +38,6 @@ BASE_LIBS = \ -l$(MOZ_LIB_UTIL_PREFIX)util \ $(NULL) -GECKO_LIBS = \ - -lraptorwebwidget \ - -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ - -lraptorhtmlpars \ - -lexpat \ - -lxmltok \ - -lraptorview \ - -ljsdom \ - -lraptorplugin \ - $(NULL) - -IMGLIB_LIBS = \ - -limg \ - $(JPEG_LIBS) \ - $(PNG_LIBS) \ - $(NULL) ifndef NECKO NETLIB_LIBS = \ @@ -85,9 +68,8 @@ NETLIB_LIBS = \ endif LIBS = \ - $(GECKO_LIBS) \ $(NETLIB_LIBS) \ - $(IMGLIB_LIBS) \ + $(TIMER_LIBS) \ $(BASE_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ diff --git a/rdf/tests/rdfpoll/Makefile.in b/rdf/tests/rdfpoll/Makefile.in index be8fb89cb3cb..aebc6ee3f052 100644 --- a/rdf/tests/rdfpoll/Makefile.in +++ b/rdf/tests/rdfpoll/Makefile.in @@ -38,23 +38,6 @@ BASE_LIBS = \ -l$(MOZ_LIB_UTIL_PREFIX)util \ $(NULL) -GECKO_LIBS = \ - -lraptorwebwidget \ - -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ - -lraptorhtmlpars \ - -lexpat \ - -lxmltok \ - -lraptorview \ - -ljsdom \ - -lraptorplugin \ - $(NULL) - -IMGLIB_LIBS = \ - -limg \ - $(JPEG_LIBS) \ - $(PNG_LIBS) \ - $(NULL) ifndef NECKO NETLIB_LIBS = \ @@ -85,8 +68,8 @@ NETLIB_LIBS = \ endif LIBS = \ - $(GECKO_LIBS) \ $(NETLIB_LIBS) \ + $(TIMER_LIBS) \ $(IMGLIB_LIBS) \ $(BASE_LIBS) \ $(NSPR_LIBS) \ diff --git a/timer/public/Makefile.in b/timer/public/Makefile.in index ef9a555650cb..5c4eba49299d 100644 --- a/timer/public/Makefile.in +++ b/timer/public/Makefile.in @@ -25,7 +25,6 @@ include $(DEPTH)/config/autoconf.mk EXPORTS = \ nsITimer.h \ nsITimerCallback.h \ - nsTimerCIID.h \ $(NULL) EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) diff --git a/webshell/embed/gtk/lib/Makefile.am b/webshell/embed/gtk/lib/Makefile.am index fc383c6a6aab..9569ee2914ad 100644 --- a/webshell/embed/gtk/lib/Makefile.am +++ b/webshell/embed/gtk/lib/Makefile.am @@ -27,19 +27,18 @@ BASE_LIBS = \ $(ZLIB_LIBS) \ -lreg \ -l$(MOZ_LIB_JS_PREFIX)js \ + -ltimer_s \ -lxpcom \ -lsecfree \ -l$(MOZ_LIB_UTIL_PREFIX)util \ $(NULL) MOZ_WIDGET_TOOLKIT_LDFLAGS=-lwidgetgtk -MOZ_GFX_TOOLKIT_LDFLAGS=-lgfxgtk GECKO_LIBS = \ -lraptorwebwidget \ $(MOZ_WIDGET_TOOLKIT_LDFLAGS) \ -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ -lraptorhtmlpars \ -lexpat \ -lxmltok \ diff --git a/webshell/embed/gtk/lib/Makefile.in b/webshell/embed/gtk/lib/Makefile.in index f7d5bf8a5ffc..a5bb3fe51e4a 100644 --- a/webshell/embed/gtk/lib/Makefile.in +++ b/webshell/embed/gtk/lib/Makefile.in @@ -96,13 +96,12 @@ MOZ_LIB_UTIL_PREFIX = moz ZLIB_LIBS = -lz -BASE_LIBS = -lpref $(ZLIB_LIBS) -lreg -l$(MOZ_LIB_JS_PREFIX)js -lxpcom -lsecfree -l$(MOZ_LIB_UTIL_PREFIX)util $(NULL) +BASE_LIBS = -lpref $(ZLIB_LIBS) -lreg -l$(MOZ_LIB_JS_PREFIX)js -ltimer_s -lxpcom -lsecfree -l$(MOZ_LIB_UTIL_PREFIX)util $(NULL) MOZ_WIDGET_TOOLKIT_LDFLAGS = -lwidgetgtk -MOZ_GFX_TOOLKIT_LDFLAGS = -lgfxgtk -GECKO_LIBS = -lraptorwebwidget $(MOZ_WIDGET_TOOLKIT_LDFLAGS) -lraptorgfx $(MOZ_GFX_TOOLKIT_LDFLAGS) -lraptorhtmlpars -lexpat -lxmltok -ljsdom $(NULL) +GECKO_LIBS = -lraptorwebwidget $(MOZ_WIDGET_TOOLKIT_LDFLAGS) -lraptorgfx -lraptorhtmlpars -lexpat -lxmltok -ljsdom $(NULL) JPEG_LIBS = -ljpeg diff --git a/webshell/tests/viewer/Makefile.in b/webshell/tests/viewer/Makefile.in index 15bbe3292f6f..9ed928d782cc 100644 --- a/webshell/tests/viewer/Makefile.in +++ b/webshell/tests/viewer/Makefile.in @@ -115,6 +115,7 @@ GECKO_LIBS = \ $(MOZ_WIDGET_TOOLKIT_LDFLAGS) \ -lraptorgfx \ $(MOZ_GFX_TOOLKIT_LDFLAGS) \ + -ltimer_s \ -lraptorhtmlpars \ -lexpat \ -lxmltok \ diff --git a/widget/tests/scribble/Makefile.in b/widget/tests/scribble/Makefile.in index 64cd9164c2c4..a3cc999329f6 100644 --- a/widget/tests/scribble/Makefile.in +++ b/widget/tests/scribble/Makefile.in @@ -41,6 +41,7 @@ LIBS := \ $(MOZ_WIDGET_TOOLKIT_LDFLAGS) \ -lraptorgfx \ $(MOZ_GFX_TOOLKIT_LDFLAGS) \ + -ltimer_s \ -lraptorhtmlpars \ -lraptorview \ -labouturl \ diff --git a/widget/tests/widget/Makefile.in b/widget/tests/widget/Makefile.in index b250d5d28ad5..8f88217591d7 100644 --- a/widget/tests/widget/Makefile.in +++ b/widget/tests/widget/Makefile.in @@ -66,6 +66,7 @@ LIBS = \ $(MOZ_WIDGET_TOOLKIT_LDFLAGS) \ -lraptorgfx \ $(MOZ_GFX_TOOLKIT_LDFLAGS) \ + -ltimer_s \ -lxp \ -lraptorhtmlpars \ -lexpat \ diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in index 1b7458ace26b..83096cbd2976 100644 --- a/xpcom/tests/Makefile.in +++ b/xpcom/tests/Makefile.in @@ -85,9 +85,6 @@ NETLIB_LIBS = \ endif LIBS += \ - -lraptorgfx \ - $(MOZ_GFX_TOOLKIT_LDFLAGS) \ - $(TK_LIBS) \ -lpref \ -lsecfree \ -l$(MOZ_LIB_JS_PREFIX)js \ @@ -95,7 +92,9 @@ LIBS += \ -l$(MOZ_LIB_UTIL_PREFIX)util \ -lxp \ -lxpcom \ + $(TK_LIBS) \ $(NETLIB_LIBS) \ + $(TIMER_LIBS) \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in index 96e1bf96980c..3284e570f83e 100644 --- a/xpfe/bootstrap/Makefile.in +++ b/xpfe/bootstrap/Makefile.in @@ -59,6 +59,7 @@ LIBS += \ $(MOZ_WIDGET_TOOLKIT_LDFLAGS) \ -lraptorgfx \ $(MOZ_GFX_TOOLKIT_LDFLAGS) \ + -ltimer_s \ -lreg \ -lraptorwebwidget \ -lraptorhtmlpars \