diff options
70 files changed, 87 insertions, 71 deletions
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index fbd4ae9bfadf..7154286831bf 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,animcore)) -$(eval $(call gb_Library_add_package_headers,animcore,animations_inc)) +$(eval $(call gb_Library_use_package,animcore,animations_inc)) $(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore)) diff --git a/apple_remote/Library_AppleRemote.mk b/apple_remote/Library_AppleRemote.mk index b5acc0163012..37a19282e043 100644 --- a/apple_remote/Library_AppleRemote.mk +++ b/apple_remote/Library_AppleRemote.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,AppleRemote)) -$(eval $(call gb_Library_add_package_headers,AppleRemote,\ +$(eval $(call gb_Library_use_package,AppleRemote,\ apple_remote_inc \ )) diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 1565af5f4dbf..316b6d61c45c 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,avmedia)) -$(eval $(call gb_Library_add_package_headers,avmedia,avmedia_inc)) +$(eval $(call gb_Library_use_package,avmedia,avmedia_inc)) $(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia)) diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index 731d965ad982..f747d3d6764b 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,basebmp)) -$(eval $(call gb_Library_add_package_headers,basebmp,basebmp_inc)) +$(eval $(call gb_Library_use_package,basebmp,basebmp_inc)) $(eval $(call gb_Library_set_include,basebmp,\ -I$(SRCDIR)/basebmp/inc/ \ diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index 4e88a3e1ad10..64e5a10c3aa1 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,basegfx)) -$(eval $(call gb_Library_add_package_headers,basegfx,basegfx_inc)) +$(eval $(call gb_Library_use_package,basegfx,basegfx_inc)) $(eval $(call gb_Library_set_include,basegfx,\ -I$(SRCDIR)/basegfx/inc \ diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk index 70c5a07b6bd3..cbfe817fdf63 100644 --- a/basegfx/StaticLibrary_basegfx_s.mk +++ b/basegfx/StaticLibrary_basegfx_s.mk @@ -28,7 +28,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,basegfx_s)) -$(eval $(call gb_StaticLibrary_add_package_headers,basegfx_s,basegfx_inc)) +$(eval $(call gb_StaticLibrary_use_package,basegfx_s,basegfx_inc)) $(eval $(call gb_StaticLibrary_set_include,basegfx_s,\ -I$(SRCDIR)/basegfx/inc \ diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 91c0b39c9ad5..352f3e62efd4 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,sb)) -$(eval $(call gb_Library_add_package_headers,sb,basic_inc)) +$(eval $(call gb_Library_use_package,sb,basic_inc)) $(eval $(call gb_Library_set_componentfile,sb,basic/util/sb)) diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 4ab7ab86e885..558cd24d27e2 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,canvastools)) -$(eval $(call gb_Library_add_package_headers,canvastools,canvas_inc)) +$(eval $(call gb_Library_use_package,canvastools,canvas_inc)) $(eval $(call gb_Library_set_include,canvastools,\ $$(INCLUDE) \ diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk index eac57155d83a..8ac4dc731bb5 100644 --- a/clucene/Library_clucene.mk +++ b/clucene/Library_clucene.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,clucene)) $(eval $(call gb_Library_use_external,clucene,zlib)) -$(eval $(call gb_Library_add_package_headers,clucene,clucene_source)) +$(eval $(call gb_Library_use_package,clucene,clucene_source)) $(eval $(call gb_Library_set_warnings_not_errors,clucene)) diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk index 7627a9c5016e..2e46bfd2df4e 100644 --- a/comphelper/Library_comphelp.mk +++ b/comphelper/Library_comphelp.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,comphelper)) -$(eval $(call gb_Library_add_package_headers,comphelper,comphelper_inc)) +$(eval $(call gb_Library_use_package,comphelper,comphelper_inc)) $(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp)) diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk index ce2355b79a8b..367f322d00c9 100644 --- a/cppcanvas/Library_cppcanvas.mk +++ b/cppcanvas/Library_cppcanvas.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,cppcanvas)) -$(eval $(call gb_Library_add_package_headers,cppcanvas,cppcanvas_inc)) +$(eval $(call gb_Library_use_package,cppcanvas,cppcanvas_inc)) $(eval $(call gb_Library_set_include,cppcanvas,\ -I$(SRCDIR)/cppcanvas/inc \ diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index d1b527b24310..9dcb35a6af31 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,cppu)) $(eval $(call gb_Library_set_soversion_script,cppu,3,$(SRCDIR)/cppu/util/cppu.map)) # Unit tests depend on cppu_generated custom target -$(eval $(call gb_Library_add_package_headers,cppu,cppu_generated)) +$(eval $(call gb_Library_use_package,cppu,cppu_generated)) $(eval $(call gb_Library_set_include,cppu,\ $$(INCLUDE) \ diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index 3724459fc97a..c653f0482463 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -29,8 +29,10 @@ $(eval $(call gb_Library_Library,cppuhelper)) $(eval $(call gb_Library_set_soversion_script,cppuhelper,3,$(SRCDIR)/cppuhelper/source/gcc3.map)) -$(eval $(call gb_Library_add_package_headers,cppuhelper,cppuhelper_generated)) -$(eval $(call gb_Library_add_package_headers,cppuhelper,cppuhelper_inc)) +$(eval $(call gb_Library_use_packages,cppuhelper,\ + cppuhelper_generated \ + cppuhelper_inc \ +)) $(eval $(call gb_Library_set_include,cppuhelper,\ -I$(WORKDIR)/CustomTarget/cppuhelper/unotypes \ diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk index ee7489d30a47..0e71fd3d4a5d 100644 --- a/dbaccess/Library_dba.mk +++ b/dbaccess/Library_dba.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,dba)) -$(eval $(call gb_Library_add_package_headers,dba,\ +$(eval $(call gb_Library_use_package,dba,\ dbaccess_inc \ )) diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk index 82782079aee8..cb9dc74fdfb9 100644 --- a/dbaccess/Library_dbmm.mk +++ b/dbaccess/Library_dbmm.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,dbmm)) -$(eval $(call gb_Library_add_package_headers,dbmm,\ +$(eval $(call gb_Library_use_package,dbmm,\ dbaccess_inc \ )) diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk index d5d82eaf5c91..c6b0a808d286 100644 --- a/dbaccess/Library_sdbt.mk +++ b/dbaccess/Library_sdbt.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,sdbt)) -$(eval $(call gb_Library_add_package_headers,sdbt,\ +$(eval $(call gb_Library_use_package,sdbt,\ dbaccess_inc \ )) diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index ba17108db613..b50b4b96c58a 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,drawinglayer)) -$(eval $(call gb_Library_add_package_headers,drawinglayer,drawinglayer_inc)) +$(eval $(call gb_Library_use_package,drawinglayer,drawinglayer_inc)) $(eval $(call gb_Library_set_include,drawinglayer,\ $$(INCLUDE) \ diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk index 3f649dfde0ce..fb2193eecb99 100644 --- a/editeng/Library_editeng.mk +++ b/editeng/Library_editeng.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,editeng)) -$(eval $(call gb_Library_add_package_headers,editeng,editeng_inc)) +$(eval $(call gb_Library_use_package,editeng,editeng_inc)) $(eval $(call gb_Library_set_include,editeng,\ $$(INCLUDE) \ diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk index 0c08a802e107..e2e5eb2485b3 100644 --- a/filter/Library_msfilter.mk +++ b/filter/Library_msfilter.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_Library,msfilter)) -$(eval $(call gb_Library_add_package_headers,msfilter,filter_inc)) +$(eval $(call gb_Library_use_package,msfilter,filter_inc)) $(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter)) diff --git a/formula/Library_for.mk b/formula/Library_for.mk index 751194b37dbc..1c4852c4a67d 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,for)) -$(eval $(call gb_Library_add_package_headers,for,\ +$(eval $(call gb_Library_use_package,for,\ formula_inc \ )) diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 98774bb32317..9b15a2d2acf7 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,fwi)) -$(eval $(call gb_Library_add_package_headers,fwi,framework_inc)) +$(eval $(call gb_Library_use_package,fwi,framework_inc)) $(eval $(call gb_Library_add_defs,fwi,\ -DFWI_DLLIMPLEMENTATION \ diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk index 613548ecf252..2ed16de42769 100644 --- a/i18npool/Library_i18nisolang1.mk +++ b/i18npool/Library_i18nisolang1.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,i18nisolang1)) -$(eval $(call gb_Library_add_package_headers,i18nisolang1,i18npool_inc)) +$(eval $(call gb_Library_use_package,i18nisolang1,i18npool_inc)) $(eval $(call gb_Library_set_include,i18nisolang1,\ $$(INCLUDE) \ diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk index 88ddbe2a8a00..4194c53c5031 100644 --- a/i18npool/Library_i18nsearch.mk +++ b/i18npool/Library_i18nsearch.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,i18nsearch)) -$(eval $(call gb_Library_add_package_headers,i18nsearch,i18npool_inc)) +$(eval $(call gb_Library_use_package,i18nsearch,i18npool_inc)) $(eval $(call gb_Library_set_componentfile,i18nsearch,i18npool/source/search/i18nsearch)) diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk index 9b8b7dd1653d..216dbec10d93 100644 --- a/i18nutil/Library_i18nutil.mk +++ b/i18nutil/Library_i18nutil.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,i18nutil)) -$(eval $(call gb_Library_add_package_headers,i18nutil,i18nutil_inc)) +$(eval $(call gb_Library_use_package,i18nutil,i18nutil_inc)) $(eval $(call gb_Library_use_api,i18nutil,\ udkapi \ diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk index c72efbe70f4a..19297e7955ce 100644 --- a/javaunohelper/Library_juh.mk +++ b/javaunohelper/Library_juh.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,juh)) -$(eval $(call gb_Library_add_package_headers,juh,\ +$(eval $(call gb_Library_use_package,juh,\ javaunohelper_cppumaker \ )) diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk index cd21583ef9ff..f35ec61f949e 100644 --- a/javaunohelper/Library_juhx.mk +++ b/javaunohelper/Library_juhx.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,juhx)) -$(eval $(call gb_Library_add_package_headers,juhx,\ +$(eval $(call gb_Library_use_package,juhx,\ javaunohelper_cppumaker \ )) diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk index 904a61286900..d4227a78c259 100644 --- a/jvmaccess/Library_jvmaccess.mk +++ b/jvmaccess/Library_jvmaccess.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,jvmaccess)) $(eval $(call gb_Library_set_soversion_script,jvmaccess,3,$(SRCDIR)/jvmaccess/util/gcc3.map)) -$(eval $(call gb_Library_add_package_headers,jvmaccess,\ +$(eval $(call gb_Library_use_package,jvmaccess,\ jvmaccess_inc \ )) diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index f1b67784ad2d..4dc9c092e792 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,jvmfwk)) $(eval $(call gb_Library_set_soversion_script,jvmfwk,3,$(SRCDIR)/jvmfwk/source/framework.map)) -$(eval $(call gb_Library_add_package_headers,jvmfwk,\ +$(eval $(call gb_Library_use_package,jvmfwk,\ jvmfwk_inc \ )) diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index 22984a83b538..f9a363bc7d99 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,lng)) -$(eval $(call gb_Library_add_package_headers,lng,linguistic_inc)) +$(eval $(call gb_Library_use_package,lng,linguistic_inc)) $(eval $(call gb_Library_set_componentfile,lng,linguistic/source/lng)) diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk index ff63293d140e..c65b961f6d34 100644 --- a/np_sdk/StaticLibrary_nputils.mk +++ b/np_sdk/StaticLibrary_nputils.mk @@ -27,7 +27,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,nputils)) -$(eval $(call gb_StaticLibrary_add_package_headers,nputils,np_sdk_inc)) +$(eval $(call gb_StaticLibrary_use_package,nputils,np_sdk_inc)) $(eval $(call gb_StaticLibrary_use_externals,nputils,\ mozilla_headers \ diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index 9eacbbbb7e5d..464a5e7539f5 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -28,7 +28,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,o3tl_tests)) -$(eval $(call gb_CppunitTest_add_package_headers,o3tl_tests,o3tl_inc)) +$(eval $(call gb_CppunitTest_use_package,o3tl_tests,o3tl_inc)) $(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\ sal \ diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk index 6ce8a469a4a8..886888bc21c4 100644 --- a/officecfg/CppunitTest_officecfg_cppheader_test.mk +++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk @@ -41,6 +41,6 @@ $(eval $(call gb_CppunitTest_use_api,officecfg_cppheader_test, \ udkapi \ )) -$(eval $(call gb_CppunitTest_add_package_headers,officecfg_cppheader_test,officecfg_cppheader)) +$(eval $(call gb_CppunitTest_use_package,officecfg_cppheader_test,officecfg_cppheader)) ## vim: set noet sw=4 ts=4: diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index 7eae4ec3e9ec..e6290e50d473 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,oox)) -$(eval $(call gb_Library_add_package_headers,oox,\ +$(eval $(call gb_Library_use_packages,oox,\ oox_inc \ oox_generated \ oox_source \ diff --git a/package/Library_package2.mk b/package/Library_package2.mk index 5be137e13ea4..223e280d2830 100644 --- a/package/Library_package2.mk +++ b/package/Library_package2.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,package2)) -$(eval $(call gb_Library_add_package_headers,package2,package_inc)) +$(eval $(call gb_Library_use_package,package2,package_inc)) $(eval $(call gb_Library_set_componentfile,package2,package/util/package2)) diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk index 8ef6f5cb4d5c..4599c7696d34 100644 --- a/regexp/Library_regexp.mk +++ b/regexp/Library_regexp.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,i18nregexp)) -$(eval $(call gb_Library_add_package_headers,i18nregexp,regexp_inc)) +$(eval $(call gb_Library_use_package,i18nregexp,regexp_inc)) $(eval $(call gb_Library_use_api,i18nregexp,\ offapi \ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index f0d3abbf59c9..0b6e30f55e06 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -29,8 +29,10 @@ $(eval $(call gb_Library_Library,sal)) $(eval $(call gb_Library_set_soversion_script,sal,3,$(SRCDIR)/sal/util/sal.map)) -$(eval $(call gb_Library_add_package_headers,sal,sal_generated)) -$(eval $(call gb_Library_add_package_headers,sal,sal_inc)) +$(eval $(call gb_Library_use_packages,sal,\ + sal_generated \ + sal_inc \ +)) $(eval $(call gb_Library_set_include,sal,\ $$(INCLUDE) \ diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk index 3ca32b975a44..f86043de65a2 100644 --- a/sal/StaticLibrary_salcpprt.mk +++ b/sal/StaticLibrary_salcpprt.mk @@ -27,7 +27,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt)) -$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,\ +$(eval $(call gb_StaticLibrary_use_packages,salcpprt,\ sal_generated \ sal_inc \ )) diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk index d2431c33c3d1..c9f7c8a1c49e 100644 --- a/salhelper/Library_salhelper.mk +++ b/salhelper/Library_salhelper.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,salhelper)) -$(eval $(call gb_Library_add_package_headers,salhelper,salhelper_inc)) +$(eval $(call gb_Library_use_package,salhelper,salhelper_inc)) $(eval $(call gb_Library_add_defs,salhelper,\ -DSALHELPER_DLLIMPLEMENTATION \ diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 585595aebbd4..08518e56022e 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,sax)) -$(eval $(call gb_Library_add_package_headers,sax,\ +$(eval $(call gb_Library_use_package,sax,\ sax_inc \ )) diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index 6ac26b88c7b9..f9d848b54058 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,sfx)) -$(eval $(call gb_Library_add_package_headers,sfx,\ +$(eval $(call gb_Library_use_packages,sfx,\ sfx2_inc \ sfx2_sdi \ )) diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index 57821c5725dd..bf1c0b5cad5d 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -27,7 +27,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,slideshow)) -$(eval $(call gb_CppunitTest_add_package_headers,slideshow,sd_qa_unit)) +$(eval $(call gb_CppunitTest_use_package,slideshow,sd_qa_unit)) $(eval $(call gb_CppunitTest_set_include,slideshow,\ $$(INCLUDE) \ diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index 07e83a845848..91e6a02d78fa 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Executable_Executable,demoshow)) -$(eval $(call gb_Executable_add_package_headers,demoshow,sd_qa_unit)) +$(eval $(call gb_Executable_use_package,demoshow,sd_qa_unit)) $(eval $(call gb_Executable_set_include,demoshow,\ $$(INCLUDE) \ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index be3c51d986f9..0709dc0ecd8f 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -282,6 +282,8 @@ $(eval $(foreach method,\ add_asmobject \ add_asmobjects \ add_package_headers \ + use_package \ + use_packages \ add_sdi_headers \ add_cflags \ set_cflags \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 3089924c4ccc..b0ba4c93f0e4 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -121,6 +121,8 @@ $(eval $(foreach method,\ add_custom_headers \ use_custom_headers \ add_package_headers \ + use_package \ + use_packages \ add_sdi_headers \ add_nativeres \ set_warnings_not_errors \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 177e07f3f9aa..a9c172047ca9 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -199,6 +199,7 @@ $(eval $(foreach method,\ use_custom_headers \ add_external_headers \ use_package \ + use_packages \ add_package_headers \ add_sdi_headers \ export_objects_list \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index b56456e6df0f..37e202523ad4 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1011,9 +1011,8 @@ $(foreach customtarget,$(2),$(call gb_LinkTarget__use_custom_headers,$(1),$(cust endef define gb_LinkTarget_add_package_headers -$(foreach package,$(2),$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_Package_get_target,$(package)))) -$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call gb_Package_get_clean_target,$(package))) - +$$(call gb_Output_error,\ + gb_LinkTarget_add_package_headers: use gb_LinkTarget_use_package instead.) endef # add SDI (svidl) headers @@ -1029,7 +1028,13 @@ endef # use a header package, possibly from another module (i.e. via OUTDIR) define gb_LinkTarget_use_package -$(call gb_LinkTarget_get_headers_target,$(1) : |$(call gb_Package_get_target,$(2))) +$(call gb_LinkTarget_get_headers_target,$(1) : | \ + $(call gb_Package_get_target,$(strip $(2)))) + +endef + +define gb_LinkTarget_use_packages +$(foreach package,$(2),$(call gb_LinkTarget_use_package,$(1),$(package))) endef # this forwards to functions that must be defined in RepositoryExternal.mk. diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index a437634ddf0d..27183c4e76bb 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -113,6 +113,8 @@ $(eval $(foreach method,\ add_custom_headers \ use_custom_headers \ add_package_headers \ + use_package \ + use_packages \ add_sdi_headers \ set_warnings_not_errors \ ,\ diff --git a/solenv/gbuild/templates/Library.mk b/solenv/gbuild/templates/Library.mk index 972ab8273428..6fa404bf38ad 100644 --- a/solenv/gbuild/templates/Library.mk +++ b/solenv/gbuild/templates/Library.mk @@ -33,7 +33,7 @@ $(eval $(call gb_Library_Library,LIB)) # declare packages that will be delivered before compilation of LIB # learn more about TYPE in the Package.mk template -$(eval $(call gb_Library_add_package_headers,LIB,MODULE_TYPE)) +$(eval $(call gb_Library_use_package,LIB,MODULE_TYPE)) # in case UNO services are exported: declare location of component file $(eval $(call gb_Library_set_componentfile,LIB,MODULE/COMPONENT_FILE)) diff --git a/solenv/gbuild/templates/StaticLibrary.mk b/solenv/gbuild/templates/StaticLibrary.mk index 0bee7b930ab8..2b9bac61568e 100644 --- a/solenv/gbuild/templates/StaticLibrary.mk +++ b/solenv/gbuild/templates/StaticLibrary.mk @@ -27,7 +27,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,LIB)) -$(eval $(call gb_StaticLibrary_add_package_headers,LIB,MODULE_inc)) +$(eval $(call gb_StaticLibrary_use_package,LIB,MODULE_inc)) $(eval $(call gb_StaticLibrary_add_exception_objects,LIB,\ )) diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk index 124c59277cec..5f620bc06fb2 100644 --- a/sot/Library_sot.mk +++ b/sot/Library_sot.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,sot)) -$(eval $(call gb_Library_add_package_headers,sot,sot_inc)) +$(eval $(call gb_Library_use_package,sot,sot_inc)) $(eval $(call gb_Library_set_componentfile,sot,sot/util/sot)) diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk index c4683a2c75b4..48a06d94f2a0 100644 --- a/svl/Library_fsstorage.mk +++ b/svl/Library_fsstorage.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,fsstorage)) -$(eval $(call gb_Library_add_package_headers,fsstorage,svl_inc)) +$(eval $(call gb_Library_use_package,fsstorage,svl_inc)) $(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage)) diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index aa3a940bfaf9..d09ad30b40d7 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,passwordcontainer)) -$(eval $(call gb_Library_add_package_headers,passwordcontainer,svl_inc)) +$(eval $(call gb_Library_use_package,passwordcontainer,svl_inc)) $(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer)) diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index a4f06c18df1b..35191e4f13cf 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,svl)) -$(eval $(call gb_Library_add_package_headers,svl,svl_inc)) +$(eval $(call gb_Library_use_package,svl,svl_inc)) $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl)) diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 73f1e212319d..7186bbad4e65 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,svt)) -$(eval $(call gb_Library_add_package_headers,svt,svtools_inc)) +$(eval $(call gb_Library_use_package,svt,svtools_inc)) $(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt)) diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index c1565f10202c..50ef4b2cea2c 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore)) $(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots)) -$(eval $(call gb_Library_add_package_headers,svxcore,\ +$(eval $(call gb_Library_use_packages,svxcore,\ svx_inc \ svx_sdi \ )) diff --git a/test/Library_test.mk b/test/Library_test.mk index f35d2b77b286..571d26ccd3d3 100644 --- a/test/Library_test.mk +++ b/test/Library_test.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,test)) -$(eval $(call gb_Library_add_package_headers,test,test_inc)) +$(eval $(call gb_Library_use_package,test,test_inc)) $(eval $(call gb_Library_add_defs,test,\ -DOOO_DLLIMPLEMENTATION_TEST \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 0518e7a6dacc..1ba1efd4164d 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,tk)) $(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk)) -$(eval $(call gb_Library_add_package_headers,tk,toolkit_inc)) +$(eval $(call gb_Library_use_package,tk,toolkit_inc)) $(eval $(call gb_Library_set_include,tk,\ $$(INCLUDE) \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index cddc0cc89774..2571031323ba 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,tl)) -$(eval $(call gb_Library_add_package_headers,tl,tools_inc)) +$(eval $(call gb_Library_use_package,tl,tools_inc)) $(eval $(call gb_Library_use_custom_headers,tl,tools/reversemap)) diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk index e32c947ded78..a656700245ae 100644 --- a/tools/StaticLibrary_ooopathutils.mk +++ b/tools/StaticLibrary_ooopathutils.mk @@ -28,7 +28,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils)) -$(eval $(call gb_StaticLibrary_add_package_headers,ooopathutils,tools_inc)) +$(eval $(call gb_StaticLibrary_use_package,ooopathutils,tools_inc)) $(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\ tools/source/misc/pathutils \ diff --git a/ucb/StaticLibrary_odma_lib.mk b/ucb/StaticLibrary_odma_lib.mk index d9e1fe4a0d73..d6100b621dfa 100644 --- a/ucb/StaticLibrary_odma_lib.mk +++ b/ucb/StaticLibrary_odma_lib.mk @@ -27,7 +27,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,odma_lib)) -$(eval $(call gb_StaticLibrary_add_package_headers,odma_lib,ucb_odma_inc)) +$(eval $(call gb_StaticLibrary_use_package,odma_lib,ucb_odma_inc)) $(eval $(call gb_StaticLibrary_use_api,odma_lib,\ offapi \ diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk index 3d93a1586e94..166226d616c4 100644 --- a/ucbhelper/Library_ucbhelper.mk +++ b/ucbhelper/Library_ucbhelper.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,ucbhelper)) -$(eval $(call gb_Library_add_package_headers,ucbhelper,ucbhelper_inc)) +$(eval $(call gb_Library_use_package,ucbhelper,ucbhelper_inc)) $(eval $(call gb_Library_set_include,ucbhelper,\ $$(INCLUDE) \ diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk index c23b1959ac3b..fc850fc584c9 100644 --- a/unotest/Library_unoexceptionprotector.mk +++ b/unotest/Library_unoexceptionprotector.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,unoexceptionprotector)) -$(eval $(call gb_Library_add_package_headers,unoexceptionprotector,unotest_inc)) +$(eval $(call gb_Library_use_package,unoexceptionprotector,unotest_inc)) $(eval $(call gb_Library_use_api,unoexceptionprotector,\ udkapi \ diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk index 96ad171aad80..0d3672e33fae 100644 --- a/unotest/Library_unotest.mk +++ b/unotest/Library_unotest.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_Library,unotest)) -$(eval $(call gb_Library_add_package_headers,unotest,unotest_inc)) +$(eval $(call gb_Library_use_package,unotest,unotest_inc)) $(eval $(call gb_Library_add_defs,unotest,\ -DOOO_DLLIMPLEMENTATION_UNOTEST \ diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index c6892994501f..da53b60443f5 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Library_Library,utl)) # declare packages that will be delivered before compilation of utl # learn more about TYPE in the Package.mk template -$(eval $(call gb_Library_add_package_headers,utl,unotools_inc)) +$(eval $(call gb_Library_use_package,utl,unotools_inc)) # in case UNO services are exported: declare location of component file $(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl)) diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk index 5c7f39ae75af..a18f06e6a482 100644 --- a/vbahelper/Library_vbahelper.mk +++ b/vbahelper/Library_vbahelper.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,vbahelper)) -$(eval $(call gb_Library_add_package_headers,vbahelper,vbahelper_inc)) +$(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)) diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index c6ab1adeadcf..df85604621cb 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,desktop_detector)) -#$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) +#$(eval $(call gb_Library_use_package,vcl,vcl_inc)) $(eval $(call gb_Library_set_include,desktop_detector,\ $$(INCLUDE) \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index d37a5bb7e80a..9020a6703986 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -42,7 +42,7 @@ else $(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx)) endif -$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc)) +$(eval $(call gb_Library_use_package,vcl,vcl_inc)) $(eval $(call gb_Library_use_custom_headers,vcl,vcl/generic/fontmanager)) diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 9fbfcdd5e877..bd3bdb066607 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,xo)) $(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo)) -$(eval $(call gb_Library_add_package_headers,xo,xmloff_inc)) +$(eval $(call gb_Library_use_package,xo,xmloff_inc)) $(eval $(call gb_Library_set_include,xo,\ -I$(SRCDIR)/xmloff/inc \ diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk index cd1065a98508..2e6b0bffbdd3 100644 --- a/xmlreader/Library_xmlreader.mk +++ b/xmlreader/Library_xmlreader.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,xmlreader)) -$(eval $(call gb_Library_add_package_headers,xmlreader,xmlreader_inc)) +$(eval $(call gb_Library_use_package,xmlreader,xmlreader_inc)) $(eval $(call gb_Library_add_defs,xmlreader,\ -DOOO_DLLIMPLEMENTATION_XMLREADER \ diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk index 89a45fbd9b66..91f46ee78dac 100644 --- a/xmlscript/Library_xcr.mk +++ b/xmlscript/Library_xcr.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Library_Library,xcr)) -$(eval $(call gb_Library_add_package_headers,xcr,xmlscript_inc)) +$(eval $(call gb_Library_use_package,xcr,xmlscript_inc)) $(eval $(call gb_Library_set_componentfile,xcr,xmlscript/util/xcr)) |