connectivity/Library_mozabdrv.mk | 10 +++++----- moz/ExternalPackage_moz_inc.mk | 18 ------------------ moz/Module_moz.mk | 1 - 3 files changed, 5 insertions(+), 24 deletions(-)
New commits: commit f290bc783553abf0290369e57cef4bb2de8b3252 Author: David Ostrovsky <[email protected]> Date: Mon Feb 25 21:52:55 2013 +0100 don't copy the mozilla include files, use it in place Change-Id: I75e8d897bc06806008c9b6e62b4741769f437dec diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index bf088bc..7f2cc34 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -30,11 +30,16 @@ $(eval $(call gb_Library_Library,mozabdrv)) $(eval $(call gb_Library_set_include,mozabdrv,\ -I$(SRCDIR)/connectivity/source/drivers/mozab \ -I$(SRCDIR)/connectivity/source/inc \ + -I$(call gb_UnpackedTarball_get_dir,moz_inc) \ $$(INCLUDE) \ )) $(eval $(call gb_Library_use_sdk_api,mozabdrv)) +$(eval $(call gb_Library_use_package,mozabdrv,moz_lib)) + +$(eval $(call gb_Library_use_unpacked,mozabdrv,moz_inc)) + $(eval $(call gb_Library_use_libraries,mozabdrv,\ comphelper \ cppu \ @@ -45,11 +50,6 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_package,mozabdrv,\ - moz_inc \ - moz_lib \ -)) - $(eval $(call gb_Library_use_externals,mozabdrv,\ boost_headers \ mozilla \ diff --git a/moz/ExternalPackage_moz_inc.mk b/moz/ExternalPackage_moz_inc.mk deleted file mode 100644 index fb399a6..0000000 --- a/moz/ExternalPackage_moz_inc.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -*- 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_ExternalPackage_ExternalPackage,moz_inc,moz_inc)) - -MOZ_INC = $(subst $(call gb_UnpackedTarball_get_dir,moz_inc),,$(shell find $(call gb_UnpackedTarball_get_dir,moz_inc) -type f)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,moz_inc,inc/mozilla,\ - $(MOZ_INC) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/moz/Module_moz.mk b/moz/Module_moz.mk index 4048324..f447668 100644 --- a/moz/Module_moz.mk +++ b/moz/Module_moz.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,moz)) ifeq ($(WITH_MOZAB4WIN),YES) $(eval $(call gb_Module_add_targets,moz,\ - ExternalPackage_moz_inc \ ExternalPackage_moz_lib \ CustomTarget_runtime \ Package_runtime \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
