From 99a85c5bda0d1fb965cb48cd6c2ab1478c269313 Mon Sep 17 00:00:00 2001 From: Carsten Driesner Date: Wed, 26 Jan 2011 12:32:27 +0100 Subject: gnumake3: adjust comphelper to new build env --- comphelper/Library_comphelp.mk | 168 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) create mode 100644 comphelper/Library_comphelp.mk (limited to 'comphelper/Library_comphelp.mk') diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk new file mode 100644 index 000000000000..cab1474a769d --- /dev/null +++ b/comphelper/Library_comphelp.mk @@ -0,0 +1,168 @@ +#************************************************************************* +# +# 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,comphelper)) + +$(eval $(call gb_Library_add_package_headers,comphelper,comphelper_inc)) + +$(eval $(call gb_Library_add_precompiled_header,comphelper,$(SRCDIR)/comphelper/inc/pch/precompiled_comphelper)) + +$(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp4)) + +$(eval $(call gb_Library_set_include,comphelper,\ + -I$(SRCDIR)/comphelper/inc/pch \ + -I$(SRCDIR)/comphelper/source/inc \ + -I$(SRCDIR)/comphelper/inc \ + -I$(WORKDIR)/inc/comphelper/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/comphelper \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,comphelper,\ + sal \ + cppuhelper \ + cppu \ + ucbhelper \ + vos3 \ + stl \ +)) + +$(eval $(call gb_Library_add_exception_objects,comphelper,\ + comphelper/source/compare/AnyCompareFactory \ + comphelper/source/container/IndexedPropertyValuesContainer \ + comphelper/source/container/NamedPropertyValuesContainer \ + comphelper/source/container/container \ + comphelper/source/container/containermultiplexer \ + comphelper/source/container/embeddedobjectcontainer \ + comphelper/source/container/enumerablemap \ + comphelper/source/container/enumhelper \ + comphelper/source/container/namecontainer \ + comphelper/source/eventattachermgr/eventattachermgr \ + comphelper/source/misc/accessiblecomponenthelper \ + comphelper/source/misc/accessiblecontexthelper \ + comphelper/source/misc/accessibleeventbuffer \ + comphelper/source/misc/accessibleeventnotifier \ + comphelper/source/misc/accessiblekeybindinghelper \ + comphelper/source/misc/accessibleselectionhelper \ + comphelper/source/misc/accessibletexthelper \ + comphelper/source/misc/accessiblewrapper \ + comphelper/source/misc/accimplaccess \ + comphelper/source/misc/anytostring \ + comphelper/source/misc/asyncnotification \ + comphelper/source/misc/comphelper_module \ + comphelper/source/misc/comphelper_services \ + comphelper/source/misc/componentbase \ + comphelper/source/misc/componentcontext \ + comphelper/source/misc/componentmodule \ + comphelper/source/misc/configurationhelper \ + comphelper/source/misc/docpasswordhelper \ + comphelper/source/misc/docpasswordrequest \ + comphelper/source/misc/documentinfo \ + comphelper/source/misc/documentiologring \ + comphelper/source/misc/evtlistenerhlp \ + comphelper/source/misc/evtmethodhelper \ + comphelper/source/misc/ihwrapnofilter \ + comphelper/source/misc/instancelocker \ + comphelper/source/misc/interaction \ + comphelper/source/misc/legacysingletonfactory \ + comphelper/source/misc/listenernotification \ + comphelper/source/misc/locale \ + comphelper/source/misc/logging \ + comphelper/source/misc/mediadescriptor \ + comphelper/source/misc/mimeconfighelper \ + comphelper/source/misc/namedvaluecollection \ + comphelper/source/misc/numberedcollection \ + comphelper/source/misc/numbers \ + comphelper/source/misc/officeresourcebundle \ + comphelper/source/misc/officerestartmanager \ + comphelper/source/misc/proxyaggregation \ + comphelper/source/misc/regpathhelper \ + comphelper/source/misc/scopeguard \ + comphelper/source/misc/SelectionMultiplex \ + comphelper/source/misc/sequenceashashmap \ + comphelper/source/misc/sequence \ + comphelper/source/misc/servicedecl \ + comphelper/source/misc/serviceinfohelper \ + comphelper/source/misc/sharedmutex \ + comphelper/source/misc/stillreadwriteinteraction \ + comphelper/source/misc/storagehelper \ + comphelper/source/misc/string \ + comphelper/source/misc/synchronousdispatch \ + comphelper/source/misc/types \ + comphelper/source/misc/uieventslogger \ + comphelper/source/misc/weak \ + comphelper/source/misc/weakeventlistener \ + comphelper/source/officeinstdir/officeinstallationdirectories \ + comphelper/source/processfactory/componentfactory \ + comphelper/source/processfactory/processfactory \ + comphelper/source/property/ChainablePropertySet \ + comphelper/source/property/ChainablePropertySetInfo \ + comphelper/source/property/composedprops \ + comphelper/source/property/genericpropertyset \ + comphelper/source/property/MasterPropertySet \ + comphelper/source/property/MasterPropertySetInfo \ + comphelper/source/property/opropertybag \ + comphelper/source/property/propagg \ + comphelper/source/property/propertybag \ + comphelper/source/property/propertycontainer \ + comphelper/source/property/propertycontainerhelper \ + comphelper/source/property/property \ + comphelper/source/property/propertysethelper \ + comphelper/source/property/propertysetinfo \ + comphelper/source/property/propertystatecontainer \ + comphelper/source/property/propmultiplex \ + comphelper/source/property/propstate \ + comphelper/source/property/TypeGeneration \ + comphelper/source/streaming/basicio \ + comphelper/source/streaming/memorystream \ + comphelper/source/streaming/oslfile2streamwrap \ + comphelper/source/streaming/otransactedfilestream \ + comphelper/source/streaming/seekableinput \ + comphelper/source/streaming/seqinputstreamserv \ + comphelper/source/streaming/seqoutputstreamserv \ + comphelper/source/streaming/seqstream \ + comphelper/source/streaming/streamsection \ + comphelper/source/xml/attributelist \ + comphelper/source/xml/ofopxmlhelper \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_linked_libs,comphelper,\ + dl \ + m \ + pthread \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,comphelper,\ + kernel32 \ + msvcrt \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: -- cgit From 7c810cb4d733ccaa9e8f66415e252d1e0369fc5f Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 26 Jan 2011 16:15:19 +0100 Subject: CWS gnumake3: fix component location for msforms; change library name for msforms; change file names for gengal --- comphelper/Library_comphelp.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'comphelper/Library_comphelp.mk') diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index cab1474a769d..0d6c57bc741c 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -36,13 +36,15 @@ $(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp4) $(eval $(call gb_Library_set_include,comphelper,\ -I$(SRCDIR)/comphelper/inc/pch \ -I$(SRCDIR)/comphelper/source/inc \ - -I$(SRCDIR)/comphelper/inc \ - -I$(WORKDIR)/inc/comphelper/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/comphelper \ -I$(OUTDIR)/inc/offuh \ )) +$(eval $(call gb_Library_set_defs,comphelper,\ + $$(DEFS) \ + -DCOMPHELPER_DLLIMPLEMENTATION \ +)) + $(eval $(call gb_Library_add_linked_libs,comphelper,\ sal \ cppuhelper \ -- cgit From cb0aa041c29c747eaff469ea545ed5ae13627f97 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 28 Jan 2011 12:49:53 +0100 Subject: gnumake3: remove comphelper version; fix including extract.hxx --- comphelper/Library_comphelp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'comphelper/Library_comphelp.mk') diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index 0d6c57bc741c..841b0522a38f 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Library_add_package_headers,comphelper,comphelper_inc)) $(eval $(call gb_Library_add_precompiled_header,comphelper,$(SRCDIR)/comphelper/inc/pch/precompiled_comphelper)) -$(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp4)) +$(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp)) $(eval $(call gb_Library_set_include,comphelper,\ -I$(SRCDIR)/comphelper/inc/pch \ @@ -44,7 +44,7 @@ $(eval $(call gb_Library_set_defs,comphelper,\ $$(DEFS) \ -DCOMPHELPER_DLLIMPLEMENTATION \ )) - + $(eval $(call gb_Library_add_linked_libs,comphelper,\ sal \ cppuhelper \ -- cgit From f7d5dd5f78289e1e0934d45262debd532432394f 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 --- comphelper/Library_comphelp.mk | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'comphelper/Library_comphelp.mk') diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index 841b0522a38f..37551b8b35e7 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -46,12 +46,13 @@ $(eval $(call gb_Library_set_defs,comphelper,\ )) $(eval $(call gb_Library_add_linked_libs,comphelper,\ - sal \ - cppuhelper \ + sal \ + cppuhelper \ cppu \ - ucbhelper \ + ucbhelper \ vos3 \ stl \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,comphelper,\ @@ -119,7 +120,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/misc/uieventslogger \ comphelper/source/misc/weak \ comphelper/source/misc/weakeventlistener \ - comphelper/source/officeinstdir/officeinstallationdirectories \ + comphelper/source/officeinstdir/officeinstallationdirectories \ comphelper/source/processfactory/componentfactory \ comphelper/source/processfactory/processfactory \ comphelper/source/property/ChainablePropertySet \ @@ -160,11 +161,4 @@ $(eval $(call gb_Library_add_linked_libs,comphelper,\ pthread \ )) endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,comphelper,\ - kernel32 \ - msvcrt \ - uwinapi \ -)) -endif # vim: set noet sw=4 ts=4: -- cgit From 582eb5a368de1627164bc50e25f9eab8ae96e1a8 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 --- comphelper/Library_comphelp.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'comphelper/Library_comphelp.mk') diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index 37551b8b35e7..f077c1db4973 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,comphelper,\ ucbhelper \ vos3 \ stl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,comphelper,\ @@ -154,11 +154,4 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/xml/ofopxmlhelper \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,comphelper,\ - dl \ - m \ - pthread \ -)) -endif # vim: set noet sw=4 ts=4: -- cgit