diff options
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | extensions/Library_scn.mk | 2 | ||||
| -rw-r--r-- | twain/Module_twain.mk | 5 | ||||
| -rw-r--r-- | twain/Package_inc.mk | 14 | ||||
| -rw-r--r-- | twain/inc/twain/twain.h (renamed from twain/inc/twain.h) | 0 |
5 files changed, 2 insertions, 23 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 33991a932644..21430ccb7344 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -185,11 +185,11 @@ endef endif -ifeq (SANE,$(filter SANE,$(BUILD_TYPE))$(filter WNT,$(OS))) +ifeq (SANE,$(filter SANE,$(BUILD_TYPE))) define gb_LinkTarget__use_sane_headers $(call gb_LinkTarget_set_include,$(1),\ - -I$(SRCDIR)/sane/inc \ + -I$(SRCDIR)/$(if $(filter WNT,$(OS)),twain,sane)/inc \ $$(INCLUDE) \ ) diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 5a7b85a5e5d3..feaf429e0114 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -38,8 +38,6 @@ $(eval $(call gb_Library_add_exception_objects,scn,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_packages,scn,twain_inc)) - $(eval $(call gb_Library_add_exception_objects,scn,\ extensions/source/scanner/scanwin \ )) diff --git a/twain/Module_twain.mk b/twain/Module_twain.mk index 9605f5580125..7537fc88e849 100644 --- a/twain/Module_twain.mk +++ b/twain/Module_twain.mk @@ -10,8 +10,3 @@ $(eval $(call gb_Module_Module,twain)) -ifeq ($(OS),WNT) -$(eval $(call gb_Module_add_targets,twain,\ - Package_inc \ -)) -endif diff --git a/twain/Package_inc.mk b/twain/Package_inc.mk deleted file mode 100644 index e161b57ae989..000000000000 --- a/twain/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,twain_inc,$(SRCDIR)/twain/inc)) - -$(eval $(call gb_Package_add_file,twain_inc,inc/external/twain/twain.h,twain.h)) - -# vim: set noet sw=4 ts=4: diff --git a/twain/inc/twain.h b/twain/inc/twain/twain.h index 41d482009f99..41d482009f99 100644 --- a/twain/inc/twain.h +++ b/twain/inc/twain/twain.h |