diff options
| -rw-r--r-- | Repository.mk | 35 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 22 |
2 files changed, 40 insertions, 17 deletions
diff --git a/Repository.mk b/Repository.mk index 2ea8de9dd2ad..e73b0eb29018 100644 --- a/Repository.mk +++ b/Repository.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ g2g \ )) -gb_Library_OOOLIBS +=\ +$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ avmedia \ basegfx \ cui \ @@ -74,51 +74,54 @@ gb_Library_OOOLIBS +=\ xo \ xof \ xcr \ +)) -gb_Library_PLAINLIBS_URE +=\ +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ xml2 \ +)) -gb_Library_PLAINLIBS_OOO +=\ +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ icuuc \ +)) -# => OOOLIB -gb_Library_RTLIBS +=\ +$(eval $(call gb_Helper_register_libraries,RTLIBS, \ comphelper \ i18nisolang1 \ i18nutil \ ucbhelper \ vos3 \ +)) -# => URELIB -gb_Library_RTVERLIBS +=\ +$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ cppuhelper \ salhelper \ +)) -# => URELIB -gb_Library_STLLIBS +=\ +$(eval $(call gb_Helper_register_libraries,STLLIBS, \ stl \ +)) -gb_Library_UNOLIBS_URE +=\ - -gb_Library_UNOLIBS_OOO +=\ +$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ fsstorage \ hatchwindowfactory \ passwordcontainer \ productregistration \ vbaswobj \ +)) -# => URELIB -gb_Library_UNOVERLIBS +=\ +$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ cppu \ jvmfwk \ sal \ +)) -gb_StaticLibrary_PLAINLIBS +=\ +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ jpeglib \ ooopathutils \ salcpprt \ zlib \ - +)) + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 94869a770daf..40b944e212b9 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -126,11 +126,12 @@ endef define gb_Helper_add_repositories $(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo))) + endef define gb_Helper_init_registries gb_Executable_VALIDLAYERS := UREBIN SDK OOO BRAND NONE -gb_Library_VALIDLAYERS := PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS STLLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS +gb_Library_VALIDLAYERS := OOOLIBS PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS STLLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS gb_StaticLibrary_VALIDLAYERS := PLAINLIBS gb_Library_NAMESCHEMES := OOO PLAIN RT RTVER STL UNO UNOVER gb_StaticLibrary_NAMESCHEMES := PLAIN @@ -167,6 +168,25 @@ $$(error $(1) is not a valid layer for executables. Valid layers are: $$(gb_Exec endif gb_Executable_$(1) += $(2) + +endef + +define gb_Helper_register_libraries +ifeq ($$(filter $(1),$$(gb_Library_VALIDLAYERS)),) +$$(error $(1) is not a valid layer for layer. Valid layers are: $$(gb_Library_VALIDLAYERS)) +endif + +gb_Library_$(1) += $(2) + +endef + +define gb_Helper_register_static_libraries +ifeq ($$(filter $(1),$$(gb_StaticLibrary_VALIDLAYERS)),) +$$(error $(1) is not a valid layer for layer. Valid layers are: $$(gb_StaticLibrary_VALIDLAYERS)) +endif + +gb_StaticLibrary_$(1) += $(2) + endef # vim: set noet sw=4 ts=4: |