diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-28 00:39:43 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-28 00:39:43 +0200 |
| commit | 72846a5c528cf66f01036978bf77eabc9f039025 (patch) | |
| tree | d942c1a1cae55b7f4e280fa83b1089647c86d8c2 | |
| parent | 39157dfbcb96d3df7a90c1819d0f5492a1c05d6b (diff) | |
and also use new gb_UCPPTARGET; gb_UCPP unused
Change-Id: I8cd066e61cdfdef65385a2482f1a8f0aa1fb90cb
| -rw-r--r-- | solenv/gbuild/UnoApiTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index a4c6e19f7668..fd7a0a333a59 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 2a51440610ba..85f29564b3be 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 |