diff options
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Executable.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 13 | ||||
| -rw-r--r-- | solenv/gbuild/StaticLibrary.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/templates/Library.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/templates/StaticLibrary.mk | 2 |
7 files changed, 18 insertions, 6 deletions
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,\ )) |