summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-08-08 20:34:14 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-08-09 16:16:50 +0200
commit82d8a500448fd5a5ed77a90dfd2dd79163c7979d (patch)
treeb5dbc17312c12888194987dd56f407476ecfae94 /solenv
parent589ca848c2170ce1a67a33ad3a19a71d8d606e64 (diff)
clean this out
Change-Id: Ia9724221778437b7d767c536953074ce3d4ad198
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/ComponentTarget.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 31dd441a528c..e99ffababcf5 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -27,7 +27,7 @@
#*************************************************************************
gb_ComponentTarget_XSLTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt
-gb_ComponentTarget_get_source = $(1)/$(2).component
+gb_ComponentTarget_get_source = $(SRCDIR)/$(1).component
# In the DISABLE_DYNLOADING case we don't need any COMPONENTPREFIX, we
# put just the static library filename into the uri parameter. For
@@ -52,12 +52,9 @@ $(call gb_ComponentTarget_get_clean_target,%) :
$(call gb_ComponentTarget_get_target,%) : \
- $(call gb_ComponentTarget_get_source,$(SRCDIR),%) $(gb_XSLTPROCTARGET)
+ $(call gb_ComponentTarget_get_source,%) $(gb_XSLTPROCTARGET)
$(call gb_ComponentTarget__command,$@,$<,$*)
-$(call gb_ComponentTarget_get_target,%) :
- $(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xsltproc is missing.))
-
# the .dir is for make 3.81, which ignores trailing /
$(dir $(call gb_ComponentTarget_get_outdir_target,))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))