Move clew/clew.h into external, too

For consistency with what 38cd1d9a "clew: move
this foreign code to external/clew" did for clew.c.  Library_scfilt depends on
clew/clew.h, simply make it depend on the full clew external.

Change-Id: Idcbf56a69084e108832c8970507ebea0f7ff400b
Reviewed-on: https://gerrit.libreoffice.org/24035Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

RepositoryExternal.mk

@@ -3968,4 +3968,12 @@ endef
 endif
 endif
 
+define gb_LinkTarget__use_clew
+$(call gb_LinkTarget_set_include,$(1), \
+    -I$(SRCDIR)/external/clew/source/include \
+    $$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_libraries,$(1),clew)
+endef
+
 # vim: set noet sw=4 ts=4:

cui/Library_cui.mk

@@ -33,8 +33,6 @@ $(eval $(call gb_Library_use_sdk_api,cui))
 $(eval $(call gb_Library_use_libraries,cui,\
 	$(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
-	$(call gb_Helper_optional,OPENCL,\
-		clew) \
     comphelper \
     cppu \
     cppuhelper \
@@ -67,6 +65,8 @@ $(eval $(call gb_Library_use_libraries,cui,\
 
 $(eval $(call gb_Library_use_externals,cui,\
 	boost_headers \
+	$(call gb_Helper_optional,OPENCL,\
+		clew) \
     icuuc \
     icu_headers \
 ))

external/clew/Library_clew.mk

@@ -30,6 +30,11 @@ $(eval $(call gb_Library_add_cobjects,clew,\
     external/clew/source/clew \
 ))
 
+$(eval $(call gb_Library_set_include,clew, \
+    -I$(SRCDIR)/external/clew/source/include \
+    $$(INCLUDE) \
+))
+
 # This is required for module-deps.pl to produce correct dependencies.
 $(eval $(call gb_Library_use_libraries,clew,))
 

opencl/Library_opencl.mk

@@ -20,6 +20,7 @@ $(eval $(call gb_Library_add_defs,opencl,\
 
 $(eval $(call gb_Library_use_externals,opencl,\
     boost_headers \
+    clew \
     icu_headers \
     icui18n \
     icuuc \
@@ -32,7 +33,6 @@ $(eval $(call gb_Library_use_custom_headers,opencl,\
 $(eval $(call gb_Library_use_sdk_api,opencl))
 
 $(eval $(call gb_Library_use_libraries,opencl,\
-    clew \
     configmgr \
     comphelper \
     cppu \

sc/CppunitTest_sc_opencl_test.mk

@@ -15,12 +15,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_opencl_test, \
 
 $(eval $(call gb_CppunitTest_use_externals,sc_opencl_test, \
 	boost_headers \
+    $(call gb_Helper_optional,OPENCL,clew) \
 	mdds_headers \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \
     basegfx \
-    $(call gb_Helper_optional,OPENCL,clew) \
     comphelper \
     cppu \
     cppuhelper \

sc/CppunitTest_sc_ucalc.mk

@@ -32,6 +32,8 @@ endif
 
 $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\
 	boost_headers \
+    $(call gb_Helper_optional,OPENCL, \
+        clew) \
     icu_headers \
     icui18n \
     icuuc \
@@ -44,8 +46,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\
 $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
 	$(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
-    $(call gb_Helper_optional,OPENCL, \
-        clew) \
     comphelper \
     cppu \
     cppuhelper \

sc/Library_sc.mk

@@ -37,6 +37,8 @@ $(eval $(call gb_Library_use_sdk_api,sc))
 
 $(eval $(call gb_Library_use_externals,sc,\
     boost_headers \
+    $(call gb_Helper_optional,OPENCL, \
+        clew) \
     icu_headers \
     icui18n \
     icuuc \
@@ -62,8 +64,6 @@ endif
 $(eval $(call gb_Library_use_libraries,sc,\
     $(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
-    $(call gb_Helper_optional,OPENCL, \
-        clew) \
     comphelper \
     cppu \
     cppuhelper \

sc/Library_scfilt.mk

@@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_custom_headers,scfilt,\
 
 $(eval $(call gb_Library_use_externals,scfilt,\
 	boost_headers \
+	$(call gb_Helper_optional,OPENCL,clew) \
 	mdds_headers \
 ))
 

sc/Library_scui.mk

@@ -24,12 +24,12 @@ $(eval $(call gb_Library_use_sdk_api,scui))
 
 $(eval $(call gb_Library_use_externals,scui,\
 	boost_headers \
+	$(call gb_Helper_optional,OPENCL, \
+		clew) \
 	mdds_headers \
 ))
 
 $(eval $(call gb_Library_use_libraries,scui,\
-	$(call gb_Helper_optional,OPENCL, \
-		clew) \
 	comphelper \
 	cppu \
 	cppuhelper \