зеркало из https://github.com/mozilla/pjs.git
Rename our in-tree expat lib to mozexpat_s. Bug 305841, patch by Andy Willis
<abwillis1@gmail.com>, r=peterv
This commit is contained in:
bzbarsky%mit.edu
Родитель
a95a19802f
Коммит
df87d5eb4c
|
|
@ -62,7 +62,7 @@ TX_LIBS = \
|
|||
txxpath_s \
|
||||
txxml_s \
|
||||
txbase_s \
|
||||
expat_s \
|
||||
mozexpat_s \
|
||||
$(NULL)
|
||||
|
||||
LIBS = \
|
||||
|
|
|
|||
|
|
@ -1,164 +0,0 @@
|
|||
#!nmake
|
||||
#
|
||||
# ***** 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 code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1998
|
||||
# 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 *****
|
||||
|
||||
DEPTH=..\..
|
||||
|
||||
REQUIRES = xpcom
|
||||
|
||||
include <$(DEPTH)/config/config.mak>
|
||||
|
||||
MAKE_OBJ_TYPE = DLL
|
||||
DLLNAME = $(META_MODULE).dll
|
||||
DLL = .\$(OBJDIR)\$(DLLNAME)
|
||||
|
||||
LINK_COMP_NAMES = $(DIST)\$(META_MODULE)-link-comp-names
|
||||
LINK_COMPS = $(DIST)\$(META_MODULE)-link-comps
|
||||
LINK_LIBS = $(DIST)\$(META_MODULE)-link-libs
|
||||
SEDCMDS = nsMetaModule_$(META_MODULE).cpp.sed
|
||||
|
||||
EXTRA_LIBS_LIST_FILE = $(OBJDIR)\$(META_MODULE)-libs.txt
|
||||
|
||||
GARBAGE = $(GARBAGE) $(SEDCMDS) $(LIBFILE) nsMetaModule_$(META_MODULE).cpp
|
||||
|
||||
LCFLAGS = $(LCFLAGS) -DMETA_MODULE=\"$(META_MODULE)\"
|
||||
CPP_OBJS = .\$(OBJDIR)\nsMetaModule_$(META_MODULE).obj
|
||||
|
||||
# XXX Lame! This is currently the superset of all static libraries not
|
||||
# explicitly made part of the META_MODULE.
|
||||
LLIBS = $(DIST)\lib\gkgfx.lib \
|
||||
$(DIST)\lib\rdfutil_s.lib \
|
||||
$(DIST)\lib\js3250.lib \
|
||||
$(DIST)\lib\xpcom.lib \
|
||||
$(DIST)\lib\unicharutil_s.lib \
|
||||
$(LIBNSPR)
|
||||
|
||||
WIN_LIBS = rpcrt4.lib \
|
||||
ole32.lib \
|
||||
shell32.lib
|
||||
|
||||
|
||||
!ifdef MOZ_GECKO_DLL
|
||||
LLIBS = $(LLIBS) \
|
||||
$(DIST)\lib\png.lib \
|
||||
$(DIST)\lib\mng.lib \
|
||||
$(DIST)\lib\util.lib \
|
||||
$(DIST)\lib\expat.lib \
|
||||
$(DIST)\lib\nsldap32v40.lib
|
||||
|
||||
WIN_LIBS = $(WIN_LIBS) \
|
||||
comctl32.lib \
|
||||
comdlg32.lib \
|
||||
uuid.lib \
|
||||
ole32.lib \
|
||||
shell32.lib \
|
||||
oleaut32.lib \
|
||||
version.lib \
|
||||
winspool.lib
|
||||
|
||||
!endif
|
||||
|
||||
include <$(DEPTH)/config/rules.mak>
|
||||
|
||||
#
|
||||
# Create the sed commands that are used translate nsMetaModule_(foo).cpp.in
|
||||
# into nsMetaModule_(foo).cpp, using the component names,
|
||||
#
|
||||
$(SEDCMDS): $(LINK_COMP_NAMES)
|
||||
echo +++make: Creating $@
|
||||
rm -f $@
|
||||
echo s/%DECLARE_SUBMODULE_INFOS%/\>> $@
|
||||
sed -e "s/\(.*\)/extern nsModuleInfo NSMODULEINFO(\1);\\\/" $(LINK_COMP_NAMES) >> $@
|
||||
echo />> $@
|
||||
echo s/%SUBMODULE_INFOS%/\>> $@
|
||||
sed -e "s/\(.*\)/\\\\\& NSMODULEINFO(\1),\\\/" $(LINK_COMP_NAMES) >> $@
|
||||
echo />> $@
|
||||
|
||||
#
|
||||
# Create nsMetaModule_(foo).cpp from nsMetaModule.cpp.in
|
||||
#
|
||||
nsMetaModule_$(META_MODULE).cpp: nsMetaModule.cpp.in $(SEDCMDS)
|
||||
echo +++make: Creating $@
|
||||
rm -f $@
|
||||
sed -f $(SEDCMDS) nsMetaModule.cpp.in > $@
|
||||
|
||||
#
|
||||
# If no link components file has been created, make an empty one now.
|
||||
#
|
||||
$(LINK_COMPS):
|
||||
echo +++ make: Creating empty link components file: $@
|
||||
touch $@
|
||||
|
||||
#
|
||||
# If no link libs file has been created, make an empty one now.
|
||||
#
|
||||
$(LINK_LIBS):
|
||||
echo +++ make: Creating empty link libraries file: $@
|
||||
touch $@
|
||||
|
||||
#
|
||||
# Create a list of libraries that we'll need to link against from the
|
||||
# component list and the ``export library'' list
|
||||
#
|
||||
$(EXTRA_LIBS_LIST_FILE): $(LINK_COMPS) $(LINK_LIBS)
|
||||
echo +++ make: Creating list of link libraries: $@
|
||||
rm -f $@
|
||||
sed -e "s/\(.*\)/$(DIST:\=\\\)\\\lib\\\\\1.lib/" $(LINK_COMPS) > $@
|
||||
sed -e "s/\(.*\)/$(DIST:\=\\\)\\\lib\\\\\1.lib/" $(LINK_LIBS) >> $@
|
||||
|
||||
|
||||
# XXX this is a hack. The ``gecko'' meta-module consists
|
||||
# of all the static components linked into a DLL instead
|
||||
# of an executable. To make this work, we'll copy the
|
||||
# statically linked libs, components, and component names
|
||||
# to the right file. This relies on the fact that the
|
||||
# modules/staticmod directory gets built after all the other
|
||||
# directories in the tree are processed.
|
||||
!if defined(MOZ_GECKO_DLL) && "$(META_MODULE)" == "gecko"
|
||||
export::
|
||||
copy $(FINAL_LINK_LIBS) $(DIST)\$(META_MODULE)-link-libs
|
||||
copy $(FINAL_LINK_COMPS) $(DIST)\$(META_MODULE)-link-comps
|
||||
copy $(FINAL_LINK_COMP_NAMES) $(DIST)\$(META_MODULE)-link-comp-names
|
||||
!endif
|
||||
|
||||
|
||||
libs:: $(DLL)
|
||||
$(MAKE_INSTALL) $(DLL) $(DIST)/bin/components
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)/bin/components/$(DLLNAME)
|
||||
|
||||
|
|
@ -43,7 +43,7 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = expat
|
||||
LIBRARY_NAME = expat_s
|
||||
LIBRARY_NAME = mozexpat_s
|
||||
|
||||
CSRCS = \
|
||||
xmlparse.c \
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ REQUIRES = xpcom \
|
|||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)expat_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)mozexpat_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_PERF_METRICS
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче