Bug 937526 - Cleanup unicharutil/util and rdf/util related things. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 16 Nov 2013 13:37:54 +0900
changeset 154938 a694bdd3533c7778576d953521bf99298c5f5db8
parent 154937 6bc9038ac3a65b01bc531a8cc611d13cea11c613
child 154939 cbb4bcee6ba021cd1c69e6c860b2e04247b8eaf6
push id25657
push userMs2ger@gmail.com
push dateSun, 17 Nov 2013 13:24:50 +0000
treeherdermozilla-central@0e88f511e067 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs937526
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 937526 - Cleanup unicharutil/util and rdf/util related things. r=gps
config/config.mk
intl/unicharutil/util/internal/moz.build
js/src/config/config.mk
rdf/util/src/internal/moz.build
toolkit/library/Makefile.in
toolkit/library/moz.build
toolkit/mozapps/extensions/Makefile.in
--- a/config/config.mk
+++ b/config/config.mk
@@ -213,19 +213,16 @@ ifdef WANT_MOZILLA_CONFIG_OS_VERSION
 OS_VERS		:= $(suffix $(OS_RELEASE))
 OS_VERSION	:= $(shell echo $(OS_VERS) | sed 's/-.*//')
 endif
 
 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)
 endif # _MSC_VER
 
 CC := $(CC_WRAPPER) $(CC)
 CXX := $(CXX_WRAPPER) $(CXX)
 MKDIR ?= mkdir
--- a/intl/unicharutil/util/internal/moz.build
+++ b/intl/unicharutil/util/internal/moz.build
@@ -7,11 +7,9 @@
 MODULE = 'unicharutil'
 
 include('../objs.mozbuild')
 
 UNIFIED_SOURCES += intl_unicharutil_util_cppsrcs
 
 LIBRARY_NAME = 'unicharutil_s'
 
-EXPORT_LIBRARY = True
-
-FORCE_STATIC_LIB = True
+LIBXUL_LIBRARY = True
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -213,19 +213,16 @@ ifdef WANT_MOZILLA_CONFIG_OS_VERSION
 OS_VERS		:= $(suffix $(OS_RELEASE))
 OS_VERSION	:= $(shell echo $(OS_VERS) | sed 's/-.*//')
 endif
 
 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)
 endif # _MSC_VER
 
 CC := $(CC_WRAPPER) $(CC)
 CXX := $(CXX_WRAPPER) $(CXX)
 MKDIR ?= mkdir
--- a/rdf/util/src/internal/moz.build
+++ b/rdf/util/src/internal/moz.build
@@ -7,10 +7,9 @@
 MODULE = 'rdfutil'
 
 include('../objs.mozbuild')
 
 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
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -10,16 +10,18 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 # setting SHARED_LIBRARY; we need to leave DLL_PREFIX and DLL_SUFFIX
 # as-is so that dependencies of the form -ltracemalloc still work.
 MAKE_FRAMEWORK=1
 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)
 
 ifdef ACCESSIBILITY
 SHARED_LIBRARY_LIBS += \
   $(DEPTH)/accessible/src/base/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \
   $(DEPTH)/accessible/src/generic/$(LIB_PREFIX)accessibility_generic_s.$(LIB_SUFFIX) \
@@ -482,19 +484,16 @@ endif
 ifdef MOZ_WMF
 OS_LIBS += $(call EXPAND_LIBNAME,mfuuid wmcodecdspuuid strmiids)
 endif
 
 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
 SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
 
 EXTRA_DSO_LDOPTS += $(LIBS_DIR)
 
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -11,22 +11,16 @@ MODULE = 'libxul'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     # This is going to be a framework named "XUL", not an ordinary library named
     # "libxul.dylib"
     LIBRARY_NAME = 'XUL'
 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',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'nsDllMain.cpp',
     ]
--- a/toolkit/mozapps/extensions/Makefile.in
+++ b/toolkit/mozapps/extensions/Makefile.in
@@ -12,15 +12,8 @@ DEFINES += -DMOZ_EXTENSIONS_DB_SCHEMA=15
 
 # Additional debugging info is exposed in debug builds, or by setting the
 # MOZ_EM_DEBUG environment variable when building.
 ifneq (,$(MOZ_EM_DEBUG))
 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)