From 97e7f62481d8d3b6653f292c5069df133c684f3e Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Thu, 27 Sep 2012 21:23:03 +0200
Subject: move ucpp definitions into gbuild.mk (as e.g.xsltproc)

Change-Id: Ib59ca9ac4d88db6e009c656e31ee866f4d9818e9
---
 solenv/gbuild/UnoApiTarget.mk | 3 ---
 solenv/gbuild/gbuild.mk       | 8 ++++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'solenv/gbuild')

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 7e2ea1370f85..a4c6e19f7668 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -30,9 +30,6 @@
 
 gb_UnoApiPartTarget_IDLCTARGET := $(call gb_Executable_get_target_for_build,idlc)
 gb_UnoApiPartTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiPartTarget_IDLCTARGET)
-ifeq (,$(SYSTEM_UCPP))
-gb_UnoApiPartTarget_UCPPTARGET := $(call gb_Executable_get_target_for_build,ucpp)
-endif
 
 # The .urd files are actually created by the gb_UnoApiPartTarget__command,
 # invoked for the per-directory .done files.
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index ee2f985ec1d7..2a51440610ba 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -404,6 +404,14 @@ gb_PYTHONTARGET := $(call gb_Executable_get_target_for_build,python)
 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
+
 .PHONY: help
 help:
 	@cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
-- 
cgit