cpputools/Module_cpputools.mk | 10 ++-------- cpputools/StaticLibrary_uno.mk | 38 -------------------------------------- 2 files changed, 2 insertions(+), 46 deletions(-)
New commits: commit a9a3095266c13d45d196e1b33a8f9a4fd84e30ea Author: Tor Lillqvist <[email protected]> Date: Wed Nov 21 23:49:30 2012 +0200 None of this for non-desktop OSes I think Change-Id: I8c4a6d8e5ee7cddf069c7d1b3ab43efd8e359b3f diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk index 4a2609f..9f5e932 100644 --- a/cpputools/Module_cpputools.mk +++ b/cpputools/Module_cpputools.mk @@ -26,17 +26,12 @@ $(eval $(call gb_Module_Module,cpputools)) -$(eval $(call gb_Module_add_targets,cpputools,\ - Executable_sp2bv \ -)) +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) -ifeq ($(OS),IOS) $(eval $(call gb_Module_add_targets,cpputools,\ - StaticLibrary_uno \ + Executable_sp2bv \ )) -else -ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,cpputools,\ Executable_regcomp \ Executable_regsingleton \ @@ -50,6 +45,5 @@ $(eval $(call gb_Module_add_targets,cpputools,\ endif endif -endif # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/cpputools/StaticLibrary_uno.mk b/cpputools/StaticLibrary_uno.mk deleted file mode 100644 index fba9747..0000000 --- a/cpputools/StaticLibrary_uno.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -*- 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) 2012 David Ostrovsky <[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. - -$(eval $(call gb_StaticLibrary_StaticLibrary,uno)) - -$(eval $(call gb_StaticLibrary_use_internal_comprehensive_api,uno,\ - udkapi \ -)) - -$(eval $(call gb_StaticLibrary_add_exception_objects,uno,\ - cpputools/source/unoexe/unoexe \ -)) - - -# vim:set shiftwidth=4 softtabstop=4 expandtab: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
