diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-22 14:33:53 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-22 14:33:53 +0200 |
commit | 182b970b81d1f516cd9b05033a17145e79f1766f (patch) | |
tree | 07bb1a846b91d2f21aa0be64b53d10774b90e3eb /scp2 | |
parent | c08d41bade09598971f6404d9ea3ae33baa13038 (diff) |
gnumake4: adjust scp2 to gbuild
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/base/file_base.scp | 3 | ||||
-rw-r--r-- | scp2/source/canvas/makefile.mk | 1 | ||||
-rw-r--r-- | scp2/source/canvas/mtfrenderer.scp | 40 | ||||
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 6 | ||||
-rw-r--r-- | scp2/util/makefile.mk | 1 |
5 files changed, 0 insertions, 51 deletions
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp index 01e0b7f94d2a..f98231c471d8 100644 --- a/scp2/source/base/file_base.scp +++ b/scp2/source/base/file_base.scp @@ -57,9 +57,6 @@ STD_RES_FILE( gid_File_Res_Dbp, dbp) STD_LIB_FILE( gid_File_Lib_Dbu, dbui) STD_RES_FILE( gid_File_Res_Dbu, dbui) -STD_LIB_FILE( gid_File_Lib_Adabasui, adabasui ) -STD_RES_FILE( gid_File_Res_Adabasui, adabasui) - STD_RES_FILE( gid_File_Res_Cnr, cnr) STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl) STD_RES_FILE( gid_File_Res_Sdberr, sdberr) diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk index 1e360bed89bf..4c38d168ac96 100644 --- a/scp2/source/canvas/makefile.mk +++ b/scp2/source/canvas/makefile.mk @@ -41,7 +41,6 @@ SCP_PRODUCT_TYPE=osl PARFILES= canvascommons.par \ vclcanvas.par \ - mtfrenderer.par .IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE" PARFILES+= cairocanvas.par diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp deleted file mode 100644 index fa2a3f908a49..000000000000 --- a/scp2/source/canvas/mtfrenderer.scp +++ /dev/null @@ -1,40 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2010 Novell, Inc. - * - * 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. - * - ************************************************************************/ - -#include "macros.inc" - -File gid_File_Lib_MtfRenderer - TXT_FILE_BODY; - Styles = (PACKED,UNO_COMPONENT); - RegistryID = gid_Starregistry_Services_Rdb; - Dir = SCP2_OOO_BIN_DIR; - #ifdef UNX - Name = STRING(CONCAT2(libmtfrenderer.uno,UNXSUFFIX)); - #else - Name = "mtfrenderer.uno.dll"; - #endif -End diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 87891a257202..9474eb4357e5 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -898,12 +898,6 @@ STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft) STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter) -STD_LIB_FILE(gid_File_Lib_Resource,resourcemodel) - -STD_LIB_FILE(gid_File_Lib_Doctok,doctok) - -STD_LIB_FILE(gid_File_Lib_ooxml,ooxml) - #ifdef WNT #if defined(_gcc3) diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk index ea4793aa1160..af4861d10e1d 100644 --- a/scp2/util/makefile.mk +++ b/scp2/util/makefile.mk @@ -205,7 +205,6 @@ SCP1FILES += \ SCP1FILES += \ vclcanvas.par \ - mtfrenderer.par .IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE" SCP1FILES += cairocanvas.par |