Kaydet (Commit) 3fc40953 authored tarafından Peter Foley's avatar Peter Foley

fix gbuildized cli_ure

Change-Id: I3e02afbd1b75641bdc90443e7c07018c113a971a
üst 378b578f
...@@ -32,4 +32,8 @@ $(eval $(call gb_CliLibrary_add_generated_csfiles,cli_basetypes,\ ...@@ -32,4 +32,8 @@ $(eval $(call gb_CliLibrary_add_generated_csfiles,cli_basetypes,\
CustomTarget/cli_ure/source/basetypes/assembly \ CustomTarget/cli_ure/source/basetypes/assembly \
)) ))
$(eval $(call gb_CliLibrary_use_package,cli_basetypes,\
cli_ure_cliuno \
))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -15,7 +15,7 @@ $(eval $(call gb_CliNativeLibrary_wrap_library,cli_cppuhelper,cli_cppuhelper_nat ...@@ -15,7 +15,7 @@ $(eval $(call gb_CliNativeLibrary_wrap_library,cli_cppuhelper,cli_cppuhelper_nat
$(eval $(call gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config)) $(eval $(call gb_CliNativeLibrary_set_configfile,cli_cppuhelper,cli_ure/source/native/cli_cppuhelper_config))
$(eval $(call gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(SRCDIR)/cli_ure/source/clinuo.snk)) $(eval $(call gb_CliNativeLibrary_set_keyfile,cli_cppuhelper,$(SRCDIR)/cli_ure/source/cliuno.snk))
$(eval $(call gb_CliNativeLibrary_set_policy,cli_cppuhelper,$(CLI_CPPUHELPER_POLICY_ASSEMBLY),$(CLI_CPPUHELPER_POLICY_VERSION))) $(eval $(call gb_CliNativeLibrary_set_policy,cli_cppuhelper,$(CLI_CPPUHELPER_POLICY_ASSEMBLY),$(CLI_CPPUHELPER_POLICY_VERSION)))
......
...@@ -21,4 +21,6 @@ $(eval $(call gb_CliUnoApi_set_policy,cli_uretypes,$(CLI_URETYPES_POLICY_ASSEMBL ...@@ -21,4 +21,6 @@ $(eval $(call gb_CliUnoApi_set_policy,cli_uretypes,$(CLI_URETYPES_POLICY_ASSEMBL
$(eval $(call gb_CliUnoApi_wrap_api,cli_uretypes,udkapi)) $(eval $(call gb_CliUnoApi_wrap_api,cli_uretypes,udkapi))
$(call gb_CliUnoApiTarget_get_target,cli_uretypes) :| $(call gb_Library_get_target,bootstrap)
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
cli_ure_source_MAKEFILE := $(lastword $(MAKEFILE_LIST)) cli_ure_source_MAKEFILE := $(lastword $(MAKEFILE_LIST))
# FIXME move this to configure.in ? # FIXME move this to configure.in ?
cli_ure_CCNUMVER = $(shell $(CXX) | $(gb_AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk) cli_ure_CCNUMVER = $(shell PATH='$(PATH)' $(CXX) | $(gb_AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk)
cli_ure_CCNUMVER_GOOD = $(shell expr $(cli_ure_CCNUMVER) '>=' 001399999999) cli_ure_CCNUMVER_GOOD = $(shell expr $(cli_ure_CCNUMVER) '>=' 001399999999)
include $(SRCDIR)/cli_ure/version/version.txt include $(SRCDIR)/cli_ure/version/version.txt
......
...@@ -81,6 +81,11 @@ $(call gb_CliLibraryTarget_get_target,$(1)) : $(call gb_CliLibrary_get_target,$( ...@@ -81,6 +81,11 @@ $(call gb_CliLibraryTarget_get_target,$(1)) : $(call gb_CliLibrary_get_target,$(
endef endef
define gb_CliLibraryTarget_use_package
$(call gb_CliLibraryTarget_get_target,$(1)) :| $(call gb_Package_get_target,$(strip $(2)))
endef
define gb_CliLibraryTarget_use_assemblies define gb_CliLibraryTarget_use_assemblies
$(foreach assembly,$(2),$(call gb_CliLibraryTarget_use_assembly,$(1),$(assembly))) $(foreach assembly,$(2),$(call gb_CliLibraryTarget_use_assembly,$(1),$(assembly)))
...@@ -146,6 +151,11 @@ $(call gb_CliAssembly_set_configfile,$(1),$(2)) ...@@ -146,6 +151,11 @@ $(call gb_CliAssembly_set_configfile,$(1),$(2))
endef endef
define gb_CliLibrary_use_package
$(call gb_CliLibraryTarget_use_package,$(1),$(2))
endef
define gb_CliLibrary_set_keyfile define gb_CliLibrary_set_keyfile
$(call gb_CliAssembly_set_keyfile,$(1),$(2)) $(call gb_CliAssembly_set_keyfile,$(1),$(2))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment