twain: remove Package_inc

Change-Id: I67d0801d8d353951f9c9b1ca7f08b23de9b34067

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) \
 )
 

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 \
 ))

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

twain/Package_inc.mk

-# -*- 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: