Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow libxul to link in mingw builds.

Browse Source 
Bug #334403 r=bsmedberg


git-svn-id: svn://10.0.0.236/trunk@194606 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org
2006-04-18 15:52:41 +00:00
parent c005e02e76
commit 26c32e28f6
9 changed files with 128 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/intl/unicharutil/util/Makefile.in
View File

@@ -42,6 +42,10 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(srcdir)/objs.mk
EXTRA_DEPS += $(srcdir)/objs.mk
MODULE=unicharutil
LIBRARY_NAME=unicharutil_s
EXPORT_LIBRARY=1
@@ -58,10 +62,7 @@ EXPORTS = \
nsCompressedCharMap.h \
$(NULL)
CPPSRCS = \
nsUnicharUtils.cpp \
nsCompressedCharMap.cpp \
$(NULL)
CPPSRCS = $(INTL_UNICHARUTIL_UTIL_LCPPSRCS)
FORCE_STATIC_LIB = 1
FORCE_USE_PIC = 1

42
mozilla/intl/unicharutil/util/objs.mk Normal file
View File

@@ -0,0 +1,42 @@
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 2002
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
INTL_UNICHARUTIL_UTIL_LCPPSRCS = \
nsUnicharUtils.cpp \
nsCompressedCharMap.cpp \
$(NULL)
INTL_UNICHARUTIL_UTIL_CPPSRCS = $(addprefix $(topsrcdir)/intl/unicharutil/util/, $(INTL_UNICHARUTIL_UTIL_LCPPSRCS))

1
mozilla/parser/xml/src/Makefile.in
View File

@@ -45,6 +45,7 @@ MODULE = xml
LIBRARY_NAME = saxp
MOZILLA_INTERNAL_API = 1
LIBXUL_LIBRARY = 1
REQUIRES = \
necko \

5
mozilla/rdf/build/Makefile.in
View File

@@ -70,8 +70,13 @@ CPPSRCS = \
SHARED_LIBRARY_LIBS = \
../base/src/$(LIB_PREFIX)rdfbase_s.$(LIB_SUFFIX) \
../datasource/src/$(LIB_PREFIX)rdfdatasource_s.$(LIB_SUFFIX) \
$(NULL)
ifndef MOZ_ENABLE_LIBXUL
SHARED_LIBRARY_LIBS += \
../util/src/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(NULL)
endif
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \

6
mozilla/rdf/util/src/Makefile.in
View File

@@ -42,6 +42,10 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(srcdir)/objs.mk
EXTRA_DEPS += $(srcdir)/objs.mk
MODULE = rdfutil
LIBRARY_NAME = rdfutil_s
MOZILLA_INTERNAL_API = 1
@@ -51,7 +55,7 @@ REQUIRES = xpcom \
rdf \
$(NULL)
CPPSRCS = nsRDFResource.cpp
CPPSRCS = $(RDF_UTIL_SRC_LCPPSRCS)
# we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1

41
mozilla/rdf/util/src/objs.mk Normal file
View File

@@ -0,0 +1,41 @@
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is mozilla.org.
#
# The Initial Developer of the Original Code is
# Netscape Communications Corporation.
# Portions created by the Initial Developer are Copyright (C) 2002
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
RDF_UTIL_SRC_LCPPSRCS = \
nsRDFResource.cpp \
$(NULL)
RDF_UTIL_SRC_CPPSRCS = $(addprefix $(topsrcdir)/rdf/util/src/, $(RDF_UTIL_SRC_LCPPSRCS))

33
mozilla/toolkit/library/Makefile.in
View File

@@ -42,6 +42,9 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/rdf/util/src/objs.mk
include $(topsrcdir)/intl/unicharutil/util/objs.mk
MODULE = libxul
LIBRARY_NAME = xul
FORCE_USE_PIC = 1
@@ -83,8 +86,8 @@ endif
SHARED_LIBRARY_LIBS += \
$(foreach lib,$(STATIC_LIBS),$(DIST)/lib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) \
$(foreach component,$(COMPONENT_LIBS),$(DIST)/lib/components/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \
$(foreach lib,$(STATIC_LIBS),$(DIST)/lib/$(LIB_PREFIX)$(lib).$(LIB_SUFFIX)) \
$(NULL)
ifdef MOZ_JAVAXPCOM
@@ -108,11 +111,34 @@ include $(srcdir)/libxul-config.mk
EXTRA_DEPS += \
$(srcdir)/libxul-config.mk \
$(srcdir)/libxul-rules.mk \
$(topsrcdir)/rdf/util/src/objs.mk \
$(topsrcdir)/intl/unicharutil/util/objs.mk \
$(NULL)
REQUIRES += \
rdf \
rdfutil \
uconv \
unicharutil \
$(NULL)
CPPSRCS += \
$(RDF_UTIL_SRC_LCPPSRCS) \
$(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
$(NULL)
GARBAGE += \
$(RDF_UTIL_SRC_LCPPSRCS) \
$(INTL_UNICHARUTIL_UTIL_LCPPSRCS) \
$(wildcard *.$(OBJ_SUFFIX)) \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk
export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS)
$(INSTALL) $^ .
EXTRA_DSO_LDOPTS += $(EXTRA_DSO_LIBS)
ifdef MOZ_ENABLE_LIBXUL
@@ -159,13 +185,10 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker
endif
ifeq ($(OS_ARCH),WINNT)
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32)
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32 winmm wsock32)
ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,imagehlp)
endif
ifdef GNU_CXX
DSO_LDOPTS += -Wl,--export-all-symbols
endif
endif # WINNT
ifdef MOZ_JAVAXPCOM

1
mozilla/toolkit/library/libxul-config.mk
View File

@@ -83,7 +83,6 @@ endif
STATIC_LIBS += \
xpcom_core \
mozreg_s \
unicharutil_s \
ucvutil_s \
gkgfx \
gfxshared_s \

2
mozilla/toolkit/library/libxul-rules.mk
View File

@@ -71,7 +71,7 @@ DEFINES += \
ifdef MOZ_ENABLE_CAIRO_GFX
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
OS_LIBS += usp10.lib
OS_LIBS += $(call EXPAND_LIBNAME,usp10)
endif
ifneq (,$(filter $(MOZ_GFX_TOOLKIT),mac cocoa))
ifdef MOZ_ENABLE_GLITZ