Module_ooo.mk | 1
Repository.mk | 2
formula/AllLangResTarget_for.mk | 45 +++++++++
formula/AllLangResTarget_forui.mk | 48 +++++++++
formula/Library_for.mk | 69 ++++++++++++++
formula/Library_forui.mk | 70 ++++++++++++++
formula/Makefile | 32 ++++++
formula/Module_formula.mk | 35 +++++++
formula/Package_inc.mk | 41 ++++++++
formula/inc/makefile.mk | 43 --------
formula/prj/build.lst | 9 -
formula/prj/d.lst | 39 -------
formula/prj/makefile.mk | 44 ++++++++
formula/source/core/api/makefile.mk | 43 --------
formula/source/core/resource/makefile.mk | 44 --------
formula/source/ui/dlg/makefile.mk | 62 ------------
formula/source/ui/resource/ModuleHelper.cxx | 1
formula/source/ui/resource/makefile.mk | 45 ---------
formula/util/makefile.mk | 138 ----------------------------
postprocess/packcomponents/makefile.mk | 2
20 files changed, 390 insertions(+), 423 deletions(-)
New commits:
commit 8473efdcbc0ccd3801e8cfaf893e1e4473b0a6a3
Author: Damjan Jovanovic <dam...@apache.org>
Date: Thu Sep 24 14:37:53 2015 +0000
Migrate main/formula from dmake to gbuild.
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 32d80f2..01eaa54 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
unoxml \
xmloff \
vbahelper \
+ formula \
))
# vim: set noet ts=4 sw=4:
diff --git a/Repository.mk b/Repository.mk
index fa70f99..d436a52 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -50,6 +50,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
drawinglayer \
svgio \
editeng \
+ for \
+ forui \
fwe \
fwi \
fwk \
diff --git a/formula/source/core/api/makefile.mk
b/formula/AllLangResTarget_for.mk
similarity index 62%
rename from formula/source/core/api/makefile.mk
rename to formula/AllLangResTarget_for.mk
index 7924b68..babd2d7 100644
--- a/formula/source/core/api/makefile.mk
+++ b/formula/AllLangResTarget_for.mk
@@ -21,23 +21,25 @@
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=formula
-TARGET=core_api
-ENABLE_EXCEPTIONS=TRUE
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,for))
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_AllLangResTarget_set_reslocation,for,formula))
-# --- Files --------------------------------------------------------
+$(eval $(call gb_AllLangResTarget_add_srs,for,\
+ for/res \
+))
-SLOFILES= $(SLO)$/FormulaOpCodeMapperObj.obj \
- $(SLO)$/FormulaCompiler.obj \
- $(SLO)$/token.obj \
- $(SLO)$/services.obj
+$(eval $(call gb_SrsTarget_SrsTarget,for/res))
-# --- Targets ----------------------------------
+$(eval $(call gb_SrsTarget_set_include,for/res,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(WORKDIR)/inc/formula \
+ -I$(SRCDIR)/formula/source/core/inc \
+ -I$(SRCDIR)/formula/source/core/api \
+ -I$(SRCDIR)/formula/source/core/resource \
+))
-.INCLUDE : target.mk
+$(eval $(call gb_SrsTarget_add_files,for/res,\
+ formula/source/core/resource/core_resource.src \
+))
diff --git a/formula/AllLangResTarget_forui.mk
b/formula/AllLangResTarget_forui.mk
new file mode 100644
index 0000000..3d3a236
--- /dev/null
+++ b/formula/AllLangResTarget_forui.mk
@@ -0,0 +1,48 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,forui))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,forui,formula))
+
+$(eval $(call gb_AllLangResTarget_add_srs,forui,\
+ forui/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,forui/res))
+
+$(eval $(call gb_SrsTarget_set_include,forui/res,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(WORKDIR)/inc/formula \
+ -I$(SRCDIR)/formula/inc \
+ -I$(SRCDIR)/formula/inc/formula \
+ -I$(SRCDIR)/formula/source/ui/inc \
+ -I$(SRCDIR)/formula/source/ui/dlg \
+ -I$(SRCDIR)/formula/source/ui/resource \
+))
+
+$(eval $(call gb_SrsTarget_add_files,forui/res,\
+ formula/source/ui/dlg/formdlgs.src \
+ formula/source/ui/dlg/parawin.src \
+))
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
new file mode 100644
index 0000000..86a870b
--- /dev/null
+++ b/formula/Library_for.mk
@@ -0,0 +1,69 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,for))
+
+$(eval $(call gb_Library_add_package_headers,for,formula_inc))
+
+$(eval $(call
gb_Library_add_precompiled_header,for,$(SRCDIR)/formula/inc/pch/precompiled_formula))
+
+$(eval $(call gb_Library_set_componentfile,for,formula/util/for))
+
+$(eval $(call gb_Library_set_include,for,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/formula/inc \
+ -I$(SRCDIR)/formula/inc/pch \
+ -I$(SRCDIR)/formula/source/core/inc \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,for,\
+ $$(DEFS) \
+ -DFORMULA_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,for,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ stl \
+ svl \
+ svt \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,for,\
+ formula/source/core/api/FormulaCompiler \
+ formula/source/core/api/FormulaOpCodeMapperObj \
+ formula/source/core/api/services \
+ formula/source/core/api/token \
+ formula/source/core/resource/core_resource \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
new file mode 100644
index 0000000..8d6328c
--- /dev/null
+++ b/formula/Library_forui.mk
@@ -0,0 +1,70 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,forui))
+
+$(eval $(call gb_Library_add_package_headers,forui,formula_inc))
+
+$(eval $(call
gb_Library_add_precompiled_header,forui,$(SRCDIR)/formula/inc/pch/precompiled_formula))
+
+$(eval $(call gb_Library_set_include,forui,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/formula/inc \
+ -I$(SRCDIR)/formula/inc/pch \
+ -I$(SRCDIR)/formula/source/ui/inc \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,forui,\
+ $$(DEFS) \
+ -DFORMULA_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,forui,\
+ cppu \
+ cppuhelper \
+ for \
+ sal \
+ sfx \
+ stl \
+ svl \
+ svt \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,forui,\
+ formula/source/ui/dlg/formula \
+ formula/source/ui/dlg/FormulaHelper \
+ formula/source/ui/dlg/parawin \
+ formula/source/ui/dlg/funcutl \
+ formula/source/ui/dlg/funcpage \
+ formula/source/ui/dlg/structpg \
+ formula/source/ui/resource/ModuleHelper \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/formula/source/ui/resource/makefile.mk b/formula/Makefile
similarity index 67%
rename from formula/source/ui/resource/makefile.mk
rename to formula/Makefile
index 94c18f7..c1d144c 100644
--- a/formula/source/ui/resource/makefile.mk
+++ b/formula/Makefile
@@ -19,27 +19,14 @@
#
#**************************************************************
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=formula
-TARGET=ui_resource
-ENABLE_EXCEPTIONS=TRUE
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-#SRS1NAME=ui_res
-#SRC1FILES= \
-# ui_resource.src
-
-
-SLOFILES= $(SLO)$/ModuleHelper.obj \
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/formula/source/core/resource/makefile.mk
b/formula/Module_formula.mk
similarity index 68%
rename from formula/source/core/resource/makefile.mk
rename to formula/Module_formula.mk
index 1b86a59..d678428 100644
--- a/formula/source/core/resource/makefile.mk
+++ b/formula/Module_formula.mk
@@ -21,24 +21,15 @@
-PRJ=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=formula
-TARGET=core_resource
+$(eval $(call gb_Module_Module,formula))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Module_add_targets,formula,\
+ AllLangResTarget_for \
+ AllLangResTarget_forui \
+ Library_for \
+ Library_forui \
+ Package_inc \
+))
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-# --- Files --------------------------------------------------------
-
-SRS1NAME=core_strings
-SRC1FILES= \
- core_resource.src
-
-SLOFILES= $(SLO)$/core_resource.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/formula/Package_inc.mk b/formula/Package_inc.mk
new file mode 100644
index 0000000..8ad5d30
--- /dev/null
+++ b/formula/Package_inc.mk
@@ -0,0 +1,41 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,formula_inc,$(SRCDIR)/formula/inc))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/ExternalReferenceHelper.hxx,formula/ExternalReferenceHelper.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/FormulaCompiler.hxx,formula/FormulaCompiler.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/FormulaOpCodeMapperObj.hxx,formula/FormulaOpCodeMapperObj.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/IControlReferenceHandler.hxx,formula/IControlReferenceHandler.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/IFunctionDescription.hxx,formula/IFunctionDescription.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/compiler.hrc,formula/compiler.hrc))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/errorcodes.hxx,formula/errorcodes.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/formdata.hxx,formula/formdata.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/formula.hxx,formula/formula.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/formuladllapi.h,formula/formuladllapi.h))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/formulahelper.hxx,formula/formulahelper.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/funcutl.hxx,formula/funcutl.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/grammar.hxx,formula/grammar.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/intruref.hxx,formula/intruref.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/opcode.hxx,formula/opcode.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/token.hxx,formula/token.hxx))
+$(eval $(call
gb_Package_add_file,formula_inc,inc/formula/tokenarray.hxx,formula/tokenarray.hxx))
diff --git a/formula/prj/build.lst b/formula/prj/build.lst
index 109a798..126e045 100644
--- a/formula/prj/build.lst
+++ b/formula/prj/build.lst
@@ -1,9 +1,2 @@
fml formula : BOOST:boost LIBXSLT:libxslt comphelper svx NULL
-fml formula usr1 -
all fml_mkout NULL
-fml formula\inc nmake -
all fml_inc NULL
-fml formula\source\core\api nmake -
all fml_api fml_inc NULL
-fml formula\source\core\resource nmake -
all fml_core_res fml_inc NULL
-fml formula\source\ui\resource nmake -
all fml_ui_res fml_inc NULL
-fml formula\source\ui\dlg nmake -
all fml_uidlg fml_inc NULL
-fml formula\util nmake -
all fml_util fml_uidlg fml_core_res fml_ui_res fml_api NULL
-
+fml formula\prj nmake -
all fml_prj NULL
diff --git a/formula/prj/d.lst b/formula/prj/d.lst
index b662b66..e69de29 100644
--- a/formula/prj/d.lst
+++ b/formula/prj/d.lst
@@ -1,39 +0,0 @@
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-
-dos: sh -c "if test %OS% = MACOSX; then create-bundle
%_DEST%\lib%_EXT%\*.dylib; fi"
-
-# Libraries
-..\%__SRC%\bin\for*.dll %_DEST%\bin%_EXT%\for*.dll
-..\%__SRC%\lib\libfor*.so %_DEST%\lib%_EXT%\libfor*.so
-..\%__SRC%\lib\ifor*.lib %_DEST%\lib%_EXT%\ifor*.lib
-..\%__SRC%\lib\for*.lib %_DEST%\lib%_EXT%\for*.lib
-..\%__SRC%\lib\libfor*.dylib %_DEST%\lib%_EXT%\libfor*.dylib
-
-# Resources
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-
-mkdir: %_DEST%\inc%_EXT%\formula
-..\inc\formula\formdata.hxx %_DEST%\inc%_EXT%\formula\formdata.hxx
-..\inc\formula\formula.hxx %_DEST%\inc%_EXT%\formula\formula.hxx
-..\inc\formula\formulahelper.hxx %_DEST%\inc%_EXT%\formula\formulahelper.hxx
-..\inc\formula\funcutl.hxx %_DEST%\inc%_EXT%\formula\funcutl.hxx
-..\inc\formula\IControlReferenceHandler.hxx
%_DEST%\inc%_EXT%\formula\IControlReferenceHandler.hxx
-..\inc\formula\IFunctionDescription.hxx
%_DEST%\inc%_EXT%\formula\IFunctionDescription.hxx
-..\inc\formula\ExternalReferenceHelper.hxx
%_DEST%\inc%_EXT%\formula\ExternalReferenceHelper.hxx
-..\inc\formula\formuladllapi.h %_DEST%\inc%_EXT%\formula\formuladllapi.h
-..\inc\formula\opcode.hxx %_DEST%\inc%_EXT%\formula\opcode.hxx
-..\inc\formula\grammar.hxx %_DEST%\inc%_EXT%\formula\grammar.hxx
-..\inc\formula\FormulaCompiler.hxx
%_DEST%\inc%_EXT%\formula\FormulaCompiler.hxx
-..\inc\formula\FormulaOpCodeMapperObj.hxx
%_DEST%\inc%_EXT%\formula\FormulaOpCodeMapperObj.hxx
-..\inc\formula\compiler.hrc %_DEST%\inc%_EXT%\formula\compiler.hrc
-..\inc\formula\token.hxx %_DEST%\inc%_EXT%\formula\token.hxx
-..\inc\formula\tokenarray.hxx %_DEST%\inc%_EXT%\formula\tokenarray.hxx
-..\inc\formula\errorcodes.hxx %_DEST%\inc%_EXT%\formula\errorcodes.hxx
-..\inc\formula\intruref.hxx %_DEST%\inc%_EXT%\formula\intruref.hxx
-
-
-
-
-
-..\%__SRC%\misc\for.component %_DEST%\xml%_EXT%\for.component
diff --git a/formula/inc/makefile.mk b/formula/prj/makefile.mk
similarity index 69%
rename from formula/inc/makefile.mk
rename to formula/prj/makefile.mk
index 835a318..c62c6a6 100644
--- a/formula/inc/makefile.mk
+++ b/formula/prj/makefile.mk
@@ -20,24 +20,25 @@
#**************************************************************
-PRJ=..
-
-PRJNAME=formula
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
$(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/formula/source/ui/dlg/makefile.mk
b/formula/source/ui/dlg/makefile.mk
deleted file mode 100644
index 1cd6f07..0000000
--- a/formula/source/ui/dlg/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..$/..
-
-PRJNAME=formula
-TARGET=uidlg
-IMGLST_SRS=$(SRS)$/$(TARGET).srs
-BMP_IN=$(PRJ)$/res
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files -------------------------------------
-
-# ... resource files ............................
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- formdlgs.src \
- parawin.src
-
-# ... object files ............................
-
-EXCEPTIONSFILES= \
- $(SLO)$/formula.obj \
- $(SLO)$/FormulaHelper.obj \
- $(SLO)$/parawin.obj \
- $(SLO)$/funcutl.obj \
- $(SLO)$/funcpage.obj \
- $(SLO)$/structpg.obj
-
-SLOFILES= \
- $(EXCEPTIONSFILES)
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/formula/source/ui/resource/ModuleHelper.cxx
b/formula/source/ui/resource/ModuleHelper.cxx
index 161ccc4..287d2ed 100644
--- a/formula/source/ui/resource/ModuleHelper.cxx
+++ b/formula/source/ui/resource/ModuleHelper.cxx
@@ -20,6 +20,7 @@
*************************************************************/
+#include "precompiled_formula.hxx"
#include "ModuleHelper.hxx"
#include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk
deleted file mode 100644
index 03fb3f0..0000000
--- a/formula/util/makefile.mk
+++ /dev/null
@@ -1,138 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..
-PRJNAME=formula
-TARGET=for
-TARGET2=forui
-USE_DEFFILE=TRUE
-GEN_HID=TRUE
-GEN_HID_OTHER=TRUE
-
-# USE_LDUMP2=TRUE
-# --- Settings ----------------------------------
-.INCLUDE : settings.mk
-
-
-# --- formula core (for) -----------------------------------
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1FILES=\
- $(SLB)$/core_resource.lib \
- $(SLB)$/core_api.lib
-
-SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(TOOLSLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(UNOTOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(VCLLIB) \
- $(SALLIB)
-
-SHL1IMPLIB=i$(TARGET)
-SHL1USE_EXPORTS=name
-SHL1LIBS=$(LIB1TARGET)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEFLIB1NAME=$(TARGET)
-
-# --- .res file ----------------------------------------------------------
-
-RES1FILELIST=\
- $(SRS)$/core_strings.srs
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=$(RES1FILELIST)
-
-
-# --- formula UI core (forui) -----------------------------------
-LIB2TARGET=$(SLB)$/$(TARGET2).lib
-LIB2FILES=\
- $(SLB)$/uidlg.lib \
- $(SLB)$/ui_resource.lib
-
-SHL2TARGET=$(TARGET2)$(DLLPOSTFIX)
-
-SHL2STDLIBS= \
- $(SFXLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(VCLLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(CPPULIB) \
- $(SO2LIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB)
-
-.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
-SHL2STDLIBS+= \
- -lfor$(DLLPOSTFIX)
-SHL2DEPN=$(SHL1TARGETN)
-.ELSE
-SHL2STDLIBS+= \
- $(LB)$/ifor.lib
-SHL2DEPN=$(LB)$/i$(TARGET).lib
-.ENDIF
-
-
-SHL2IMPLIB=i$(TARGET2)
-SHL2LIBS=$(LIB2TARGET)
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-DEF2NAME=$(SHL2TARGET)
-.IF "$(GUI)"=="OS2"
-DEFLIB2NAME=$(TARGET2)
-.ENDIF
-
-SHL2USE_EXPORTS=name
-
-# --- .res file ----------------------------------------------------------
-
-RES2FILELIST=\
- $(SRS)$/uidlg.srs
-
-
-RESLIB2NAME=$(TARGET2)
-RESLIB2IMAGES=$(PRJ)$/res
-RESLIB2SRSFILES=$(RES2FILELIST)
-
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/for.component
-
-$(MISC)/for.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- for.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt for.component
diff --git a/postprocess/packcomponents/makefile.mk
b/postprocess/packcomponents/makefile.mk
index 37657c3..9c4dfe1 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -71,6 +71,7 @@ my_components = \
component/comphelper/util/comphelp \
component/cui/util/cui \
component/drawinglayer/drawinglayer \
+ component/formula/util/for \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
@@ -116,7 +117,6 @@ my_components = \
filterconfig1 \
flash \
flat \
- for \
fpicker \
fps_office \
frm \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
