[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/UnoApiTarget.mk |    2 +-
 solenv/gbuild/gbuild.mk       |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 72846a5c528cf66f01036978bf77eabc9f039025
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Sep 28 00:39:43 2012 +0200

    and also use new gb_UCPPTARGET; gb_UCPP unused
    
    Change-Id: I8cd066e61cdfdef65385a2482f1a8f0aa1fb90cb

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index a4c6e19..fd7a0a3 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -69,7 +69,7 @@ endef
 
 $(call gb_UnoApiPartTarget_get_target,%.done) : \
 		$(gb_UnoApiPartTarget_IDLCTARGET) \
-		| $(gb_UnoApiPartTarget_UCPPTARGET)
+		| $(gb_UCPPTARGET)
 	$(call gb_UnoApiPartTarget__command,$@,$*,$(filter-out $(gb_UnoApiPartTarget_IDLCTARGET),$?))
 
 ifeq ($(gb_FULLDEPS),$(true))
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 2a51440..85f2956 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -405,10 +405,8 @@ gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET)
 endif
 
 ifneq (,$(SYSTEM_UCPP))
-gb_UCPP := $(SYSTEM_UCPP)
 gb_UCPPTARGET :=
 else
-gb_UCPP := ucpp
 gb_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp)
 endif