[Libreoffice-commits] .: formula/AllLangResTarget_for.mk formula/AllLangResTarget_forui.mk formula/inc formula/Library_for.mk formula/Library_forui.mk formula/Makefile formula/Module_formula.mk formula/Package_inc.mk formula/prj formula/source formula/util
David Tardon
dtardon at kemper.freedesktop.org
Thu Apr 21 12:02:46 PDT 2011
formula/AllLangResTarget_for.mk | 48 ++++++++++
formula/AllLangResTarget_forui.mk | 50 ++++++++++
formula/Library_for.mk | 72 +++++++++++++++
formula/Library_forui.mk | 70 ++++++++++++++
formula/Makefile | 38 ++++++++
formula/Module_formula.mk | 38 ++++++++
formula/Package_inc.mk | 47 +++++++++
formula/inc/makefile.mk | 47 ---------
formula/prj/build.lst | 8 -
formula/prj/d.lst | 37 -------
formula/prj/makefile.mk | 40 ++++++++
formula/source/core/api/makefile.mk | 47 ---------
formula/source/core/resource/makefile.mk | 49 ----------
formula/source/ui/dlg/makefile.mk | 66 --------------
formula/source/ui/resource/makefile.mk | 45 ---------
formula/util/makefile.mk | 146 -------------------------------
formula/util/makefile.pmk | 42 --------
17 files changed, 404 insertions(+), 486 deletions(-)
New commits:
commit 6987542f3017b81594864b059fa77aeaec542bf6
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 20 12:27:27 2011 +0200
gbuildize formula
diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk
new file mode 100644
index 0000000..325f911
--- /dev/null
+++ b/formula/AllLangResTarget_for.mk
@@ -0,0 +1,48 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,for))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,for,formula))
+
+$(eval $(call gb_AllLangResTarget_add_srs,for,\
+ formula/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,formula/res))
+
+$(eval $(call gb_SrsTarget_set_include,formula/res,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/formula/source/core/inc) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,formula/res,\
+ formula/source/core/resource/core_resource.src \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/formula/AllLangResTarget_forui.mk b/formula/AllLangResTarget_forui.mk
new file mode 100644
index 0000000..3053ee6
--- /dev/null
+++ b/formula/AllLangResTarget_forui.mk
@@ -0,0 +1,50 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,forui))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,forui,formula))
+
+$(eval $(call gb_AllLangResTarget_add_srs,forui,\
+ formula/ui \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,formula/ui))
+
+$(eval $(call gb_SrsTarget_set_include,formula/ui,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/formula/inc) \
+ -I$(realpath $(SRCDIR)/formula/source/ui/inc) \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,formula/ui,\
+ formula/source/ui/dlg/formdlgs.src \
+ formula/source/ui/dlg/parawin.src \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
new file mode 100644
index 0000000..f1ac2c8
--- /dev/null
+++ b/formula/Library_for.mk
@@ -0,0 +1,72 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(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_include,for,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/formula/inc/pch) \
+ -I$(realpath $(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 \
+ svl \
+ svt \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_componentfile,for,formula/util/for))
+
+$(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 ts=4 sw=4:
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
new file mode 100644
index 0000000..0b77c70
--- /dev/null
+++ b/formula/Library_forui.mk
@@ -0,0 +1,70 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,forui))
+
+$(eval $(call gb_Library_add_precompiled_header,forui,$(SRCDIR)/formula/inc/pch/precompiled_formula))
+
+$(eval $(call gb_Library_set_include,forui,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/formula/inc) \
+ -I$(realpath $(SRCDIR)/formula/inc/pch) \
+ -I$(realpath $(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 \
+ 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/funcpage \
+ formula/source/ui/dlg/funcutl \
+ formula/source/ui/dlg/parawin \
+ formula/source/ui/dlg/structpg \
+ formula/source/ui/resource/ModuleHelper \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/formula/Makefile b/formula/Makefile
new file mode 100644
index 0000000..c898975
--- /dev/null
+++ b/formula/Makefile
@@ -0,0 +1,38 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+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/formula/Module_formula.mk b/formula/Module_formula.mk
new file mode 100644
index 0000000..0ce73ce
--- /dev/null
+++ b/formula/Module_formula.mk
@@ -0,0 +1,38 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,formula))
+
+$(eval $(call gb_Module_add_targets,formula,\
+ AllLangResTarget_for \
+ AllLangResTarget_forui \
+ Library_for \
+ Library_forui \
+ Package_inc \
+))
+
+# vim: set noet ts=4 sw=4:
diff --git a/formula/Package_inc.mk b/formula/Package_inc.mk
new file mode 100644
index 0000000..1fc717f
--- /dev/null
+++ b/formula/Package_inc.mk
@@ -0,0 +1,47 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,formula_inc,$(SRCDIR)/formula/inc/formula))
+
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/compiler.hrc,compiler.hrc))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/errorcodes.hxx,errorcodes.hxx))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/ExternalReferenceHelper.hxx,ExternalReferenceHelper.hxx))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/formdata.hxx,formdata.hxx))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/FormulaCompiler.hxx,FormulaCompiler.hxx))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/formuladllapi.h,formuladllapi.h))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/formulahelper.hxx,formulahelper.hxx))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/formula.hxx,formula.hxx))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/FormulaOpCodeMapperObj.hxx,FormulaOpCodeMapperObj.hxx))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/funcutl.hxx,funcutl.hxx))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/grammar.hxx,grammar.hxx))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/IControlReferenceHandler.hxx,IControlReferenceHandler.hxx))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/IFunctionDescription.hxx,IFunctionDescription.hxx))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/opcode.hxx,opcode.hxx))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/tokenarray.hxx,tokenarray.hxx))
+$(eval $(call gb_Package_add_file,formula_inc,inc/formula/token.hxx,token.hxx))
+
+# vim: set noet ts=4 sw=4:
diff --git a/formula/inc/makefile.mk b/formula/inc/makefile.mk
deleted file mode 100755
index dfe7226..0000000
--- a/formula/inc/makefile.mk
+++ /dev/null
@@ -1,47 +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=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)"!=""
-
diff --git a/formula/prj/build.lst b/formula/prj/build.lst
index 109a798..aa511f7 100644
--- a/formula/prj/build.lst
+++ b/formula/prj/build.lst
@@ -1,9 +1,3 @@
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 0fe5a1f..e69de29 100644
--- a/formula/prj/d.lst
+++ b/formula/prj/d.lst
@@ -1,37 +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\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
-
-
-
-
-
-..\%__SRC%\misc\for.component %_DEST%\xml%_EXT%\for.component
diff --git a/formula/prj/makefile.mk b/formula/prj/makefile.mk
new file mode 100755
index 0000000..e312a7c
--- /dev/null
+++ b/formula/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/formula/source/core/api/makefile.mk b/formula/source/core/api/makefile.mk
deleted file mode 100755
index a99f918..0000000
--- a/formula/source/core/api/makefile.mk
+++ /dev/null
@@ -1,47 +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=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=formula
-TARGET=core_api
-ENABLE_EXCEPTIONS=TRUE
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/FormulaOpCodeMapperObj.obj \
- $(SLO)$/FormulaCompiler.obj \
- $(SLO)$/token.obj \
- $(SLO)$/services.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/formula/source/core/resource/makefile.mk b/formula/source/core/resource/makefile.mk
deleted file mode 100755
index 96e2dfd..0000000
--- a/formula/source/core/resource/makefile.mk
+++ /dev/null
@@ -1,49 +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=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=formula
-TARGET=core_resource
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=core_strings
-SRC1FILES= \
- core_resource.src
-
-SLOFILES= $(EXCEPTIONSFILES)
-EXCEPTIONSFILES= $(SLO)$/core_resource.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/formula/source/ui/dlg/makefile.mk b/formula/source/ui/dlg/makefile.mk
deleted file mode 100755
index 688e169..0000000
--- a/formula/source/ui/dlg/makefile.mk
+++ /dev/null
@@ -1,66 +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=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/makefile.mk b/formula/source/ui/resource/makefile.mk
deleted file mode 100755
index fd6a535..0000000
--- a/formula/source/ui/resource/makefile.mk
+++ /dev/null
@@ -1,45 +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=..$/..$/..
-PRJINC=$(PRJ)$/source
-PRJNAME=formula
-TARGET=ui_resource
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(SLO)$/ModuleHelper.obj \
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk
deleted file mode 100755
index 3c6f91f..0000000
--- a/formula/util/makefile.mk
+++ /dev/null
@@ -1,146 +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=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)"=="OS2"
-SHL2STDLIBS+= \
- $(LB)$/ifor.lib
-SHL2DEPN=$(LB)$/i$(TARGET).lib
-.ELIF "$(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/formula/util/makefile.pmk b/formula/util/makefile.pmk
deleted file mode 100755
index db2375e..0000000
--- a/formula/util/makefile.pmk
+++ /dev/null
@@ -1,42 +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.
-#
-#*************************************************************************
-
-# define FORMULA_DLLIMPLEMENTATION (see @ dllapi.h)
-CDEFS += -DFORMULA_DLLIMPLEMENTATION
-
-# set default symbol visibility / scope to hidden
-.IF "$(COMNAME)" == "gcc3"
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGS += -fvisibility=hidden
-.ENDIF # HAVE_GCC_VISIBILITY_FEATURE
-.ENDIF # gcc3
-
-.IF "$(COMNAME)" == "sunpro5"
-.IF "$(CCNUMVER)" >= "00050005"
-CFLAGS += -xldscope=hidden
-.ENDIF # 5.5
-.ENDIF # sunpro5
More information about the Libreoffice-commits
mailing list