diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-26 14:04:17 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-26 14:33:51 +0200 |
commit | d0c301bba0b483c7ffef83fe93fa9658aa10bd44 (patch) | |
tree | 55e102a60c0c724e73e670571c2c98df3ac3c54d /package/source | |
parent | Related: fdo#37195 migrationoo3 not registered (diff) | |
download | core-d0c301bba0b483c7ffef83fe93fa9658aa10bd44.tar.gz core-d0c301bba0b483c7ffef83fe93fa9658aa10bd44.zip |
convert package to gbuild
Diffstat (limited to 'package/source')
-rw-r--r-- | package/source/manifest/makefile.mk | 55 | ||||
-rw-r--r-- | package/source/xstor/makefile.mk | 83 | ||||
-rw-r--r-- | package/source/xstor/xstor.dxp | 1 | ||||
-rw-r--r-- | package/source/zipapi/Deflater.cxx | 2 | ||||
-rw-r--r-- | package/source/zipapi/Inflater.cxx | 2 | ||||
-rw-r--r-- | package/source/zipapi/XUnbufferedStream.hxx | 2 | ||||
-rw-r--r-- | package/source/zipapi/makefile.mk | 62 | ||||
-rw-r--r-- | package/source/zippackage/makefile.mk | 58 |
8 files changed, 3 insertions, 262 deletions
diff --git a/package/source/manifest/makefile.mk b/package/source/manifest/makefile.mk deleted file mode 100644 index abc61848fc45..000000000000 --- a/package/source/manifest/makefile.mk +++ /dev/null @@ -1,55 +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=package -TARGET=manifest -AUTOSEG=true - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(L10N_framework)"=="" - -SLOFILES= \ - $(SLO)$/ManifestReader.obj \ - $(SLO)$/ManifestWriter.obj \ - $(SLO)$/ManifestImport.obj \ - $(SLO)$/ManifestExport.obj \ - $(SLO)$/Base64Codec.obj \ - $(SLO)$/UnoRegister.obj - -.ENDIF # L10N_framework - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/package/source/xstor/makefile.mk b/package/source/xstor/makefile.mk deleted file mode 100644 index 5c381ba4c803..000000000000 --- a/package/source/xstor/makefile.mk +++ /dev/null @@ -1,83 +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=package -TARGET=xstor - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(L10N_framework)"=="" - -SLOFILES = \ - $(SLO)$/ohierarchyholder.obj\ - $(SLO)$/ocompinstream.obj\ - $(SLO)$/oseekinstream.obj\ - $(SLO)$/owriteablestream.obj\ - $(SLO)$/xstorage.obj\ - $(SLO)$/xfactory.obj\ - $(SLO)$/disposelistener.obj\ - $(SLO)$/selfterminatefilestream.obj\ - $(SLO)$/switchpersistencestream.obj\ - $(SLO)$/register.obj - -SHL1TARGET=$(TARGET) -SHL1STDLIBS=\ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) - -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=$(SHL1TARGET).dxp - -.ENDIF # L10N_framework - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/xstor.component - -$(MISC)/xstor.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - xstor.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt xstor.component diff --git a/package/source/xstor/xstor.dxp b/package/source/xstor/xstor.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/package/source/xstor/xstor.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/package/source/zipapi/Deflater.cxx b/package/source/zipapi/Deflater.cxx index 30318ce5c520..1e42bdbe3810 100644 --- a/package/source/zipapi/Deflater.cxx +++ b/package/source/zipapi/Deflater.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_package.hxx" -#include <Deflater.hxx> +#include <package/Deflater.hxx> #ifndef _ZLIB_H #ifdef SYSTEM_ZLIB #include <zlib.h> diff --git a/package/source/zipapi/Inflater.cxx b/package/source/zipapi/Inflater.cxx index 40d2bee99333..1438b69da378 100644 --- a/package/source/zipapi/Inflater.cxx +++ b/package/source/zipapi/Inflater.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_package.hxx" -#include <Inflater.hxx> +#include <package/Inflater.hxx> #ifndef _ZLIB_H #ifdef SYSTEM_ZLIB #include <zlib.h> diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx index 43a659485c24..796c6330a160 100644 --- a/package/source/zipapi/XUnbufferedStream.hxx +++ b/package/source/zipapi/XUnbufferedStream.hxx @@ -36,7 +36,7 @@ #include <cppuhelper/implbase1.hxx> #include <rtl/ref.hxx> -#include <Inflater.hxx> +#include <package/Inflater.hxx> #include <ZipEntry.hxx> #include <CRC32.hxx> #include <mutexholder.hxx> diff --git a/package/source/zipapi/makefile.mk b/package/source/zipapi/makefile.mk deleted file mode 100644 index 8a07d448ddbb..000000000000 --- a/package/source/zipapi/makefile.mk +++ /dev/null @@ -1,62 +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=package -TARGET=zipapi - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/package.pmk - -# --- Files -------------------------------------------------------- -.IF "$(L10N_framework)"=="" -.IF "$(SYSTEM_ZLIB)" == "YES" -CFLAGS+=-DSYSTEM_ZLIB -.ENDIF - -SLOFILES= \ - $(SLO)$/CRC32.obj \ - $(SLO)$/ByteChucker.obj \ - $(SLO)$/ByteGrabber.obj \ - $(SLO)$/blowfishcontext.obj \ - $(SLO)$/Inflater.obj \ - $(SLO)$/Deflater.obj \ - $(SLO)$/sha1context.obj \ - $(SLO)$/ZipEnumeration.obj \ - $(SLO)$/ZipFile.obj \ - $(SLO)$/ZipOutputStream.obj \ - $(SLO)$/XUnbufferedStream.obj - -.ENDIF # L10N_framework - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/package/source/zippackage/makefile.mk b/package/source/zippackage/makefile.mk deleted file mode 100644 index c729b945f0df..000000000000 --- a/package/source/zippackage/makefile.mk +++ /dev/null @@ -1,58 +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=package -TARGET=zippackage -AUTOSEG=true - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -.IF "$(L10N_framework)"=="" - -SLOFILES= \ - $(SLO)$/ZipPackage.obj \ - $(SLO)$/ZipPackageBuffer.obj \ - $(SLO)$/ZipPackageEntry.obj \ - $(SLO)$/ZipPackageFolder.obj \ - $(SLO)$/ZipPackageFolderEnumeration.obj \ - $(SLO)$/ZipPackageSink.obj \ - $(SLO)$/ZipPackageStream.obj \ - $(SLO)$/wrapstreamforshare.obj \ - $(SLO)$/zipfileaccess.obj - -.ENDIF # L10N_framework - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk |