Bug 937526 - Cleanup unicharutil/util and rdf/util related things. r=gps

dothq · Nov 16, 2013 · 3dcc532 · 3dcc532
1 parent b8efeb8
commit 3dcc532
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 27 deletions.
diff --git a/config/config.mk b/config/config.mk
@@ -218,9 +218,6 @@ endif
 
 OS_CONFIG	:= $(OS_ARCH)$(OS_RELEASE)
 
-MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
-MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
-
 ifdef _MSC_VER
 CC_WRAPPER ?= $(call py_action,cl)
 CXX_WRAPPER ?= $(call py_action,cl)

diff --git a/intl/unicharutil/util/internal/moz.build b/intl/unicharutil/util/internal/moz.build
@@ -12,6 +12,4 @@ UNIFIED_SOURCES += intl_unicharutil_util_cppsrcs
 
 LIBRARY_NAME = 'unicharutil_s'
 
-EXPORT_LIBRARY = True
-
-FORCE_STATIC_LIB = True
+LIBXUL_LIBRARY = True
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
@@ -218,9 +218,6 @@ endif
 
 OS_CONFIG	:= $(OS_ARCH)$(OS_RELEASE)
 
-MOZ_UNICHARUTIL_LIBS = $(LIBXUL_DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
-MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
-
 ifdef _MSC_VER
 CC_WRAPPER ?= $(call py_action,cl)
 CXX_WRAPPER ?= $(call py_action,cl)

diff --git a/rdf/util/src/internal/moz.build b/rdf/util/src/internal/moz.build
@@ -12,5 +12,4 @@ SOURCES += rdf_util_src_cppsrcs
 
 LIBRARY_NAME = 'rdfutil_s'
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = True
+LIBXUL_LIBRARY = True
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
@@ -15,6 +15,8 @@ endif
 VPATH += $(topsrcdir)/build/
 
 SHARED_LIBRARY_LIBS += \
+  $(DEPTH)/intl/unicharutil/util/internal/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) \
+  $(DEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
   $(DEPTH)/media/kiss_fft/$(LIB_PREFIX)kiss_fft.$(LIB_SUFFIX) \
   $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \
   $(NULL)
@@ -487,9 +489,6 @@ ifdef MOZ_DIRECTSHOW
 OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo)
 endif
 
-LOCAL_INCLUDES += -I$(topsrcdir)/intl/unicharutil/util \
-  -I$(topsrcdir)/intl/unicharutil/src
-
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 SDK_LIBRARY = $(IMPORT_LIBRARY)
 else

diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
@@ -16,12 +16,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 else:
     LIBRARY_NAME = 'xul'
 
-include('/rdf/util/src/objs.mozbuild')
-include('/intl/unicharutil/util/objs.mozbuild')
-
-SOURCES += intl_unicharutil_util_cppsrcs
-SOURCES += rdf_util_src_cppsrcs
-
 SOURCES += [
     'nsStaticXULComponents.cpp',
 ]

diff --git a/toolkit/mozapps/extensions/Makefile.in b/toolkit/mozapps/extensions/Makefile.in
@@ -17,10 +17,3 @@ DEFINES += -DMOZ_EM_DEBUG=1
 else ifdef MOZ_DEBUG
 DEFINES += -DMOZ_EM_DEBUG=1
 endif
-
-
-EXTRA_DSO_LDOPTS = \
-  $(MOZ_JS_LIBS) \
-  $(MOZ_UNICHARUTIL_LIBS) \
-  $(MOZ_COMPONENT_LIBS) \
-  $(NULL)