[Libreoffice-commits] .: cli_ure/CliLibrary_cli_basetypes.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/CliUnoApi_cli_uretypes.mk          |    2 --
 cli_ure/CustomTarget_cli_ure_assemblies.mk |    2 +-
 solenv/gbuild/CliLibrary.mk                |   10 ----------
 4 files changed, 1 insertion(+), 17 deletions(-)

New commits:
commit 68d6252312a75627c51f1da45f8e01fedf0f3c60
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Oct 7 20:00:38 2012 +0200

    most of this is not necessary anymore
    
    This reverts commit 3fc40953c635185f8bcd1b58a1d68d28526558d4.
    
    Change-Id: I6d11212cc260e03e5c83a0e7be93ed66e1ab452f

diff --git a/cli_ure/CliLibrary_cli_basetypes.mk b/cli_ure/CliLibrary_cli_basetypes.mk
index 2dcc2e1..2d7b937 100644
--- a/cli_ure/CliLibrary_cli_basetypes.mk
+++ b/cli_ure/CliLibrary_cli_basetypes.mk
@@ -32,8 +32,4 @@ $(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/CliUnoApi_cli_uretypes.mk b/cli_ure/CliUnoApi_cli_uretypes.mk
index 78de63a..5748523 100644
--- a/cli_ure/CliUnoApi_cli_uretypes.mk
+++ b/cli_ure/CliUnoApi_cli_uretypes.mk
@@ -21,6 +21,4 @@ $(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 2adeae8..da66178 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 PATH='$(PATH)' $(CXX) | $(gb_AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk)
+cli_ure_CCNUMVER = $(shell $(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 30a3c25..9cf6bd5 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -81,11 +81,6 @@ $(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)))
 
@@ -151,11 +146,6 @@ $(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))