From 000dccdad6de998162fcdf942f0e14c729befd44 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 01:29:37 +0200 Subject: CWS gnumake2: module reorg --- sw/Library_msword.mk | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 sw/Library_msword.mk (limited to 'sw/Library_msword.mk') diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk new file mode 100644 index 000000000000..eb891976fcc2 --- /dev/null +++ b/sw/Library_msword.mk @@ -0,0 +1,121 @@ +#************************************************************************* +# +# 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,msword)) + +$(eval $(call gb_Library_set_include,msword,\ + -I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/source/ui/inc \ + -I$(SRCDIR)/sw/source/filter/inc \ + -I$(SRCDIR)/sw/inc/pch \ + -I$(SRCDIR)/sw/inc \ + -I$(WORKDIR)/inc/sw/sdi \ + -I$(WORKDIR)/Misc/sw/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc/sw \ +)) + +$(eval $(call gb_Library_set_defs,msword,\ + $$(DEFS) \ + -DACCESSIBLE_LAYOUT \ +)) + +$(eval $(call gb_Library_add_linked_libs,msword,\ + basegfx \ + comphelper \ + i18nisolang1 \ + i18nutil \ + icuuc \ + editeng \ + msfilter \ + sfx \ + sot \ + stl \ + svl \ + svt \ + svx \ + svx \ + svxcore \ + sw \ + tk \ + tl \ + ucbhelper \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,msword,\ + sw/source/filter/rtf/rtfatr \ + sw/source/filter/rtf/rtffld \ + sw/source/filter/rtf/rtffly \ + sw/source/filter/rtf/rtfnum \ + sw/source/filter/rtf/rtftbl \ + sw/source/filter/rtf/swparrtf \ + sw/source/filter/rtf/wrtrtf \ + sw/source/filter/ww8/WW8FFData \ + sw/source/filter/ww8/WW8FibData \ + sw/source/filter/ww8/WW8Sttbf \ + sw/source/filter/ww8/WW8TableInfo \ + sw/source/filter/ww8/fields \ + sw/source/filter/ww8/styles \ + sw/source/filter/ww8/tracer \ + sw/source/filter/ww8/writerhelper \ + sw/source/filter/ww8/writerwordglue \ + sw/source/filter/ww8/wrtw8esh \ + sw/source/filter/ww8/wrtw8nds \ + sw/source/filter/ww8/wrtw8num \ + sw/source/filter/ww8/wrtw8sty \ + sw/source/filter/ww8/wrtww8 \ + sw/source/filter/ww8/wrtww8gr \ + sw/source/filter/ww8/ww8atr \ + sw/source/filter/ww8/ww8glsy \ + sw/source/filter/ww8/ww8graf \ + sw/source/filter/ww8/ww8graf2 \ + sw/source/filter/ww8/ww8par \ + sw/source/filter/ww8/ww8par2 \ + sw/source/filter/ww8/ww8par3 \ + sw/source/filter/ww8/ww8par4 \ + sw/source/filter/ww8/ww8par5 \ + sw/source/filter/ww8/ww8par6 \ + sw/source/filter/ww8/ww8scan \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,msword,\ + advapi32 \ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: -- cgit From 2bc737661a2c673bd7adfba299ceee02fcab627b Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 26 Nov 2010 13:37:22 +0100 Subject: gnumake2: sorting all lists in makefiles --- sw/Library_msword.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sw/Library_msword.mk') diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index eb891976fcc2..5aebe867f806 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -48,11 +48,14 @@ $(eval $(call gb_Library_set_defs,msword,\ $(eval $(call gb_Library_add_linked_libs,msword,\ basegfx \ comphelper \ + cppu \ + cppuhelper \ + editeng \ i18nisolang1 \ i18nutil \ icuuc \ - editeng \ msfilter \ + sal \ sfx \ sot \ stl \ @@ -65,9 +68,6 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ tk \ tl \ ucbhelper \ - cppu \ - cppuhelper \ - sal \ utl \ vcl \ )) -- cgit From 8849f61270fec9c3e1a09ad29824c95d6d41c997 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 26 Nov 2010 17:32:03 +0100 Subject: CWS gnumake2: some adaptions to changes on master in removed makefile.mk files --- sw/Library_msword.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sw/Library_msword.mk') diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 5aebe867f806..35eaa1617f66 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -73,13 +73,16 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ )) $(eval $(call gb_Library_add_exception_objects,msword,\ - sw/source/filter/rtf/rtfatr \ sw/source/filter/rtf/rtffld \ sw/source/filter/rtf/rtffly \ sw/source/filter/rtf/rtfnum \ sw/source/filter/rtf/rtftbl \ sw/source/filter/rtf/swparrtf \ - sw/source/filter/rtf/wrtrtf \ + sw/source/filter/ww8/rtfattributeoutput \ + sw/source/filter/ww8/rtfexport \ + sw/source/filter/ww8/rtfexportfilter \ + sw/source/filter/ww8/rtfimportfilter \ + sw/source/filter/ww8/rtfsdrexport \ sw/source/filter/ww8/WW8FFData \ sw/source/filter/ww8/WW8FibData \ sw/source/filter/ww8/WW8Sttbf \ -- cgit From 24735ecb14ca4ea87ba531ac05bb6557a050e424 Mon Sep 17 00:00:00 2001 From: tono Date: Fri, 31 Dec 2010 00:35:16 +0900 Subject: i#116264: gbuild for MinGW --- sw/Library_msword.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'sw/Library_msword.mk') diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index ee33da85561f..34a52e4786c7 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -114,6 +114,21 @@ $(eval $(call gb_Library_add_exception_objects,msword,\ )) ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,msword,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + advapi32 \ + kernel32 \ + msvcrt \ + user32 \ +)) +else $(eval $(call gb_Library_add_linked_libs,msword,\ advapi32 \ kernel32 \ @@ -123,4 +138,5 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ uwinapi \ )) endif +endif # vim: set noet sw=4 ts=4: -- cgit From cc9a9d52686d3874ed0932eba4a750845860ae3e Mon Sep 17 00:00:00 2001 From: tono Date: Wed, 5 Jan 2011 21:38:47 +0900 Subject: Backed out changeset: e84942bd0aca --- sw/Library_msword.mk | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'sw/Library_msword.mk') diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 34a52e4786c7..ee33da85561f 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -114,21 +114,6 @@ $(eval $(call gb_Library_add_exception_objects,msword,\ )) ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,msword,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - advapi32 \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Library_add_linked_libs,msword,\ advapi32 \ kernel32 \ @@ -138,5 +123,4 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ uwinapi \ )) endif -endif # vim: set noet sw=4 ts=4: -- cgit From 4344bf73859ac0583785059dccfe28da081ab821 Mon Sep 17 00:00:00 2001 From: tono Date: Wed, 5 Jan 2011 22:55:15 +0900 Subject: mingwport33: i#116264: gbuild for MinGW --- sw/Library_msword.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'sw/Library_msword.mk') diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index ee33da85561f..34a52e4786c7 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -114,6 +114,21 @@ $(eval $(call gb_Library_add_exception_objects,msword,\ )) ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,msword,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + advapi32 \ + kernel32 \ + msvcrt \ + user32 \ +)) +else $(eval $(call gb_Library_add_linked_libs,msword,\ advapi32 \ kernel32 \ @@ -123,4 +138,5 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ uwinapi \ )) endif +endif # vim: set noet sw=4 ts=4: -- cgit From a877851a7ce71c562e8ef4f10c39444b025c4a56 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 12 Jan 2011 12:05:07 +0100 Subject: CWS gnumake3: #i116422#: convert svx to new build system --- sw/Library_msword.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'sw/Library_msword.mk') diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index ee33da85561f..d86c67470f8b 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -44,7 +44,6 @@ $(eval $(call gb_Library_set_include,msword,\ $(eval $(call gb_Library_set_defs,msword,\ $$(DEFS) \ - -DACCESSIBLE_LAYOUT \ )) $(eval $(call gb_Library_add_linked_libs,msword,\ -- cgit From 5d2f51945b10f6c3cad3286e5cce101a1d1c1727 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 --- sw/Library_msword.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sw/Library_msword.mk') diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index d86c67470f8b..012591886ff2 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.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 f3f0ec3c9ecec3cc677bb0c8f190dab43644b707 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 --- sw/Library_msword.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'sw/Library_msword.mk') diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 86a2ec05eb65..ed3f2b036b8b 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -71,6 +71,7 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ ucbhelper \ utl \ vcl \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,msword,\ @@ -127,15 +128,6 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ msvcrt \ user32 \ )) -else -$(eval $(call gb_Library_add_linked_libs,msword,\ - advapi32 \ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) endif endif # vim: set noet sw=4 ts=4: -- cgit From c3c1e664ee43c83937f82362e64296ec9d8018e6 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 --- sw/Library_msword.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw/Library_msword.mk') diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index ed3f2b036b8b..67f96f5fd20c 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -71,7 +71,7 @@ $(eval $(call gb_Library_add_linked_libs,msword,\ ucbhelper \ utl \ vcl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,msword,\ -- cgit From f6995c48aabedfda6ba6852eabeb10d335cad219 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 3 Feb 2011 10:24:18 +0100 Subject: CWS gnumake3: clean up mingw stuff after adding STDLIBS --- sw/Library_msword.mk | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'sw/Library_msword.mk') diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 67f96f5fd20c..530fa53908b7 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -113,21 +113,4 @@ $(eval $(call gb_Library_add_exception_objects,msword,\ sw/source/filter/ww8/ww8scan \ )) -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,msword,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - advapi32 \ - kernel32 \ - msvcrt \ - user32 \ -)) -endif -endif # vim: set noet sw=4 ts=4: -- cgit