diff options
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | RepositoryModule_ooo.mk | 1 | ||||
| -rw-r--r-- | UnoControls/Library_ctl.mk | 64 | ||||
| -rw-r--r-- | UnoControls/Makefile (renamed from UnoControls/util/target.pmk) | 17 | ||||
| -rw-r--r-- | UnoControls/Module_UnoControls.mk | 34 | ||||
| -rw-r--r-- | UnoControls/prj/build.lst | 4 | ||||
| -rw-r--r-- | UnoControls/prj/d.lst | 6 | ||||
| -rw-r--r-- | UnoControls/prj/makefile.mk | 1 | ||||
| -rw-r--r-- | UnoControls/util/makefile.pmk | 27 | ||||
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 2 |
10 files changed, 114 insertions, 43 deletions
diff --git a/Repository.mk b/Repository.mk index 56a252d73869..b64a8eff280d 100644 --- a/Repository.mk +++ b/Repository.mk @@ -124,6 +124,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ charttools \ chartview \ cppcanvas \ + ctl \ cui \ dba \ dbaxml \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 9972488b4117..281b19850771 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -98,6 +98,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ ucbhelper \ udkapi \ unixODBC \ + UnoControls \ unotools \ unoxml \ uui \ diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk new file mode 100644 index 000000000000..f1eb96af2474 --- /dev/null +++ b/UnoControls/Library_ctl.mk @@ -0,0 +1,64 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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. +# +# Major Contributor(s): +# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# 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,ctl)) + +$(eval $(call gb_Library_set_include,ctl,\ + $$(INCLUDE) \ + -I$(SRCDIR)/UnoControls/inc \ + -I$(SRCDIR)/UnoControls/source/inc \ +)) + +$(eval $(call gb_Library_add_api,ctl,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,ctl,\ + cppu \ + cppuhelper \ + sal \ + tl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,ctl,UnoControls/util/ctl)) + +$(eval $(call gb_Library_add_exception_objects,ctl,\ + UnoControls/source/base/basecontainercontrol \ + UnoControls/source/base/basecontrol \ + UnoControls/source/base/multiplexer \ + UnoControls/source/base/registercontrols \ + UnoControls/source/controls/OConnectionPointContainerHelper \ + UnoControls/source/controls/OConnectionPointHelper \ + UnoControls/source/controls/framecontrol \ + UnoControls/source/controls/progressbar \ + UnoControls/source/controls/progressmonitor \ + UnoControls/source/controls/statusindicator \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/UnoControls/util/target.pmk b/UnoControls/Makefile index c7c1de9c2563..7bbbe6c703e6 100644 --- a/UnoControls/util/target.pmk +++ b/UnoControls/Makefile @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -24,12 +25,16 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -ALLSLO: $(SLOFILES) -SOSHL: $(SHL1TARGETN) +gb_PARTIALBUILD := T +ifeq ($(strip $(SOLARENV)),) +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk +else -WHOLEPRJ: - cd $(PRJ)$/prj - make debug linkinc prjpch compinc - @echo "READY" +gb_SourceEnvAndRecurse_STAGE=gbuild +include $(SOLARENV)/gbuild/gbuild.mk +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) + +endif +# vim: set noet sw=4 ts=4: diff --git a/UnoControls/Module_UnoControls.mk b/UnoControls/Module_UnoControls.mk new file mode 100644 index 000000000000..6b7fac152cb7 --- /dev/null +++ b/UnoControls/Module_UnoControls.mk @@ -0,0 +1,34 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# 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. +# +# Major Contributor(s): +# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# 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,UnoControls)) + +$(eval $(call gb_Module_add_targets,UnoControls,\ + Library_ctl \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/UnoControls/prj/build.lst b/UnoControls/prj/build.lst index 473776ffbedd..adfce8fa9d03 100644 --- a/UnoControls/prj/build.lst +++ b/UnoControls/prj/build.lst @@ -1,5 +1,3 @@ us UnoControls : LIBXSLT:libxslt cppuhelper offapi tools NULL us UnoControls usr1 - all us_mkout NULL -us UnoControls\source\base nmake - all us_base NULL -us UnoControls\source\controls nmake - all us_ctrls NULL -us UnoControls\util nmake - all us_util us_base us_ctrls NULL +us UnoControls\prj nmake - all us_prj NULL diff --git a/UnoControls/prj/d.lst b/UnoControls/prj/d.lst index 4c1de78bd819..e69de29bb2d1 100644 --- a/UnoControls/prj/d.lst +++ b/UnoControls/prj/d.lst @@ -1,6 +0,0 @@ -..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll -..\%__SRC%\lib\lib*.so %_DEST%\lib -..\%__SRC%\lib\*.sl %_DEST%\lib\*.sl -..\%__SRC%\bin\*.res %_DEST%\bin\*.res -..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib -..\%__SRC%\misc\ctl.component %_DEST%\xml\ctl.component diff --git a/UnoControls/prj/makefile.mk b/UnoControls/prj/makefile.mk new file mode 100644 index 000000000000..0997622e00f6 --- /dev/null +++ b/UnoControls/prj/makefile.mk @@ -0,0 +1 @@ +.INCLUDE : gbuildbridge.mk diff --git a/UnoControls/util/makefile.pmk b/UnoControls/util/makefile.pmk deleted file mode 100644 index 02a34a2434a1..000000000000 --- a/UnoControls/util/makefile.pmk +++ /dev/null @@ -1,27 +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. -# -#************************************************************************* -.INCLUDE : settings.mk diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 78a7b0cbf925..9c7870653b3d 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -126,6 +126,7 @@ my_components = \ component/sw/util/swd \ component/sw/util/vbaswobj \ component/toolkit/util/tk \ + component/UnoControls/util/ctl \ component/unotools/util/utl \ component/unoxml/source/rdf/unordf \ component/unoxml/source/service/unoxml \ @@ -142,7 +143,6 @@ my_components = \ component/xmlscript/util/xcr \ component/xmlsecurity/util/xmlsecurity \ component/xmlsecurity/util/xsec_fw \ - ctl \ dbase \ dbpool2 \ dbtools \ |