[Libreoffice-commits] .: cli_ure/CliLibrary_cli_basetypes.mk cli_ure/CliNativeLibrary_cli_cppuhelper.mk cli_ure/CliUnoApi_cli_uretypes.mk cli_ure/CustomTarget_cli_ure_assemblies.mk solenv/gbuild

[Libreoffice Gerrit user]

 cli_ure/CliLibrary_cli_basetypes.mk        |    4 ++++
 cli_ure/CliNativeLibrary_cli_cppuhelper.mk |    2 +-
 cli_ure/CliUnoApi_cli_uretypes.mk          |    2 ++
 cli_ure/CustomTarget_cli_ure_assemblies.mk |    2 +-
 solenv/gbuild/CliLibrary.mk                |   10 ++++++++++
 5 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 3fc40953c635185f8bcd1b58a1d68d28526558d4
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sun Sep 23 09:59:37 2012 -0400

    fix gbuildized cli_ure
    
    Change-Id: I3e02afbd1b75641bdc90443e7c07018c113a971a

diff --git a/cli_ure/CliLibrary_cli_basetypes.mk b/cli_ure/CliLibrary_cli_basetypes.mk
index 2d7b937..2dcc2e1 100644
--- a/cli_ure/CliLibrary_cli_basetypes.mk
+++ b/cli_ure/CliLibrary_cli_basetypes.mk
@@ -32,4 +32,8 @@ $(eval $(call gb_CliLibrary_add_generated_csfiles,cli_basetypes,\
 	CustomTarget/cli_ure/source/basetypes/assembly \
 ))
 
+$(eval $(call gb_CliLibrary_use_package,cli_basetypes,\
+	cli_ure_cliuno \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
index 8372f93..dfc52ba 100644
--- a/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
+++ b/cli_ure/CliNativeLibrary_cli_cppuhelper.mk
@@ -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_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)))
 
diff --git a/cli_ure/CliUnoApi_cli_uretypes.mk b/cli_ure/CliUnoApi_cli_uretypes.mk
index 5748523..78de63a 100644
--- a/cli_ure/CliUnoApi_cli_uretypes.mk
+++ b/cli_ure/CliUnoApi_cli_uretypes.mk
@@ -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))
 
+$(call gb_CliUnoApiTarget_get_target,cli_uretypes) :| $(call gb_Library_get_target,bootstrap)
+
 # vim: set noet sw=4 ts=4:
diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index da66178..2adeae8 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -10,7 +10,7 @@
 cli_ure_source_MAKEFILE := $(lastword $(MAKEFILE_LIST))
 
 # 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)
 
 include $(SRCDIR)/cli_ure/version/version.txt
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 9cf6bd5..30a3c25 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -81,6 +81,11 @@ $(call gb_CliLibraryTarget_get_target,$(1)) : $(call gb_CliLibrary_get_target,$(
 
 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
 $(foreach assembly,$(2),$(call gb_CliLibraryTarget_use_assembly,$(1),$(assembly)))
 
@@ -146,6 +151,11 @@ $(call gb_CliAssembly_set_configfile,$(1),$(2))
 
 endef
 
+define gb_CliLibrary_use_package
+$(call gb_CliLibraryTarget_use_package,$(1),$(2))
+
+endef
+
 define gb_CliLibrary_set_keyfile
 $(call gb_CliAssembly_set_keyfile,$(1),$(2))