diff options
author | Mathias Bauer <mba@openoffice.org> | 2011-03-02 13:22:42 +0100 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 01:01:10 +0200 |
commit | fa4ec3c338e5b33e9886ee489bbe38ddd7dfae3c (patch) | |
tree | 28ee9ec51e47d3be7c5a659153b63c2920139fb4 /sax/source | |
parent | CWS gnumake4: fixes for building with ENABLE_CAIRO on windows [hg:824c8caeaf61] (diff) | |
download | core-fa4ec3c338e5b33e9886ee489bbe38ddd7dfae3c.tar.gz core-fa4ec3c338e5b33e9886ee489bbe38ddd7dfae3c.zip |
CWS gnumake4: convert sax to new build system [hg:389d236eb6b2]
Diffstat (limited to 'sax/source')
-rw-r--r-- | sax/source/expatwrap/attrlistimpl.hxx | 3 | ||||
-rw-r--r-- | sax/source/expatwrap/makefile.mk | 87 | ||||
-rw-r--r-- | sax/source/expatwrap/sax_expat.cxx | 4 | ||||
-rw-r--r-- | sax/source/fastparser/makefile.mk | 79 | ||||
-rw-r--r-- | sax/source/tools/makefile.mk | 67 |
5 files changed, 2 insertions, 238 deletions
diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx index aaf6cf84b359..3676469a67c7 100644 --- a/sax/source/expatwrap/attrlistimpl.hxx +++ b/sax/source/expatwrap/attrlistimpl.hxx @@ -29,10 +29,7 @@ #define _SAX_ATTRLISTIMPL_HXX #include "sal/config.h" -//#include "sax/saxdllapi.h" - #include <cppuhelper/implbase2.hxx> - #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> diff --git a/sax/source/expatwrap/makefile.mk b/sax/source/expatwrap/makefile.mk deleted file mode 100644 index 6e1348c0d403..000000000000 --- a/sax/source/expatwrap/makefile.mk +++ /dev/null @@ -1,87 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=sax -TARGET=sax.uno -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -.IF "$(SYSTEM_ZLIB)" == "YES" -CFLAGS+=-DSYSTEM_ZLIB -.ENDIF - -.IF "$(SYSTEM_EXPAT)" == "YES" -CFLAGS+=-DSYSTEM_EXPAT -.ELSE -CFLAGS += -DXML_UNICODE -.ENDIF - -#----------------------------------------------------------- - -SLOFILES =\ - $(SLO)$/xml2utf.obj\ - $(SLO)$/attrlistimpl.obj\ - $(SLO)$/sax_expat.obj \ - $(SLO)$/saxwriter.obj - -SHL1TARGET= $(TARGET) -SHL1IMPLIB= i$(TARGET) - -SHL1STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(EXPAT3RDLIB) - -SHL1DEPN= -SHL1VERSIONMAP= $(SOLARENV)$/src$/component.map -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/sax.component $(MISC)/sax.inbuild.component - -$(MISC)/sax.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - sax.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt sax.component - -$(MISC)/sax.inbuild.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt sax.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_INBUILD_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt sax.component diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx index aaaac6bd564e..27ede854b974 100644 --- a/sax/source/expatwrap/sax_expat.cxx +++ b/sax/source/expatwrap/sax_expat.cxx @@ -1028,13 +1028,13 @@ using namespace sax_expatwrap; extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; diff --git a/sax/source/fastparser/makefile.mk b/sax/source/fastparser/makefile.mk deleted file mode 100644 index d8f9378c19b9..000000000000 --- a/sax/source/fastparser/makefile.mk +++ /dev/null @@ -1,79 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PRJNAME=sax -TARGET=fastsax.uno -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -DLLPRE = - -.IF "$(SYSTEM_ZLIB)" == "YES" -CFLAGS+=-DSYSTEM_ZLIB -.ENDIF - -.IF "$(SYSTEM_EXPAT)" == "YES" -CFLAGS+=-DSYSTEM_EXPAT -.ENDIF - -#----------------------------------------------------------- - -SLOFILES =\ - $(SLO)$/facreg.obj\ - $(SLO)$/fastparser.obj\ - $(SLO)$/xml2utf.obj - -SHL1TARGET= $(TARGET) -SHL1IMPLIB= i$(TARGET) - -SHL1STDLIBS= \ - $(SALLIB) \ - $(SAXLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(EXPATASCII3RDLIB) - -SHL1DEPN= -SHL1VERSIONMAP= $(SOLARENV)$/src$/component.map -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/fastsax.component - -$(MISC)/fastsax.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - fastsax.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt fastsax.component diff --git a/sax/source/tools/makefile.mk b/sax/source/tools/makefile.mk deleted file mode 100644 index 5923fc5a7785..000000000000 --- a/sax/source/tools/makefile.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=sax -TARGET=sax -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/converter.obj \ - $(SLO)$/fastattribs.obj \ - $(SLO)$/fastserializer.obj \ - $(SLO)$/fshelper.obj - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1IMPLIB= i$(TARGET) - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(COMPHELPERLIB)\ - $(RTLLIB) \ - $(SALLIB) \ - $(ONELIB) - -SHL1DEPN= -SHL1OBJS= $(SLOFILES) -SHL1USE_EXPORTS=name -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) -DEFLIB1NAME= $(TARGET) - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk |