[Libreoffice-commits] .: 2 commits - scaddins/AllLangResTarget_analysis.mk scaddins/AllLangResTarget_date.mk scaddins/Library_analysis.mk scaddins/Library_date.mk scaddins/Makefile scaddins/Module_scaddins.mk scaddins/prj scaddins/source sccomp/AllLangResTarget_solver.mk sccomp/Library_solver.mk sccomp/Makefile sccomp/Module_sccomp.mk sccomp/prj sccomp/source

Matus Kukan mkukan at kemper.freedesktop.org
Thu Jul 28 01:32:32 PDT 2011


 scaddins/AllLangResTarget_analysis.mk    |   47 ++
 scaddins/AllLangResTarget_date.mk        |   45 ++
 scaddins/Library_analysis.mk             |   57 ++
 scaddins/Library_date.mk                 |   54 ++
 scaddins/Makefile                        |   38 +
 scaddins/Module_scaddins.mk              |   37 +
 scaddins/prj/build.lst                   |    3 
 scaddins/prj/d.lst                       |   11 
 scaddins/prj/makefile.mk                 |   40 ++
 scaddins/source/analysis/analysisadd.idl |  594 -------------------------------
 scaddins/source/analysis/makefile.mk     |  138 -------
 scaddins/source/datefunc/dateadd.idl     |  118 ------
 scaddins/source/datefunc/datefunc.def    |    5 
 scaddins/source/datefunc/makefile.mk     |  129 ------
 scaddins/source/datefunc/msdev.mk        |  115 ------
 sccomp/AllLangResTarget_solver.mk        |   42 ++
 sccomp/Library_solver.mk                 |   55 ++
 sccomp/Makefile                          |   38 +
 sccomp/Module_sccomp.mk                  |   35 +
 sccomp/prj/build.lst                     |    3 
 sccomp/prj/d.lst                         |   10 
 sccomp/prj/makefile.mk                   |   40 ++
 sccomp/source/solver/makefile.mk         |   85 ----
 23 files changed, 530 insertions(+), 1209 deletions(-)

New commits:
commit 949561fec487a36cdff54ad3a0426443fe0d4ded
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Jul 27 21:32:35 2011 +0200

    convert scaddins to gbuild

diff --git a/scaddins/AllLangResTarget_analysis.mk b/scaddins/AllLangResTarget_analysis.mk
new file mode 100644
index 0000000..4bf542d
--- /dev/null
+++ b/scaddins/AllLangResTarget_analysis.mk
@@ -0,0 +1,47 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,analysis))
+
+$(eval $(call gb_AllLangResTarget_add_srs,analysis,\
+    scaddins/analysis \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,scaddins/analysis))
+
+$(eval $(call gb_SrsTarget_set_include,scaddins/analysis,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/scaddins/source/analysis) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,scaddins/analysis,\
+    scaddins/source/analysis/analysis.src \
+    scaddins/source/analysis/analysis_deffuncnames.src \
+    scaddins/source/analysis/analysis_funcnames.src \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/scaddins/AllLangResTarget_date.mk b/scaddins/AllLangResTarget_date.mk
new file mode 100644
index 0000000..b816ea7
--- /dev/null
+++ b/scaddins/AllLangResTarget_date.mk
@@ -0,0 +1,45 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,date))
+
+$(eval $(call gb_AllLangResTarget_add_srs,date,\
+    scaddins/date \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,scaddins/date))
+
+$(eval $(call gb_SrsTarget_set_include,scaddins/date,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/scaddins/source/datefunc) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,scaddins/date,\
+    scaddins/source/datefunc/datefunc.src \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk
new file mode 100644
index 0000000..21bf59c
--- /dev/null
+++ b/scaddins/Library_analysis.mk
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,analysis))
+
+$(eval $(call gb_Library_set_componentfile,analysis,scaddins/source/analysis/analysis))
+
+$(eval $(call gb_Library_set_include,analysis,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/scaddins/source/analysis) \
+	-I$(realpath $(WORKDIR)/UnoApiHeaders/offapi) \
+))
+
+$(eval $(call gb_Library_add_api,analysis,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,analysis,\
+	cppu \
+	cppuhelper \
+	sal \
+	tl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,analysis,\
+	scaddins/source/analysis/analysis \
+	scaddins/source/analysis/analysishelper \
+	scaddins/source/analysis/bessel \
+	scaddins/source/analysis/financial \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk
new file mode 100644
index 0000000..a7bc434
--- /dev/null
+++ b/scaddins/Library_date.mk
@@ -0,0 +1,54 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,date))
+
+$(eval $(call gb_Library_set_componentfile,date,scaddins/source/datefunc/date))
+
+$(eval $(call gb_Library_set_include,date,\
+    $$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/scaddins/source/datefunc) \
+	-I$(realpath $(WORKDIR)/UnoApiHeaders/offapi) \
+))
+
+$(eval $(call gb_Library_add_api,date,\
+    offapi \
+    udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,date,\
+	cppu \
+	cppuhelper \
+	sal \
+	tl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,date,\
+	scaddins/source/datefunc/datefunc \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/scaddins/Makefile b/scaddins/Makefile
new file mode 100644
index 0000000..5bedaf0
--- /dev/null
+++ b/scaddins/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scaddins/Module_scaddins.mk b/scaddins/Module_scaddins.mk
new file mode 100644
index 0000000..537a102
--- /dev/null
+++ b/scaddins/Module_scaddins.mk
@@ -0,0 +1,37 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,scaddins))
+
+$(eval $(call gb_Module_add_targets,scaddins,\
+    AllLangResTarget_analysis \
+    AllLangResTarget_date \
+    Library_analysis \
+    Library_date \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/scaddins/prj/build.lst b/scaddins/prj/build.lst
index 4d68ad4..e94a5a3 100644
--- a/scaddins/prj/build.lst
+++ b/scaddins/prj/build.lst
@@ -1,4 +1,3 @@
 ca	scaddins	: LIBXSLT:libxslt TRANSLATIONS:translations vcl NULL
 ca	scaddins								usr1	-	all	sc_mkout NULL
-ca	scaddins\source\datefunc				nmake	-	all	sc_dfunc NULL
-ca	scaddins\source\analysis				nmake	-	all	sc_analysis NULL
+ca	scaddins\prj				            nmake	-	all	sc_prj NULL
diff --git a/scaddins/prj/d.lst b/scaddins/prj/d.lst
index b85677f..e69de29 100644
--- a/scaddins/prj/d.lst
+++ b/scaddins/prj/d.lst
@@ -1,11 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
-..\%__SRC%\lib\lib*.so %_DEST%\lib
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin\*.bin
-..\%__SRC%\bin\*.res %_DEST%\bin\*.res
-..\%__SRC%\misc\analysis.component %_DEST%\xml\analysis.component
-..\%__SRC%\misc\date.component %_DEST%\xml\date.component
diff --git a/scaddins/prj/makefile.mk b/scaddins/prj/makefile.mk
new file mode 100644
index 0000000..bcb4970
--- /dev/null
+++ b/scaddins/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/scaddins/source/analysis/analysisadd.idl b/scaddins/source/analysis/analysisadd.idl
deleted file mode 100644
index 2ebfd53..0000000
--- a/scaddins/source/analysis/analysisadd.idl
+++ /dev/null
@@ -1,594 +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.
- *
- ************************************************************************/
-
-#ifndef __com_sun_star_sheet_NoConvergenceException_idl__
-#include <com/sun/star/sheet/NoConvergenceException.idl>
-#endif
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/sheet/LocalizedName.idl>
-
-module com
-{
-module sun
-{
-module star
-{
-module sheet
-{
-module addin
-{
-    interface XCompatibilityNames  : com::sun::star::uno::XInterface
-    {
-        /// getCompatibilityNames.
-        sequence< com::sun::star::sheet::LocalizedName > getCompatibilityNames ( [in] string aProgrammaticName );
-    };
-
-    /**
-    * Interface with analysis functions.
-    */
-    interface XAnalysis : com::sun::star::uno::XInterface
-    {
-        /// workday.
-        long getWorkday(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nStartDate, [in] long nDays, [in] any aHolidays )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// yearfrac.
-        double getYearfrac(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long StartDate, [in] long EndDate, [in] any Mode )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// edate.
-        long getEdate(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nStartDate, [in] long nNumOfMonths )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// weeknum.
-        long getWeeknum(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nStartDate, [in] long nMode )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// eomonth.
-        long getEomonth(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nStartDate, [in] long nMonths )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// networkdays.
-        long getNetworkdays(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long StartDate, [in] long EndDate, [in] any Holidays )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// iseven.
-        long getIseven( [in] long nValue )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// isodd.
-        long getIsodd( [in] long nValue )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// multinomial.
-        double getMultinomial(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] sequence< sequence< long > > aValList,
-                    [in] sequence< any > aOptVLst )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// seriessum.
-        double getSeriessum(
-                    [in] double X, [in] double N, [in] double M,
-                    [in] sequence< sequence< double > > CoeffList )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        // quotient.
-        double getQuotient( [in] double Num, [in] double Denum )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        // mround.
-        double getMround( [in] double Number, [in] double Multiple )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        // sqrtpi.
-        double getSqrtpi( [in] double Number )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        // randbetween.
-        double getRandbetween( [in] double Min, [in] double Max )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// gcd.
-        double getGcd(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] sequence< sequence< double > > FirstValList,
-                    [in] sequence< any > OptionalValList )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// lcm.
-        double getLcm(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] sequence< sequence< double > > FirstValList,
-                    [in] sequence< any > OptionalValList )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// besseli.
-        double getBesseli( [in] double Num, [in] long Order )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::sheet::NoConvergenceException );
-
-        /// besselj.
-        double getBesselj( [in] double Num, [in] long Order )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::sheet::NoConvergenceException );
-
-        /// besselk.
-        double getBesselk( [in] double Num, [in] long Order )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::sheet::NoConvergenceException );
-
-        /// bessely.
-        double getBessely( [in] double Num, [in] long Order )
-            raises( com::sun::star::lang::IllegalArgumentException,
-                    com::sun::star::sheet::NoConvergenceException );
-
-        /// bin2oct.
-        string getBin2Oct(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] string BinaryNum, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// bin2dec.
-        double getBin2Dec( [in] string BinaryNum )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// bin2hex.
-        string getBin2Hex(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] string BinaryNum, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oct2bin.
-        string getOct2Bin(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] string OctalNum, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oct2dec.
-        double getOct2Dec( [in] string OctalNum )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oct2hex.
-        string getOct2Hex(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] string OctalNum, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// dec2bin.
-        string getDec2Bin(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Value, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// dec2oct.
-        string getDec2Oct(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Value, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// dec2hex.
-        string getDec2Hex(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] double Value, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// hex2bin.
-        string getHex2Bin(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] string HexadecimalValue, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// hex2dec.
-        double getHex2Dec( [in] string HexadecimalValue )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// hex2oct.
-        string getHex2Oct(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] string HexadecimalValue, [in] any Places )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// delta.
-        long getDelta(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] double Num1, [in] any Num2 )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// erf.
-        double getErf(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] double LowerLimit, [in] any UpperLimit )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// erfc.
-        double getErfc( [in] double LowerLimit )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// gestep.
-        long getGestep(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] double Num, [in] any Step )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// factdouble.
-        double getFactdouble( [in] long Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imabs.
-        double getImabs( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imaginary.
-        double getImaginary( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// impower.
-        string getImpower( [in] string Num, [in] double Power )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imargument.
-        double getImargument( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imcos.
-        string getImcos( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imdiv.
-        string getImdiv( [in] string Num1, [in] string Num2 )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imexp.
-        string getImexp( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imconjugate.
-        string getImconjugate( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imln.
-        string getImln( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imlog10.
-        string getImlog10( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imlog2.
-        string getImlog2( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// improduct.
-        string getImproduct(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] sequence< sequence< string > > Num1,
-                    [in] sequence< any > NumberList )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imreal.
-        double getImreal( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imsin.
-        string getImsin( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imsub.
-        string getImsub( [in] string Num1, [in] string Num2 )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imsum.
-        string getImsum(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] sequence< sequence< string > > Num1,
-                    [in] sequence< any > OptNums )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// imsqrt.
-        string getImsqrt( [in] string Num )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// complex.
-        string getComplex( [in] double Real, [in] double Imaginary, [in] any Suffix )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// convert.
-        double getConvert( [in] double Value, [in] string FromUnit, [in] string ToUnit )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-
-        /// amordegrc.
-        double getAmordegrc(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] double Cost, [in] long Date, [in] long FirstPer, [in] double RestVal,
-                    [in] double Periode, [in] double Rate, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// amorlinc.
-        double getAmorlinc(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] double Cost, [in] long Date, [in] long FirstPer, [in] double RestVal,
-                    [in] double Periode, [in] double Rate, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// accrint.
-        double getAccrint(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Issue, [in] long FirstInterest, [in] long Settlement, [in] double Rate,
-                    [in] any Value, [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// accrintm.
-        double getAccrintm(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Issue, [in] long Settlement, [in] double Rate, [in] any Value, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// received.
-        double getReceived(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Investment, [in] double Discount,
-                    [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// disc.
-        double getDisc(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Price, [in] double Redemption,
-                    [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// duration.
-        double getDuration(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Coupon, [in] double Yield,
-                    [in] long Frequncy, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// effect.
-        double getEffect( [in] double Nomial, [in] long NumOfPeriods )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// cumprinc.
-        double getCumprinc(
-                    [in] double Rate, [in] long NumOfPeriods, [in] double Val, [in] long StartPeriode,
-                    [in] long EndPeriode, [in] long PayType )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// cumipmt.
-        double getCumipmt(
-                    [in] double Rate, [in] long NumOfPeriods, [in] double Val, [in] long StartPeriode,
-                    [in] long EndPeriode, [in] long PayType )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// price.
-        double getPrice(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Rate, [in] double Yield,
-                    [in] double Redemption, [in] long Frequncy, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// pricedisc.
-        double getPricedisc(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Discont, [in] double Redemption,
-                    [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// pricemat.
-        double getPricemat(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] long Issue, [in] double Rate, [in] double Yield,
-                    [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// mduration.
-        double getMduration(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Coupon, [in] double Yield,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// nominal.
-        double getNominal( [in] double Rate, [in] long NumOfPeriods )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// dollarfr.
-        double getDollarfr( [in] double DollarDecimal, [in] long Fraction )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// dollarde.
-        double getDollarde( [in] double DollarFractional, [in] long Fraction )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// yield.
-        double getYield(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Coupon, [in] double Price,
-                    [in] double Redemption, [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// yielddisc.
-        double getYielddisc(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Price,
-                    [in] double Redemption, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// yieldmat.
-        double getYieldmat(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] long Issue, [in] double Rate,
-                    [in] double Price, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// tbilleq.
-        double getTbilleq(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Discont )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// tbillprice.
-        double getTbillprice(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Discont )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// tbillyield.
-        double getTbillyield(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] double Price )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oddfprice.
-        double getOddfprice(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] long Issue, [in] long FirstCouponDate,
-                    [in] double Rate, [in] double Yield, [in] double Redemption,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oddfyield.
-        double getOddfyield(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] long Issue, [in] long FirstCouponDate,
-                    [in] double Rate, [in] double Price, [in] double Redemption,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oddlprice.
-        double getOddlprice(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] long LastInterest,
-                    [in] double Rate, [in] double Yield, [in] double Redemption,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// oddlyield.
-        double getOddlyield(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity, [in] long LastInterest,
-                    [in] double Rate, [in] double Price, [in] double Redemption,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// xirr.
-        double getXirr(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] sequence< sequence< double > > Values,
-                    [in] sequence< sequence< long > > Dates, [in] any Guess )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// xnpv.
-        double getXnpv(
-                    [in] double Rate,
-                    [in] sequence< sequence< double > > Values,
-                    [in] sequence< sequence< long > > Dates )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// intrate.
-        double getIntrate(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] double Investment, [in] double Redemption, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// coupncd.
-        double getCoupncd(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// coupdays.
-        double getCoupdays(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-
-        /// coupdaysnc.
-        double getCoupdaysnc(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// coupdaybs.
-        double getCoupdaybs(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// couppcd.
-        double getCouppcd(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// coupnum.
-        double getCoupnum(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long Settlement, [in] long Maturity,
-                    [in] long Frequency, [in] any Base )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// fvschedule.
-        double getFvschedule( [in] double Principal, [in] sequence< sequence< double > > Schedule )
-            raises( com::sun::star::lang::IllegalArgumentException );
-    };
-
-    service Analysis
-    {
-        // exported interfaces:
-        interface XCompatibilityNames;
-        interface XAnalysis;
-    };
-};
-};
-};
-};
-};
-
diff --git a/scaddins/source/analysis/makefile.mk b/scaddins/source/analysis/makefile.mk
deleted file mode 100644
index b1c49a9..0000000
--- a/scaddins/source/analysis/makefile.mk
+++ /dev/null
@@ -1,138 +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=scaddins
-
-TARGET=analysis
-
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-LIBTARGET=NO
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Types -------------------------------------
-
-UNOUCRRDB=$(SOLARBINDIR)$/types.rdb $(BIN)$/analysisadd.rdb
-UNOUCRDEP=$(UNOUCRRDB)
-
-UNOUCROUT=$(OUT)$/inc$/$(PRJNAME)$/$(TARGET)
-INCPRE+=$(UNOUCROUT)
-
-# --- Types -------------------------------------
-
-# comprehensive type info, so rdb needn't be installed
-NO_OFFUH=TRUE
-CPPUMAKERFLAGS*=-C
-
-UNOTYPES=\
-    com.sun.star.sheet.addin.XAnalysis \
-    com.sun.star.lang.XComponent \
-    com.sun.star.lang.XMultiServiceFactory \
-    com.sun.star.lang.XSingleComponentFactory \
-    com.sun.star.lang.XSingleServiceFactory \
-    com.sun.star.uno.TypeClass \
-    com.sun.star.uno.XInterface \
-    com.sun.star.registry.XImplementationRegistration \
-    com.sun.star.sheet.LocalizedName \
-    com.sun.star.sheet.XAddIn \
-    com.sun.star.sheet.XCompatibilityNames \
-    com.sun.star.lang.XServiceName \
-    com.sun.star.lang.XServiceInfo \
-    com.sun.star.lang.XTypeProvider \
-    com.sun.star.uno.XWeak \
-    com.sun.star.uno.XAggregation \
-    com.sun.star.uno.XComponentContext \
-    com.sun.star.util.Date \
-    com.sun.star.util.XNumberFormatter \
-    com.sun.star.util.XNumberFormatTypes \
-    com.sun.star.sheet.NoConvergenceException
-
-# --- Files -------------------------------------
-
-SLOFILES=\
-    $(SLO)$/analysis.obj		\
-    $(SLO)$/financial.obj		\
-    $(SLO)$/analysishelper.obj	\
-    $(SLO)$/bessel.obj
-
-ALLIDLFILES=\
-    analysisadd.idl
-
-SRS1NAME=$(TARGET)
-SRC1FILES =  \
-        analysis.src		\
-        analysis_funcnames.src	\
-        analysis_deffuncnames.src
-
-# --- Library -----------------------------------
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS= \
-        $(TOOLSLIB)			\
-        $(CPPUHELPERLIB)	\
-        $(CPPULIB)			\
-        $(SALLIB)
-
-SHL1DEPN=makefile.mk
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-# --- Resourcen ----------------------------------------------------
-
-RESLIB1LIST=\
-    $(SRS)$/analysis.srs
-
-RESLIB1NAME=analysis
-RESLIB1SRSFILES=\
-    $(RESLIB1LIST)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-$(BIN)$/analysisadd.rdb: $(ALLIDLFILES)
-    $(IDLC) -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $?
-    $(REGMERGE) $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)}
-    touch $@
-
-
-
-ALLTAR : $(MISC)/analysis.component
-
-$(MISC)/analysis.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        analysis.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt analysis.component
diff --git a/scaddins/source/datefunc/dateadd.idl b/scaddins/source/datefunc/dateadd.idl
deleted file mode 100644
index 626121a..0000000
--- a/scaddins/source/datefunc/dateadd.idl
+++ /dev/null
@@ -1,118 +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.
- *
-************************************************************************/
-
-
-#include <com/sun/star/uno/XInterface.idl>
-#include <com/sun/star/beans/XPropertySet.idl>
-#include <com/sun/star/sheet/LocalizedName.idl>
-
-module com
-{
-module sun
-{
-module star
-{
-module sheet
-{
-module addin
-{
-    interface XCompatibilityNames  : com::sun::star::uno::XInterface
-    {
-        /// @return a sequence with all localized names for a programmatic name
-        sequence< com::sun::star::sheet::LocalizedName > getCompatibilityNames ( [in] string aProgrammaticName );
-    };
-
-    /**
-     * Interface with date functions.
-     */
-    interface XDateFunctions : com::sun::star::uno::XInterface
-    {
-        /// calculates the number of weeks between two dates.
-        long getDiffWeeks(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nStartDate, [in] long nEndDate, [in] long nMode )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// calculates the number of months between two dates.
-        long getDiffMonths(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nStartDate, [in] long nEndDate, [in] long nMode )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// calculates the number of years between two dates.
-        long getDiffYears(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nStartDate, [in] long nEndDate, [in] long nMode )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// checks if a date is in a leap year.
-        long getIsLeapYear(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nDate )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// calculates the number of days in a month.
-        long getDaysInMonth(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nDate )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// calculates the number of days in a year.
-        long getDaysInYear(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nDate )
-            raises( com::sun::star::lang::IllegalArgumentException );
-
-        /// calculates the number of weeks in a year.
-        long getWeeksInYear(
-                    [in] com::sun::star::beans::XPropertySet xOptions,
-                    [in] long nDate )
-            raises( com::sun::star::lang::IllegalArgumentException );
-    };
-
-    /**
-     * Interface with miscellaneous functions.
-     */
-    interface XMiscFunctions : com::sun::star::uno::XInterface
-    {
-        /// Encrypts or decrypts a string using the ROT13 algorithm.
-        string getRot13( [in] string aSrcString )
-            raises( com::sun::star::lang::IllegalArgumentException );
-    };
-
-    service DateFunctions
-    {
-        // exported interfaces:
-        interface XDateFunctions;
-        interface XMiscFunctions;
-    };
-};
-};
-};
-};
-};
-
diff --git a/scaddins/source/datefunc/datefunc.def b/scaddins/source/datefunc/datefunc.def
deleted file mode 100644
index 8fbd938..0000000
--- a/scaddins/source/datefunc/datefunc.def
+++ /dev/null
@@ -1,5 +0,0 @@
-LIBRARY	  datefunc
-DESCRIPTION	'StarView 3.00 Uno BE Reflection data 551 '
-HEAPSIZE	  0
-EXPORTS
-component_getFactory
diff --git a/scaddins/source/datefunc/makefile.mk b/scaddins/source/datefunc/makefile.mk
deleted file mode 100644
index afb221b..0000000
--- a/scaddins/source/datefunc/makefile.mk
+++ /dev/null
@@ -1,129 +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=scaddins
-
-TARGET=date
-
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-LIBTARGET=NO
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Types -------------------------------------
-
-UNOUCRRDB=$(SOLARBINDIR)$/types.rdb $(BIN)$/dateadd.rdb
-UNOUCRDEP=$(UNOUCRRDB)
-
-UNOUCROUT=$(OUT)$/inc$/$(PRJNAME)$/$(TARGET)
-INCPRE+=$(UNOUCROUT)
-
-# --- Types -------------------------------------
-
-# comprehensive type info, so rdb needn't be installed
-NO_OFFUH=TRUE
-CPPUMAKERFLAGS*=-C
-
-UNOTYPES=\
-    com.sun.star.sheet.addin.XDateFunctions \
-    com.sun.star.sheet.addin.XMiscFunctions \
-    com.sun.star.lang.XComponent \
-    com.sun.star.lang.XMultiServiceFactory \
-    com.sun.star.lang.XSingleComponentFactory \
-    com.sun.star.lang.XSingleServiceFactory \
-    com.sun.star.uno.TypeClass \
-    com.sun.star.uno.XInterface \
-    com.sun.star.registry.XImplementationRegistration \
-    com.sun.star.sheet.XAddIn \
-    com.sun.star.sheet.XCompatibilityNames \
-    com.sun.star.lang.XServiceName \
-    com.sun.star.lang.XServiceInfo \
-    com.sun.star.lang.XTypeProvider \
-    com.sun.star.uno.XWeak \
-    com.sun.star.uno.XAggregation \
-    com.sun.star.uno.XComponentContext \
-    com.sun.star.util.Date
-
-# --- Files -------------------------------------
-
-SLOFILES=\
-    $(SLO)$/datefunc.obj
-
-ALLIDLFILES=\
-    dateadd.idl
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
-    datefunc.src
-
-# --- Library -----------------------------------
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1OBJS=$(SLOFILES)
-SHL1STDLIBS= \
-        $(TOOLSLIB)			\
-        $(CPPUHELPERLIB)	\
-        $(CPPULIB)			\
-        $(SALLIB)
-
-SHL1DEPN=makefile.mk
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-# --- Resourcen ----------------------------------------------------
-
-RESLIB1LIST=\
-    $(SRS)$/date.srs
-
-RESLIB1NAME=date
-RESLIB1SRSFILES=\
-    $(RESLIB1LIST)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-$(BIN)$/dateadd.rdb: $(ALLIDLFILES)
-    $(IDLC) -I$(PRJ) -I$(SOLARIDLDIR) -O$(BIN) $?
-    $(REGMERGE) $@ /UCR $(BIN)$/{$(?:f:s/.idl/.urd/)}
-    touch $@
-
-
-
-ALLTAR : $(MISC)/date.component
-
-$(MISC)/date.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        date.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt date.component
diff --git a/scaddins/source/datefunc/msdev.mk b/scaddins/source/datefunc/msdev.mk
deleted file mode 100644
index 3f99d2e..0000000
--- a/scaddins/source/datefunc/msdev.mk
+++ /dev/null
@@ -1,115 +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.
-#
-#*************************************************************************
-
-.SUFFIXES: .urd .idl
-
-# the root directory of the udk
-# also adjust include statements if this is changed
-ROOT=i:\udk100
-
-include i:\udk100\msdev\defines.mk
-
-# the project directory under runtime
-PROJECT=datefunc
-
-# the target of this makefile
-TARGET=$(BINOUT)\datefunc.dll
-
-CPPFLAGS = \
-    -I$(RUNTIME)\sal\inc		\
-    -I$(RUNTIME)\cppu\inc		\
-    -I$(RUNTIME)\cppuhelper\inc	\
-    -I$(RUNTIME)\stoc\inc		\
-    -I$(UNOHEADER_OUT)
-
-OBJS=$(OBJOUT)\datefunc.obj
-
-# flags and macros
-include i:\udk100\msdev\flags.mk
-
-URDS = $(URDOUT)\dateadd.urd
-
-CPPUMAKER_OPT=-C
-UNOHEADER_OUT=$(UNOHEADER_COM)
-
-# the rdb files
-RDBS=$(RDBOUT)\applicat.rdb $(RDBOUT)\dateadd.rdb
-
-UNOHEADER=\
-    $(UNOHEADER_OUT)\com\sun\star\lang\XComponent.hpp \
-    $(UNOHEADER_OUT)\com\sun\star\lang\XMultiServiceFactory.hpp \
-    $(UNOHEADER_OUT)\com\sun\star\lang\XSingleServiceFactory.hpp \
-    $(UNOHEADER_OUT)\com\sun\star\uno\TypeClass.hpp \
-    $(UNOHEADER_OUT)\com\sun\star\uno\XInterface.hpp \
-    $(UNOHEADER_OUT)\com\sun\star\registry\XImplementationRegistration.hpp \
-    $(UNOHEADER_OUT)\com\sun\star\sheet\XAddIn.hpp \
-    $(UNOHEADER_OUT)\com\sun\star\lang\XServiceName.hpp \
-    $(UNOHEADER_OUT)\com\sun\star\lang\XServiceInfo.hpp \
-    $(UNOHEADER_OUT)\com\sun\star\lang\XTypeProvider.hpp \
-    $(UNOHEADER_OUT)\com\sun\star\uno\XWeak.hpp \
-    $(UNOHEADER_OUT)\com\sun\star\uno\XAggregation.hpp \
-    $(UNOHEADER_OUT)\com\sun\star\util\Date.hpp \
-    $(UNOHEADER_OUT)\com\sun\star\sheet\addin\XDateFunctions.hpp
-
-$(UNOHEADER_OUT)\com\sun\star\sheet\addin\XDateFunctions.hpp: $(RDBS) $(CPPUMAKER) 
-    -$(MKDIR) $(@D)
-    $(CPPUMAKER) $(CPPUMAKER_OPT) -Tcom.sun.star.sheet.addin.XDateFunctions -B/UCR -O$(UNOHEADER_OUT) $(RDBS)
-
-$(UNOHEADER_OUT)\com\sun\star\sheet\XAddIn.hpp: $(RDBS) $(CPPUMAKER) 
-    -$(MKDIR) $(@D)
-    $(CPPUMAKER) $(CPPUMAKER_OPT) -Tcom.sun.star.sheet.XAddIn -B/UCR -O$(UNOHEADER_OUT) $(RDBS)
-
-$(UNOHEADER_OUT)\com\sun\star\lang\XServiceName.hpp: $(RDBS) $(CPPUMAKER) 
-    -$(MKDIR) $(@D)
-    $(CPPUMAKER) $(CPPUMAKER_OPT) -Tcom.sun.star.lang.XServiceName -B/UCR -O$(UNOHEADER_OUT) $(RDBS)
-
-$(UNOHEADER_OUT)\com\sun\star\util\Date.hpp: $(RDBS) $(CPPUMAKER) 
-    -$(MKDIR) $(@D)
-    $(CPPUMAKER) $(CPPUMAKER_OPT) -Tcom.sun.star.util.Date -B/UCR -O$(UNOHEADER_OUT) $(RDBS)
-
-include i:\udk100\msdev\genheader.mk
-
-$(URDS): $(UNOIDL)
-
-.idl{$(URDOUT)}.urd: 
-    -$(MKDIR) $(@D)
-    $(UNOIDL) -I$(ROOT)\idl $< -Burd -OH$(@D) 
-
-$(RDBOUT)\dateadd.rdb: $(URDS) $(REGMERGE)
-    -$(MKDIR) $(@D)
-    $(REGMERGE) $@ /UCR  $(URDS)
-
-.cxx{$(OBJOUT)}.obj: 
-    -$(MKDIR) $(@D)
-    $(CC) $(CCPPFLAGS) $(CCFLAGS) $< /Fo$@
-
-$(TARGET):  $(UNOHEADER) $(OBJS)
-    -$(MKDIR) $(@D)
-    $(LIB32) $(LFLAGS) /DLL $(OBJS) /out:$@ -def:datefunc.def $(LINKCPPUHELPER) $(LINKCPPU) $(LINKVOS) $(LINKSAL) msvcirtd.lib $(LIBS)
-
-
-
commit 2626eba174b94a872233b57eecac581051c1883e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Jul 27 19:49:27 2011 +0200

    Convert sccomp to gbuild

diff --git a/sccomp/AllLangResTarget_solver.mk b/sccomp/AllLangResTarget_solver.mk
new file mode 100644
index 0000000..98c3817
--- /dev/null
+++ b/sccomp/AllLangResTarget_solver.mk
@@ -0,0 +1,42 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,solver))
+
+$(eval $(call gb_AllLangResTarget_add_srs,solver,solver/res))
+$(eval $(call gb_SrsTarget_SrsTarget,solver/res))
+
+$(eval $(call gb_SrsTarget_set_include,solver/res,\
+	$$(INCLUDE) \
+    -I$(realpath $(SRCDIR)/sccomp/source/solver) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,solver/res,\
+	sccomp/source/solver/solver.src \
+))
+
+# vim: set noet sw=4:
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
new file mode 100644
index 0000000..586c237
--- /dev/null
+++ b/sccomp/Library_solver.mk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,solver))
+
+$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/solver))
+
+$(eval $(call gb_Library_set_include,solver,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/sccomp/source/solver) \
+))
+
+$(eval $(call gb_Library_add_api,solver,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,solver,\
+	comphelper \
+	cppu \
+	cppuhelper \
+	sal \
+	tl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_use_external,solver,lpsolve55))
+
+$(eval $(call gb_Library_add_exception_objects,solver,\
+	sccomp/source/solver/solver \
+))
diff --git a/sccomp/Makefile b/sccomp/Makefile
new file mode 100644
index 0000000..5bedaf0
--- /dev/null
+++ b/sccomp/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk
new file mode 100644
index 0000000..92d3113
--- /dev/null
+++ b/sccomp/Module_sccomp.mk
@@ -0,0 +1,35 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Module_Module,sccomp))
+
+$(eval $(call gb_Module_add_targets,sccomp,\
+	AllLangResTarget_solver \
+	Library_solver \
+))
+
+# vim: set noet sw=4:
diff --git a/sccomp/prj/build.lst b/sccomp/prj/build.lst
index 31d12ac..6f3bd23 100644
--- a/sccomp/prj/build.lst
+++ b/sccomp/prj/build.lst
@@ -1,4 +1,3 @@
 scc	sccomp	:    TRANSLATIONS:translations offapi comphelper LPSOLVE:lpsolve tools DESKTOP:rsc LIBXSLT:libxslt NULL
 scc	sccomp									usr1	-	all	scc_mkout NULL
-scc	sccomp\prj								get		-	all	scc_prj NULL
-scc	sccomp\source\solver					nmake	-	all	scc_solver NULL
+scc	sccomp\prj								nmake	-	all	scc_prj NULL
diff --git a/sccomp/prj/d.lst b/sccomp/prj/d.lst
index f618da8..e69de29 100644
--- a/sccomp/prj/d.lst
+++ b/sccomp/prj/d.lst
@@ -1,10 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
-..\%__SRC%\lib\lib*.so %_DEST%\lib
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin\*.bin
-..\%__SRC%\bin\*.res %_DEST%\bin\*.res
-..\%__SRC%\misc\solver.component %_DEST%\xml\solver.component
diff --git a/sccomp/prj/makefile.mk b/sccomp/prj/makefile.mk
new file mode 100644
index 0000000..d30ff8a
--- /dev/null
+++ b/sccomp/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+	cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/sccomp/source/solver/makefile.mk b/sccomp/source/solver/makefile.mk
deleted file mode 100644
index b1c65e8..0000000
--- a/sccomp/source/solver/makefile.mk
+++ /dev/null
@@ -1,85 +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=sccomp
-TARGET=solver
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-USE_DEFFILE=TRUE
-LIBTARGET=NO
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files -------------------------------------
-
-SLOFILES=$(SLO)$/solver.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES=solver.src
-
-# --- Library -----------------------------------
-
-SHL1TARGET=     $(TARGET)$(DLLPOSTFIX)
-
-SHL1OBJS=       $(SLOFILES)
-
-SHL1STDLIBS=    $(COMPHELPERLIB)    \
-                $(CPPUHELPERLIB)    \
-                $(CPPULIB)          \
-                $(SALLIB)           \
-                $(TOOLSLIB)         \
-                $(LPSOLVELIB)
-
-SHL1DEPN=       makefile.mk
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP= $(SOLARENV)/src/component.map
-DEF1NAME=       $(SHL1TARGET)
-
-# --- Resources --------------------------------
-
-RESLIB1LIST=$(SRS)$/solver.srs
-
-RESLIB1NAME=solver
-RESLIB1SRSFILES=$(RESLIB1LIST)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-
-ALLTAR : $(MISC)/solver.component
-
-$(MISC)/solver.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        solver.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt solver.component


More information about the Libreoffice-commits mailing list