mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnumake2: simplify repository setup

Browse Source
This commit is contained in:
Bjoern Michaelsen 2010-11-11 18:38:32 +01:00
parent c667c072b8
commit 6acfbf70fb
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Repository.mk
View File

@ -28,14 +28,7 @@
$(eval $(call gb_Helper_register_repository,SRCDIR)) $(eval $(call gb_Helper_register_repository,SRCDIR))
gb_Executable_UREBIN += $(eval $(call gb_Helper_register_executables,NONE, \
gb_Executable_SDK +=
gb_Executable_OOO +=
gb_Executable_BRAND +=
# not installed
gb_Executable_NONE +=\
mkunroll \ mkunroll \
rscdep \ rscdep \
so_checksum \ so_checksum \
@ -43,6 +36,7 @@ gb_Executable_NONE +=\
bmp \ bmp \
bmpsum \ bmpsum \
g2g \ g2g \
))
gb_Library_OOOLIBS +=\ gb_Library_OOOLIBS +=\
avmedia \ avmedia \

30
solenv/gbuild/Helper.mk
View File

@ -129,24 +129,16 @@ $(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo)))
endef endef
define gb_Helper_init_registries 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_StaticLibrary_VALIDLAYERS := PLAINLIBS
gb_Library_NAMESCHEMES := OOO PLAIN RT RTVER STL UNO UNOVER gb_Library_NAMESCHEMES := OOO PLAIN RT RTVER STL UNO UNOVER
gb_StaticLibrary_NAMESCHEMES := PLAIN gb_StaticLibrary_NAMESCHEMES := PLAIN
gb_Executable_UREBIN := $$(foreach layer,$$(gb_Executable_VALIDLAYERS),$$(eval gb_Executable_$$(layer) :=))
gb_Executable_SDK := $$(foreach layer,$$(gb_Library_VALIDLAYERS),$$(eval gb_Library_$$(layer) :=))
gb_Executable_OOO := $$(foreach layer,$$(gb_StaticLibrary_VALIDLAYERS),$$(eval gb_StaticLibrary_$$(layer) :=))
gb_Executable_BRAND :=
gb_Executable_NONE :=
gb_Library_OOOLIBS :=
gb_Library_PLAINLIBS_URE :=
gb_Library_PLAINLIBS_OOO :=
gb_Library_RTLIBS :=
gb_Library_RTVERLIBS :=
gb_Library_STLLIBS :=
gb_Library_UNOLIBS_URE :=
gb_Library_UNOLIBS_OOO :=
gb_Library_UNOVERLIBS :=
gb_StaticLibrary_PLAINLIBS :=
endef endef
define gb_Helper_collect_libtargets define gb_Helper_collect_libtargets
@ -169,4 +161,12 @@ gb_StaticLibrary_KNOWNLIBS := $$(foreach namescheme,$$(gb_StaticLibrary_NAMESCHE
endef endef
define gb_Helper_register_executables
ifeq ($$(filter $(1),$$(gb_Executable_VALIDLAYERS)),)
$$(error $(1) is not a valid layer for executables. Valid layers are: $$(gb_Executable_VALIDLAYERS))
endif
gb_Executable_$(1) += $(2)
endef
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: