From 8d09e4a92cc3015ad6f1576067d19bc7368cc6e3 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 25 Jan 2011 08:56:46 +0100 Subject: CWS gnumake3: convert editeng module to gbuild --- editeng/Library_editeng.mk | 186 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) create mode 100755 editeng/Library_editeng.mk (limited to 'editeng/Library_editeng.mk') diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk new file mode 100755 index 000000000000..ec60e1248dc2 --- /dev/null +++ b/editeng/Library_editeng.mk @@ -0,0 +1,186 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,editeng)) + +$(eval $(call gb_Library_add_package_headers,editeng,editeng_inc)) + +$(eval $(call gb_Library_add_precompiled_header,editeng,$(SRCDIR)/editeng/inc/pch/precompiled_editeng)) + +# in case UNO services are exported: declare location of component file +#$(eval $(call gb_Library_set_componentfile,editeng,editeng/COMPONENT_FILE)) + +# add any additional include paths for this library here +$(eval $(call gb_Library_set_include,editeng,\ + $$(INCLUDE) \ + -I$(SRCDIR)/editeng/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,editeng,\ + $$(DEFS) \ + -DEDITENG_DLLIMPLEMENTATION \ +)) + +ifneq ($(strip $(EDITDEBUG)),) +$(eval $(call gb_Library_set_defs,editeng,\ + $$(DEFS) \ + -DEDITDEBUG \ +)) +endif + +$(eval $(call gb_Library_add_exception_objects,editeng,\ + editeng/inc/pch/precompiled_editeng \ + editeng/source/accessibility/AccessibleComponentBase \ + editeng/source/accessibility/AccessibleContextBase \ + editeng/source/accessibility/AccessibleEditableTextPara \ + editeng/source/accessibility/AccessibleHyperlink \ + editeng/source/accessibility/AccessibleImageBullet \ + editeng/source/accessibility/AccessibleParaManager \ + editeng/source/accessibility/AccessibleSelectionBase \ + editeng/source/accessibility/AccessibleStaticTextBase \ + editeng/source/accessibility/AccessibleStringWrap \ + editeng/source/editeng/editattr \ + editeng/source/editeng/editdbg \ + editeng/source/editeng/editdoc \ + editeng/source/editeng/editdoc2 \ + editeng/source/editeng/editeng \ + editeng/source/editeng/editobj \ + editeng/source/editeng/editsel \ + editeng/source/editeng/editundo \ + editeng/source/editeng/editview \ + editeng/source/editeng/edtspell \ + editeng/source/editeng/eehtml \ + editeng/source/editeng/eeng_pch \ + editeng/source/editeng/eeobj \ + editeng/source/editeng/eerdll \ + editeng/source/editeng/eertfpar \ + editeng/source/editeng/impedit \ + editeng/source/editeng/impedit2 \ + editeng/source/editeng/impedit3 \ + editeng/source/editeng/impedit4 \ + editeng/source/editeng/impedit5 \ + editeng/source/editeng/textconv \ + editeng/source/items/bulitem \ + editeng/source/items/charhiddenitem \ + editeng/source/items/flditem \ + editeng/source/items/frmitems \ + editeng/source/items/itemtype \ + editeng/source/items/numitem \ + editeng/source/items/optitems \ + editeng/source/items/paperinf \ + editeng/source/items/paraitem \ + editeng/source/items/svdfield \ + editeng/source/items/svxfont \ + editeng/source/items/textitem \ + editeng/source/items/writingmodeitem \ + editeng/source/items/xmlcnitm \ + editeng/source/misc/acorrcfg \ + editeng/source/misc/edtdlg \ + editeng/source/misc/forbiddencharacterstable \ + editeng/source/misc/hangulhanja \ + editeng/source/misc/splwrap \ + editeng/source/misc/svxacorr \ + editeng/source/misc/SvXMLAutoCorrectExport \ + editeng/source/misc/SvXMLAutoCorrectImport \ + editeng/source/misc/swafopt \ + editeng/source/misc/txtrange \ + editeng/source/misc/unolingu \ + editeng/source/outliner/outleeng \ + editeng/source/outliner/outlin2 \ + editeng/source/outliner/outliner \ + editeng/source/outliner/outlobj \ + editeng/source/outliner/outlundo \ + editeng/source/outliner/outlvw \ + editeng/source/outliner/outl_pch \ + editeng/source/outliner/paralist \ + editeng/source/rtf/rtfgrf \ + editeng/source/rtf/rtfitem \ + editeng/source/rtf/svxrtf \ + editeng/source/uno/unoedhlp \ + editeng/source/uno/unoedprx \ + editeng/source/uno/unoedsrc \ + editeng/source/uno/unofdesc \ + editeng/source/uno/unofield \ + editeng/source/uno/UnoForbiddenCharsTable \ + editeng/source/uno/unofored \ + editeng/source/uno/unoforou \ + editeng/source/uno/unoipset \ + editeng/source/uno/unonrule \ + editeng/source/uno/unopracc \ + editeng/source/uno/unotext \ + editeng/source/uno/unotext2 \ + editeng/source/uno/unoviwed \ + editeng/source/uno/unoviwou \ + editeng/source/xml/xmltxtexp \ + editeng/source/xml/xmltxtimp \ +)) + +# add libraries to be linked to editeng; again these names need to be given as +# specified in Repository.mk +$(eval $(call gb_Library_add_linked_libs,editeng,\ + xo \ + basegfx \ + lng \ + svt \ + tk \ + vcl \ + svl \ + stl \ + sot \ + utl \ + tl \ + comphelper \ + ucbhelper \ + cppuhelper \ + cppu \ + vos3 \ + sal \ + icuuc \ + i18nisolang1 \ + i18npaper \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,editeng,\ + dl \ + m \ + pthread \ +)) +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,editeng,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ +)) +endif + +# vim: set noet sw=4 ts=4: + -- cgit From 80fa6e0c97fc50fee714f3a7dc75d11d2180877b Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 25 Jan 2011 18:19:55 +0100 Subject: CWS gnumake3: fix license headers --- editeng/Library_editeng.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'editeng/Library_editeng.mk') diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index ec60e1248dc2..0bcd965f8c7c 100755 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -14,12 +14,12 @@ # # 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 +# 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 +# version 3 along with OpenOffice.org. If not, see # # for a copy of the LGPLv3 License. # -- cgit From 26b3715705944b13fcd4e275e8e730035a7b4d15 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 27 Jan 2011 09:47:18 +0100 Subject: CWS gnumake2: use temp files for long command lines; missing include path in editeng --- editeng/Library_editeng.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'editeng/Library_editeng.mk') diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 0bcd965f8c7c..6c621d3e6721 100755 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Library_add_precompiled_header,editeng,$(SRCDIR)/editeng/inc/pc # add any additional include paths for this library here $(eval $(call gb_Library_set_include,editeng,\ $$(INCLUDE) \ + -I$(SRCDIR)/editeng/inc/pch \ -I$(SRCDIR)/editeng/inc \ -I$(OUTDIR)/inc/offuh \ )) -- cgit From 2e98dd0232e6f593998060844c50851a54bd3cef Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 1 Feb 2011 18:44:12 +0100 Subject: CWS gnumake3: use standard linked libs on Windows --- editeng/Library_editeng.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'editeng/Library_editeng.mk') diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 6c621d3e6721..293270b9a47c 100755 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -164,6 +164,7 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\ icuuc \ i18nisolang1 \ i18npaper \ + $(gb_StdLibs) \ )) ifeq ($(OS),LINUX) @@ -174,14 +175,5 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\ )) endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,editeng,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ -)) -endif - # vim: set noet sw=4 ts=4: -- cgit From ab451ff91e394a5f756558a9b27b39b55c43f075 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 2 Feb 2011 17:05:04 +0100 Subject: CWS gnumake3: rename gb_StdLibs -> gb_STDLIBS; remove explicit linking of individual standard libs from makefiles; fix export problem in framework --- editeng/Library_editeng.mk | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'editeng/Library_editeng.mk') diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 293270b9a47c..9213abedd3b1 100755 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -31,10 +31,6 @@ $(eval $(call gb_Library_add_package_headers,editeng,editeng_inc)) $(eval $(call gb_Library_add_precompiled_header,editeng,$(SRCDIR)/editeng/inc/pch/precompiled_editeng)) -# in case UNO services are exported: declare location of component file -#$(eval $(call gb_Library_set_componentfile,editeng,editeng/COMPONENT_FILE)) - -# add any additional include paths for this library here $(eval $(call gb_Library_set_include,editeng,\ $$(INCLUDE) \ -I$(SRCDIR)/editeng/inc/pch \ @@ -164,16 +160,8 @@ $(eval $(call gb_Library_add_linked_libs,editeng,\ icuuc \ i18nisolang1 \ i18npaper \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,editeng,\ - dl \ - m \ - pthread \ -)) -endif - # vim: set noet sw=4 ts=4: -- cgit