More OJI removal bustage fixes for static builds. b=485984
authorJosh Aas <joshmoz@gmail.com>
Fri, 10 Apr 2009 00:30:44 -0400
changeset 27161 3051d82cb64fd5f510758329a69f8e67b85d7c52
parent 27160 1fc65dc2a0c203d1ec654a33e65dbe1d1d03041c
child 27170 99d61ba5f125204e80aaa2942180e8dc289596e7
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs485984
milestone1.9.2a1pre
More OJI removal bustage fixes for static builds. b=485984
config/autoconf.mk.in
layout/generic/Makefile.in
toolkit/library/libxul-config.mk
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -196,17 +196,16 @@ MOZ_TIMELINE=@MOZ_TIMELINE@
 
 ENABLE_STRIP	= @ENABLE_STRIP@
 PKG_SKIP_STRIP	= @PKG_SKIP_STRIP@
 
 ClientWallet=1
 CookieManagement=1
 SingleSignon=1
 
-MOZ_OJI		= @MOZ_OJI@
 MOZ_PLUGINS	= @MOZ_PLUGINS@
 
 MOZ_POST_DSO_LIB_COMMAND = @MOZ_POST_DSO_LIB_COMMAND@
 MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@
 
 MOZ_BUILD_ROOT             = @MOZ_BUILD_ROOT@
 
 MOZ_XUL                    = @MOZ_XUL@
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -62,17 +62,16 @@ REQUIRES	= xpcom \
 		  js \
 		  caps \
 		  pref \
 		  htmlparser \
 		  webshell \
 		  plugin \
 		  docshell \
 		  webbrwsr \
-		  oji \
 		  unicharutil \
 		  lwbrk \
 		  imglib2 \
 		  xpconnect \
 		  java \
 		  intl \
 		  thebes \
 		  cairo \
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -326,21 +326,16 @@ endif
 ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += widget_qt
 endif
 
 ifdef MOZ_ENABLE_PHOTON
 COMPONENT_LIBS += widget_photon
 endif
 
-ifdef MOZ_OJI
-STATIC_LIBS += jsj
-COMPONENT_LIBS += oji
-endif
-
 ifdef ACCESSIBILITY
 COMPONENT_LIBS += accessibility
 endif
 
 ifdef MOZ_ENABLE_XREMOTE
 COMPONENT_LIBS += remoteservice
 endif