diff options
| -rw-r--r-- | RepositoryExternal.mk | 5 | ||||
| -rw-r--r-- | sane/Module_sane.mk | 7 | ||||
| -rw-r--r-- | sane/Package_inc.mk | 14 | ||||
| -rw-r--r-- | sane/inc/sane/sane.h (renamed from sane/inc/sane.h) | 0 |
4 files changed, 3 insertions, 23 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2d40dc09b589..33991a932644 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -188,8 +188,9 @@ endif ifeq (SANE,$(filter SANE,$(BUILD_TYPE))$(filter WNT,$(OS))) define gb_LinkTarget__use_sane_headers -$(call gb_LinkTarget_use_packages,$(1),\ - sane_inc \ +$(call gb_LinkTarget_set_include,$(1),\ + -I$(SRCDIR)/sane/inc \ + $$(INCLUDE) \ ) endef diff --git a/sane/Module_sane.mk b/sane/Module_sane.mk index 822778575a14..fb6a1253ebdc 100644 --- a/sane/Module_sane.mk +++ b/sane/Module_sane.mk @@ -10,10 +10,3 @@ $(eval $(call gb_Module_Module,sane)) -ifneq ($(OS),WNT) -ifneq (,$(filter SANE,$(BUILD_TYPE))) -$(eval $(call gb_Module_add_targets,sane,\ - Package_inc \ -)) -endif -endif diff --git a/sane/Package_inc.mk b/sane/Package_inc.mk deleted file mode 100644 index f3a3433879a8..000000000000 --- a/sane/Package_inc.mk +++ /dev/null @@ -1,14 +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_Package_Package,sane_inc,$(SRCDIR)/sane/inc)) - -$(eval $(call gb_Package_add_file,sane_inc,inc/external/sane/sane.h,sane.h)) - -# vim: set noet sw=4 ts=4: diff --git a/sane/inc/sane.h b/sane/inc/sane/sane.h index eb18eef1a601..eb18eef1a601 100644 --- a/sane/inc/sane.h +++ b/sane/inc/sane/sane.h |