wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mike Hommey 2013-11-16 13:37:54 +09:00
parent 812fcf8da5
commit f25c307c6b
7 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.mk
View File

@ -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)

4
intl/unicharutil/util/internal/moz.build
View File

@ -12,6 +12,4 @@ UNIFIED_SOURCES += intl_unicharutil_util_cppsrcs
LIBRARY_NAME = 'unicharutil_s'
EXPORT_LIBRARY = True
FORCE_STATIC_LIB = True
LIBXUL_LIBRARY = True

3
js/src/config/config.mk
View File

@ -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)

3
rdf/util/src/internal/moz.build
View File

@ -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

5
toolkit/library/Makefile.in
View File

@ -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

6
toolkit/library/moz.build
View File

@ -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',
]

7
toolkit/mozapps/extensions/Makefile.in
View File

@ -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)