Repository.mk | 1 cppuhelper/Library_cppuhelper.mk | 8 +----- cppuhelper/Module_cppuhelper.mk | 2 - cppuhelper/Package_findsofficepath.mk | 34 ---------------------------- cppuhelper/StaticLibrary_findsofficepath.mk | 21 +++++++++++++++++ dbaccess/Library_sdbt.mk | 3 +- desktop/source/splash/splash.cxx | 1 desktop/unx/splash/unxsplash.cxx | 3 -- odk/source/unoapploader/unx/makefile.mk | 3 +- odk/source/unoapploader/win/makefile.mk | 3 +- sc/source/ui/vba/vbasheetobject.cxx | 1 sc/source/ui/vba/vbasheetobjects.cxx | 1 starmath/Library_smd.mk | 5 ++++ svx/Library_textconversiondlgs.mk | 4 +++ sw/inc/unotxdoc.hxx | 1 ucb/Library_srtrs1.mk | 4 +++ ucb/Library_ucpext.mk | 4 +++ 17 files changed, 48 insertions(+), 51 deletions(-)
New commits: commit 76987f83c84b4cc7163f9065a7eed219eefa39a1 Author: David Tardon <[email protected]> Date: Wed Oct 10 13:50:20 2012 +0200 replace findsofficepath.obj by static lib Change-Id: I652ac46aec72a92667995353efa637f0a2310672 diff --git a/Repository.mk b/Repository.mk index 70cf306..1914420 100644 --- a/Repository.mk +++ b/Repository.mk @@ -651,6 +651,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ codemaker_java \ cosv \ dtobj \ + findsofficepath \ headless \ libeay32 \ npsoenv \ diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 59020c2..9a76127 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -29,10 +29,6 @@ $(eval $(call gb_Library_Library,cppuhelper)) $(eval $(call gb_Library_set_soversion_script,cppuhelper,3,$(SRCDIR)/cppuhelper/source/gcc3.map)) -$(eval $(call gb_Library_use_packages,cppuhelper,\ - cppuhelper_inc \ -)) - $(eval $(call gb_Library_use_internal_comprehensive_api,cppuhelper,\ cppuhelper \ udkapi \ @@ -51,8 +47,8 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_cobjects,cppuhelper,\ - cppuhelper/source/findsofficepath \ +$(eval $(call gb_Library_use_static_libraries,cppuhelper,\ + findsofficepath \ )) $(eval $(call gb_Library_add_exception_objects,cppuhelper,\ diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk index 1fd498b..b28a863 100644 --- a/cppuhelper/Module_cppuhelper.mk +++ b/cppuhelper/Module_cppuhelper.mk @@ -31,9 +31,9 @@ $(eval $(call gb_Module_add_targets,cppuhelper,\ CustomTarget_cppuhelper_allheaders \ InternalUnoApi_cppuhelper \ Library_cppuhelper \ - Package_findsofficepath \ Package_inc \ Package_unorc \ + StaticLibrary_findsofficepath \ )) $(eval $(call gb_Module_add_check_targets,cppuhelper,\ diff --git a/cppuhelper/Package_findsofficepath.mk b/cppuhelper/Package_findsofficepath.mk deleted file mode 100644 index b3b0e90..0000000 --- a/cppuhelper/Package_findsofficepath.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- Mode: makefile; 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) 2011 Matúš Kukan <[email protected]> (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. - -# UGLY HACK for odk/source/unoapploader/ where we need findsofficepath.o -$(eval $(call gb_Package_Package,cppuhelper_findsofficepath,$(WORKDIR)/CObject/cppuhelper/source)) - -$(eval $(call gb_Package_add_file,cppuhelper_findsofficepath,lib/findsofficepath.o,findsofficepath.o)) -$(eval $(call gb_Package_add_file,cppuhelper_findsofficepath,lib/findsofficepath.obj,findsofficepath.o)) - -# vim: set noet sw=4 ts=4: diff --git a/cppuhelper/StaticLibrary_findsofficepath.mk b/cppuhelper/StaticLibrary_findsofficepath.mk new file mode 100644 index 0000000..a33c13a --- /dev/null +++ b/cppuhelper/StaticLibrary_findsofficepath.mk @@ -0,0 +1,21 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_StaticLibrary_StaticLibrary,findsofficepath)) + +$(eval $(call gb_StaticLibrary_use_packages,findsofficepath,\ + cppuhelper_inc \ + sal_inc \ +)) + +$(eval $(call gb_StaticLibrary_add_cobjects,findsofficepath,\ + cppuhelper/source/findsofficepath \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/odk/source/unoapploader/unx/makefile.mk b/odk/source/unoapploader/unx/makefile.mk index 4ba98b1..54dc478 100644 --- a/odk/source/unoapploader/unx/makefile.mk +++ b/odk/source/unoapploader/unx/makefile.mk @@ -53,7 +53,8 @@ APP1RPATH=NONE APP1TARGET= $(TARGET) -APP1OBJS= $(OBJ)$/unoapploader.obj $(SOLARLIBDIR)$/findsofficepath.obj +APP1OBJS= $(OBJ)$/unoapploader.obj +APP1STDLIBS=-lfindsofficepath # --- Targets ------------------------------------------------------ diff --git a/odk/source/unoapploader/win/makefile.mk b/odk/source/unoapploader/win/makefile.mk index efdd8c2..b30608f 100644 --- a/odk/source/unoapploader/win/makefile.mk +++ b/odk/source/unoapploader/win/makefile.mk @@ -38,7 +38,8 @@ APP1RPATH=NONE APP1TARGET= $(TARGET) -APP1OBJS= $(OBJ)$/unoapploader.obj $(SOLARLIBDIR)$/findsofficepath.obj +APP1OBJS= $(OBJ)$/unoapploader.obj +APP1STDLIBS=findsofficepath.lib APP1STDLIBS=\ $(ADVAPI32LIB) commit 3e86d0b174ba08d62a9f9009ca4eeac24f7c1aa9 Author: David Tardon <[email protected]> Date: Wed Oct 10 07:40:03 2012 +0200 drop unneeded includes Change-Id: I7c5a6ce78883cada11082d7fbe3e78cef3d6a5ae diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 74cc65f..71f41de 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -38,7 +38,6 @@ #include <ooo/vba/excel/XlPlacement.hpp> #include <rtl/ustrbuf.hxx> #include <filter/msfilter/msvbahelper.hxx> -#include <oox/helper/helper.hxx> #include <svx/unoshape.hxx> #include "vbafont.hxx" #include "drwlayer.hxx" diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index cb05330..e5e9514 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -39,7 +39,6 @@ #include <com/sun/star/form/XForm.hpp> #include <com/sun/star/form/XFormComponent.hpp> #include <com/sun/star/form/XFormsSupplier.hpp> -#include <oox/helper/helper.hxx> #include "vbasheetobject.hxx" using ::rtl::OUString; commit 8d374508953f237b51e70e5047d5457559740ab9 Author: David Tardon <[email protected]> Date: Wed Oct 10 05:33:03 2012 +0200 add missing dep on tools/diagnose_ex.h Change-Id: Ie3a1e9043470f22d04d841f994cd0ff1d05868cb diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index 3e6c5f5..889c735 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -27,6 +27,10 @@ $(eval $(call gb_Library_Library,ucpext)) +$(eval $(call gb_Library_use_packages,ucpext,\ + tools_inc \ +)) + $(eval $(call gb_Library_set_componentfile,ucpext,ucb/source/ucp/ext/ucpext)) $(eval $(call gb_Library_use_sdk_api,ucpext)) commit c60b8ab88a8c65f4db4f90494373c438c97cd8cf Author: David Tardon <[email protected]> Date: Tue Oct 9 21:17:22 2012 +0200 add missing dep on sfx2 headers Change-Id: I93b48313501f97c9934b1a7368e289e9a3ca5a76 diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index f16bf44..87840de 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -28,6 +28,10 @@ $(eval $(call gb_Library_Library,textconversiondlgs)) +$(eval $(call gb_Library_use_packages,textconversiondlgs,\ + sfx2_inc \ +)) + $(eval $(call gb_Library_set_componentfile,textconversiondlgs,svx/util/textconversiondlgs)) $(eval $(call gb_Library_set_include,textconversiondlgs,\ commit cc76e1d7e1e48eefd5cb38db56bc63da8bd4234f Author: David Tardon <[email protected]> Date: Tue Oct 9 18:47:41 2012 +0200 drop unused #include Change-Id: I45d565fb800627cbb33ffc45c45e8f9b8e60e2a6 diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 3182bd2..ec38deb 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -77,7 +77,6 @@ #include <cppuhelper/implbase2.hxx> // helper for implementations #include <cppuhelper/implbase4.hxx> // helper for implementations #include <RefreshListenerContainer.hxx> -#include <oox/mathml/import.hxx> #include <viewopt.hxx> commit 31828c94034bafa41beb443632a3f70600185a47 Author: David Tardon <[email protected]> Date: Tue Oct 9 16:45:59 2012 +0200 add missing dep on ucbhelper/macros.hxx Change-Id: Ib2bd5f44580ac1e6da2f2494c23adfa098694449 diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index 587b074..af713aa 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -27,6 +27,10 @@ $(eval $(call gb_Library_Library,srtrs1)) +$(eval $(call gb_Library_use_packages,srtrs1,\ + ucbhelper_inc \ +)) + $(eval $(call gb_Library_set_componentfile,srtrs1,ucb/source/sorter/srtrs1)) $(eval $(call gb_Library_use_sdk_api,srtrs1)) commit 81649fdf41776c7416b8d34511be84416ae0468f Author: David Tardon <[email protected]> Date: Tue Oct 9 16:36:48 2012 +0200 drop unused includes Change-Id: Id061f9bc09e791308ebcc908092f921a2b309566 diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx index e7c7bd5..c761359 100644 --- a/desktop/unx/splash/unxsplash.cxx +++ b/desktop/unx/splash/unxsplash.cxx @@ -28,10 +28,7 @@ ************************************************************************/ #include "unxsplash.hxx" #include <stdio.h> -#include <unotools/bootstrap.hxx> #include <osl/process.h> -#include <tools/stream.hxx> -#include <sfx2/sfx.hrc> #include <com/sun/star/registry/XRegistryKey.hpp> #include <cppuhelper/implementationentry.hxx> #include <rtl/logfile.hxx> commit 1bdd178237bb7a80577fc670bfe285544c6375ea Author: David Tardon <[email protected]> Date: Tue Oct 9 16:21:29 2012 +0200 drop unused #include Change-Id: Ibba81e9e517dcc33a7c25fb803ef46a496e20a97 diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 95cdc67..1f816cd 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -31,7 +31,6 @@ #include <stdio.h> #include <unotools/bootstrap.hxx> #include <tools/stream.hxx> -#include <sfx2/sfx.hrc> #include <vcl/svapp.hxx> #include <vcl/salnativewidgets.hxx> commit 46b638ec55376dc59aca80d5faceb634fbcdadf6 Author: David Tardon <[email protected]> Date: Tue Oct 9 15:39:04 2012 +0200 add missing deps on headers Change-Id: I6fd8da6a07506cb91b43ea8176893a33d60fc07d diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index a8db56e..92961c7 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -22,6 +22,11 @@ $(eval $(call gb_Library_Library,smd)) +$(eval $(call gb_Library_use_packages,smd,\ + editeng_inc \ + oox_inc \ +)) + $(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd)) $(eval $(call gb_Library_set_include,smd,\ commit f4cc7a95be373302e0540261a6f8f3174bae999e Author: David Tardon <[email protected]> Date: Tue Oct 9 13:24:43 2012 +0200 add missing dep on svl/solar.hrc Change-Id: Ie3087a00e4aa537763fe36b1b96d644606e547b8 diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index cc80dca..5e4faa3 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -27,8 +27,9 @@ $(eval $(call gb_Library_Library,sdbt)) -$(eval $(call gb_Library_use_package,sdbt,\ +$(eval $(call gb_Library_use_packages,sdbt,\ dbaccess_inc \ + svl_inc \ )) $(eval $(call gb_Library_set_include,sdbt,\
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
