gbuild: remove various pointless calls that don't add anything

Change-Id: I7eccac4fa8890c2873c6bbd7f8f5bf5b0dd006d2
2013-01-26 22:15:04 +01:00 · 2013-01-26 22:15:04 +01:00 · fc81393c7f
commit fc81393c7f
parent a53586f4ef
65 changed files with 0 additions and 262 deletions
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@ -120,10 +120,6 @@ $(eval $(call gb_Library_add_sdi_headers,basctl,basctl/sdi/basslots))

 $(eval $(call gb_SdiTarget_SdiTarget,basctl/sdi/basslots,basctl/sdi/baside))

-$(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\
-	$$(INCLUDE) \
-))
-
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,basctl,\
 	advapi32 \
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,crashrep_com))

 $(eval $(call gb_Executable_set_targettype_gui,crashrep_com,NO))

-$(eval $(call gb_Executable_set_include,crashrep_com,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_add_defs,crashrep_com,\
    $(LFS_CFLAGS) \
 ))
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@ -27,10 +27,6 @@

 $(eval $(call gb_Executable_Executable,officeloader))

-$(eval $(call gb_Executable_set_include,officeloader,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,officeloader,\
    sal \
 	$(gb_UWINAPI) \
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,oosplash))

 $(eval $(call gb_Executable_set_targettype_gui,oosplash,YES))

-$(eval $(call gb_Executable_set_include,oosplash,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,oosplash,\
    sal \
 ))
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,quickstart))

 $(eval $(call gb_Executable_set_targettype_gui,quickstart,YES))

-$(eval $(call gb_Executable_set_include,quickstart,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_system_win32_libs,quickstart,\
    comdlg32 \
    gdi32 \
--- a/desktop/Executable_unoinfo.mk
+++ b/desktop/Executable_unoinfo.mk
@ -27,10 +27,6 @@

 $(eval $(call gb_Executable_Executable,unoinfo))

-$(eval $(call gb_Executable_set_include,unoinfo,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_static_libraries,unoinfo,\
    ooopathutils \
 ))
--- a/desktop/Executable_unopkg.com.mk
+++ b/desktop/Executable_unopkg.com.mk
@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,unopkg_com))

 $(eval $(call gb_Executable_set_targettype_gui,unopkg_com,NO))

-$(eval $(call gb_Executable_set_include,unopkg_com,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_add_defs,unopkg_com,\
    $(LFS_CFLAGS) \
 ))
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@ -27,10 +27,6 @@

 $(eval $(call gb_Library_Library,migrationoo2))

-$(eval $(call gb_Library_set_include,migrationoo2,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_external,migrationoo2,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,migrationoo2))
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@ -27,10 +27,6 @@

 $(eval $(call gb_Library_Library,migrationoo3))

-$(eval $(call gb_Library_set_include,migrationoo3,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,migrationoo3))

 $(eval $(call gb_Library_use_libraries,migrationoo3,\
--- a/desktop/Library_offacc.mk
+++ b/desktop/Library_offacc.mk
@ -27,10 +27,6 @@

 $(eval $(call gb_Library_Library,offacc))

-$(eval $(call gb_Library_set_include,offacc,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,offacc))

 $(eval $(call gb_Library_use_libraries,offacc,\
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,dnd))

 $(eval $(call gb_Library_set_componentfile,dnd,dtrans/util/dnd))

-$(eval $(call gb_Library_set_include,dnd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,dnd))

 $(eval $(call gb_Library_use_libraries,dnd,\
--- a/dtrans/Library_dtrans.mk
+++ b/dtrans/Library_dtrans.mk
@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,dtrans))

 $(eval $(call gb_Library_set_componentfile,dtrans,dtrans/source/generic/dtrans))

-$(eval $(call gb_Library_set_include,dtrans,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,dtrans))

 $(eval $(call gb_Library_use_libraries,dtrans,\
--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,ftransl))

 $(eval $(call gb_Library_set_componentfile,ftransl,dtrans/util/ftransl))

-$(eval $(call gb_Library_set_include,ftransl,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,ftransl))

 $(eval $(call gb_Library_use_libraries,ftransl,\
--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,mcnttype))

 $(eval $(call gb_Library_set_componentfile,mcnttype,dtrans/util/mcnttype))

-$(eval $(call gb_Library_set_include,mcnttype,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,mcnttype))

 $(eval $(call gb_Library_use_libraries,mcnttype,\
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,sysdtrans))

 $(eval $(call gb_Library_set_componentfile,sysdtrans,dtrans/util/sysdtrans))

-$(eval $(call gb_Library_set_include,sysdtrans,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,sysdtrans))

 $(eval $(call gb_Library_add_defs,sysdtrans,\
--- a/editeng/CppunitTest_editeng_borderline.mk
+++ b/editeng/CppunitTest_editeng_borderline.mk
@ -51,10 +51,6 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\
    icuuc \
 ))

-$(eval $(call gb_CppunitTest_set_include,editeng_borderline,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,editeng_borderline,\
    offapi \
    udkapi \
--- a/editeng/CppunitTest_editeng_lookuptree.mk
+++ b/editeng/CppunitTest_editeng_lookuptree.mk
@ -50,10 +50,6 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_lookuptree,\
    icuuc \
 ))

-$(eval $(call gb_CppunitTest_set_include,editeng_lookuptree,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,editeng_lookuptree,\
    offapi \
    udkapi \
--- a/fileaccess/Library_fileacc.mk
+++ b/fileaccess/Library_fileacc.mk
@ -27,10 +27,6 @@

 $(eval $(call gb_Library_Library,fileacc))

-$(eval $(call gb_Library_set_include,fileacc,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,fileacc))

 $(eval $(call gb_Library_use_libraries,fileacc,\
--- a/filter/Library_egi.mk
+++ b/filter/Library_egi.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,egi,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,egi))

-$(eval $(call gb_Library_set_include,egi,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,egi,\
 	svt \
 	vcl \
--- a/filter/Library_eme.mk
+++ b/filter/Library_eme.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,eme,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,eme))

-$(eval $(call gb_Library_set_include,eme,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,eme,\
 	svt \
 	vcl \
--- a/filter/Library_epb.mk
+++ b/filter/Library_epb.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,epb,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,epb))

-$(eval $(call gb_Library_set_include,epb,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,epb,\
 	svt \
 	vcl \
--- a/filter/Library_epg.mk
+++ b/filter/Library_epg.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,epg,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,epg))

-$(eval $(call gb_Library_set_include,epg,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,epg,\
 	svt \
 	vcl \
--- a/filter/Library_epp.mk
+++ b/filter/Library_epp.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,epp,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,epp))

-$(eval $(call gb_Library_set_include,epp,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,epp,\
 	svt \
 	vcl \
--- a/filter/Library_eps.mk
+++ b/filter/Library_eps.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,eps,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,eps))

-$(eval $(call gb_Library_set_include,eps,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,eps,\
 	svt \
 	vcl \
--- a/filter/Library_ept.mk
+++ b/filter/Library_ept.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ept,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,ept))

-$(eval $(call gb_Library_set_include,ept,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ept,\
 	svt \
 	vcl \
--- a/filter/Library_era.mk
+++ b/filter/Library_era.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,era,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,era))

-$(eval $(call gb_Library_set_include,era,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,era,\
 	svt \
 	vcl \
--- a/filter/Library_eti.mk
+++ b/filter/Library_eti.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,eti,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,eti))

-$(eval $(call gb_Library_set_include,eti,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,eti,\
 	svt \
 	vcl \
--- a/filter/Library_exp.mk
+++ b/filter/Library_exp.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,exp,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,exp))

-$(eval $(call gb_Library_set_include,exp,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,exp,\
 	svt \
 	vcl \
--- a/filter/Library_flash.mk
+++ b/filter/Library_flash.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,flash,filter/source/flash/flash))

 $(eval $(call gb_Library_use_sdk_api,flash))

-$(eval $(call gb_Library_set_include,flash,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,flash,\
 	svt \
 	vcl \
--- a/filter/Library_icd.mk
+++ b/filter/Library_icd.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,icd,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,icd))

-$(eval $(call gb_Library_set_include,icd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,icd,\
 	svt \
 	vcl \
--- a/filter/Library_icg.mk
+++ b/filter/Library_icg.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,icg,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,icg))

-$(eval $(call gb_Library_set_include,icg,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,icg,\
        comphelper \
 	tk \
--- a/filter/Library_idx.mk
+++ b/filter/Library_idx.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,idx,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,idx))

-$(eval $(call gb_Library_set_include,idx,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,idx,\
 	vcl \
 	tl \
--- a/filter/Library_ime.mk
+++ b/filter/Library_ime.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ime,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,ime))

-$(eval $(call gb_Library_set_include,ime,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ime,\
 	vcl \
 	tl \
--- a/filter/Library_ipb.mk
+++ b/filter/Library_ipb.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ipb,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,ipb))

-$(eval $(call gb_Library_set_include,ipb,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ipb,\
 	vcl \
 	tl \
--- a/filter/Library_ipd.mk
+++ b/filter/Library_ipd.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ipd,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,ipd))

-$(eval $(call gb_Library_set_include,ipd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ipd,\
 	vcl \
 	tl \
--- a/filter/Library_ips.mk
+++ b/filter/Library_ips.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ips,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,ips))

-$(eval $(call gb_Library_set_include,ips,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ips,\
 	vcl \
 	tl \
--- a/filter/Library_ipt.mk
+++ b/filter/Library_ipt.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ipt,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,ipt))

-$(eval $(call gb_Library_set_include,ipt,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ipt,\
 	vcl \
 	tl \
--- a/filter/Library_ipx.mk
+++ b/filter/Library_ipx.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ipx,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,ipx))

-$(eval $(call gb_Library_set_include,ipx,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ipx,\
 	vcl \
 	tl \
--- a/filter/Library_ira.mk
+++ b/filter/Library_ira.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ira,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,ira))

-$(eval $(call gb_Library_set_include,ira,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ira,\
 	vcl \
 	tl \
--- a/filter/Library_itg.mk
+++ b/filter/Library_itg.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,itg,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,itg))

-$(eval $(call gb_Library_set_include,itg,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,itg,\
 	vcl \
 	tl \
--- a/filter/Library_iti.mk
+++ b/filter/Library_iti.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,iti,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,iti))

-$(eval $(call gb_Library_set_include,iti,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,iti,\
 	vcl \
 	tl \
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@ -27,10 +27,6 @@ $(eval $(call gb_Library_use_external,msfilter,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,msfilter))

-$(eval $(call gb_Library_set_include,msfilter,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_add_defs,msfilter,\
 	-DMSFILTER_DLLIMPLEMENTATION \
 ))
--- a/filter/Library_placeware.mk
+++ b/filter/Library_placeware.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,placeware,filter/source/placeware/pla

 $(eval $(call gb_Library_use_sdk_api,placeware))

-$(eval $(call gb_Library_set_include,placeware,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,placeware,\
 	cppuhelper \
 	cppu \
--- a/filter/Library_t602filter.mk
+++ b/filter/Library_t602filter.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602fil

 $(eval $(call gb_Library_use_sdk_api,t602filter))

-$(eval $(call gb_Library_set_include,t602filter,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,t602filter,\
 	xo \
 	tl \
--- a/filter/Library_textfd.mk
+++ b/filter/Library_textfd.mk
@ -34,10 +34,6 @@ $(eval $(call gb_Library_set_componentfile,textfd,filter/source/textfilterdetect

 $(eval $(call gb_Library_use_sdk_api,textfd))

-$(eval $(call gb_Library_set_include,textfd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,textfd,\
 	ucbhelper \
 	cppuhelper \
--- a/filter/Library_xmlfa.mk
+++ b/filter/Library_xmlfa.mk
@ -25,10 +25,6 @@ $(eval $(call gb_Library_use_external,xmlfa,boost_headers))

 $(eval $(call gb_Library_use_sdk_api,xmlfa))

-$(eval $(call gb_Library_set_include,xmlfa,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,xmlfa,\
 	tl \
 	comphelper \
--- a/filter/Library_xmlfd.mk
+++ b/filter/Library_xmlfd.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,xmlfd,filter/source/xmlfilterdetect/x

 $(eval $(call gb_Library_use_sdk_api,xmlfd))

-$(eval $(call gb_Library_set_include,xmlfd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,xmlfd,\
 	ucbhelper \
 	cppuhelper \
--- a/filter/Library_xsltfilter.mk
+++ b/filter/Library_xsltfilter.mk
@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,xsltfilter,filter/source/xsltfilter/x

 $(eval $(call gb_Library_use_sdk_api,xsltfilter))

-$(eval $(call gb_Library_set_include,xsltfilter,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,xsltfilter,\
 	xo \
 	tl \
--- a/hwpfilter/Library_hwp.mk
+++ b/hwpfilter/Library_hwp.mk
@ -27,10 +27,6 @@

 $(eval $(call gb_Library_Library,hwp))

-$(eval $(call gb_Library_set_include,hwp,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,hwp))

 $(eval $(call gb_Library_use_libraries,hwp,\
--- a/i18npool/Executable_genconv_dict.mk
+++ b/i18npool/Executable_genconv_dict.mk
@ -28,10 +28,6 @@

 $(eval $(call gb_Executable_Executable,genconv_dict))

-$(eval $(call gb_Executable_set_include,genconv_dict,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,genconv_dict,\
 	sal \
 	$(gb_UWINAPI) \
--- a/i18npool/Executable_gendict.mk
+++ b/i18npool/Executable_gendict.mk
@ -28,10 +28,6 @@

 $(eval $(call gb_Executable_Executable,gendict))

-$(eval $(call gb_Executable_set_include,gendict,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,gendict,\
 	sal \
 	$(gb_UWINAPI) \
--- a/i18npool/Executable_genindex_data.mk
+++ b/i18npool/Executable_genindex_data.mk
@ -28,10 +28,6 @@

 $(eval $(call gb_Executable_Executable,genindex_data))

-$(eval $(call gb_Executable_set_include,genindex_data,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,genindex_data,\
 	sal \
 	$(gb_UWINAPI) \
--- a/i18npool/Executable_saxparser.mk
+++ b/i18npool/Executable_saxparser.mk
@ -28,10 +28,6 @@

 $(eval $(call gb_Executable_Executable,saxparser))

-$(eval $(call gb_Executable_set_include,saxparser,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_sdk_api,saxparser))

 $(eval $(call gb_Executable_use_libraries,saxparser,\
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@ -32,10 +32,6 @@ $(eval $(call gb_Library_use_package,i18nsearch,i18npool_inc))

 $(eval $(call gb_Library_set_componentfile,i18nsearch,i18npool/source/search/i18nsearch))

-$(eval $(call gb_Library_set_include,i18nsearch,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,i18nsearch))

 $(eval $(call gb_Library_use_externals,i18nsearch,\
--- a/ios/Executable_Viewer.mk
+++ b/ios/Executable_Viewer.mk
@ -12,10 +12,6 @@ $(eval $(call gb_Executable_use_externals,Viewer,\
    zlib \
 ))

-$(eval $(call gb_Executable_set_include,Viewer,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_system_darwin_frameworks,Viewer,\
    Foundation \
    CoreFoundation \
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@ -27,10 +27,6 @@

 $(eval $(call gb_Library_Library,lwpft))

-$(eval $(call gb_Library_set_include,lwpft,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,lwpft))

 $(eval $(call gb_Library_use_libraries,lwpft,\
--- a/padmin/Executable_spadmin.bin.mk
+++ b/padmin/Executable_spadmin.bin.mk
@ -19,10 +19,6 @@

 $(eval $(call gb_Executable_Executable,spadmin.bin))

-$(eval $(call gb_Executable_set_include,spadmin.bin,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_external,spadmin.bin,boost_headers))

 $(eval $(call gb_Executable_use_static_libraries,spadmin.bin,\
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@ -27,10 +27,6 @@

 $(eval $(call gb_Library_Library,OGLTrans))

-$(eval $(call gb_Library_set_include,OGLTrans,\
-    $$(INCLUDE) \
-))
-
 ifeq ($(strip $(VERBOSE)),TRUE)
 $(eval $(call gb_Library_add_defs,OGLTrans,\
    -DVERBOSE \
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@ -35,10 +35,6 @@ $(eval $(call gb_Executable_set_include,$(svx_GENGALBIN),\
    -I$(OUTDIR)/inc/offapi \
 ))

-$(eval $(call gb_Executable_add_cxxflags,$(svx_GENGALBIN),\
-    $$(CXXFLAGS) \
-))
-
 $(eval $(call gb_Executable_use_external,$(svx_GENGALBIN),boost_headers))

 $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@ -21,10 +21,6 @@ $(eval $(call gb_Library_Library,unordf))

 $(eval $(call gb_Library_set_componentfile,unordf,unoxml/source/rdf/unordf))

-$(eval $(call gb_Library_set_include,unordf,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,unordf))

 $(eval $(call gb_Library_use_libraries,unordf,\
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@ -21,10 +21,6 @@ $(eval $(call gb_Library_Library,unoxml))

 $(eval $(call gb_Library_set_componentfile,unoxml,unoxml/source/service/unoxml))

-$(eval $(call gb_Library_set_include,unoxml,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,unoxml))

 $(eval $(call gb_Library_use_libraries,unoxml,\
--- a/vbahelper/Library_msforms.mk
+++ b/vbahelper/Library_msforms.mk
@ -35,11 +35,6 @@ $(eval $(call gb_Library_Library,msforms))
 # in case UNO services are exported: declare location of component file
 $(eval $(call gb_Library_set_componentfile,msforms,vbahelper/util/msforms))

-# add any additional include paths for this library here
-$(eval $(call gb_Library_set_include,msforms,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_external,msforms,boost_headers))

 $(eval $(call gb_Library_use_api,msforms,\
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@ -33,11 +33,6 @@ $(eval $(call gb_Library_use_package,vbahelper,vbahelper_inc))
 # in case UNO services are exported: declare location of component file
 #$(eval $(call gb_Library_set_componentfile,vbahelper,vbahelper/COMPONENT_FILE))

-# add any additional include paths for this library here
-$(eval $(call gb_Library_set_include,vbahelper,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_add_defs,vbahelper,\
    -DVBAHELPER_DLLIMPLEMENTATION \
 ))
--- a/vcl/Executable_ui-previewer.mk
+++ b/vcl/Executable_ui-previewer.mk
@ -27,10 +27,6 @@

 $(eval $(call gb_Executable_Executable,ui-previewer))

-$(eval $(call gb_Executable_set_include,ui-previewer,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_external,ui-previewer,boost_headers))

 $(eval $(call gb_Executable_use_api,ui-previewer,\
--- a/xmlsecurity/CppunitTest_qa_certext.mk
+++ b/xmlsecurity/CppunitTest_qa_certext.mk
@ -28,10 +28,6 @@

 $(eval $(call gb_CppunitTest_CppunitTest,xmlsecurity_qa_certext))

-$(eval $(call gb_CppunitTest_set_include,xmlsecurity_qa_certext,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,xmlsecurity_qa_certext,\
 	offapi \
 	udkapi \