diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-10 13:34:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-10 13:36:20 +0100 |
| commit | c1bd2a254b4a22a02d515b084dabafe963f175ff (patch) | |
| tree | 775c3a011465fa4884639d1630b99a010da55458 /solenv/gbuild/ComponentTarget.mk | |
| parent | 32e173b865619ff7b8a55ef49dab0cb15496b174 (diff) | |
New LO_{LIB,JAVA}_DIR make special inbuild component handling superfluous.
Diffstat (limited to 'solenv/gbuild/ComponentTarget.mk')
| -rw-r--r-- | solenv/gbuild/ComponentTarget.mk | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index 47b9f0f2b616..f84072666cd1 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -43,16 +43,8 @@ $(call gb_ComponentTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),CMP,1) rm -f $(call gb_ComponentTarget_get_outdir_target,$*) \ $(call gb_ComponentTarget_get_target,$*) \ - $(call gb_ComponentTarget_get_outdir_inbuild_target,$*) \ - $(call gb_ComponentTarget_get_inbuild_target,$*) \ -# creates 2 componentfiles: the first is for the installation set, -# the second is for using the component during the build. -# bit of a hack, hopefully inbuild can be removed when solver layout is fixed. -$(call gb_ComponentTarget_get_inbuild_target,%) : $(call gb_ComponentTarget_get_source,$(SRCDIR),%) | $(gb_XSLTPROCTARGET) - $(call gb_ComponentTarget__command,$@,$<,$*) - $(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$(SRCDIR),%) | $(gb_XSLTPROCTARGET) $(call gb_ComponentTarget__command,$@,$<,$*) @@ -65,12 +57,8 @@ $(call gb_ComponentTarget_get_outdir_target,%) : define gb_ComponentTarget_ComponentTarget $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3) -$(call gb_ComponentTarget_get_inbuild_target,$(1)) : COMPONENTPREFIX := $(call gb_Library__get_layer_componentprefix,NONE) -$(call gb_ComponentTarget_get_inbuild_target,$(1)) : LIBFILENAME := $(3) $(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(1)) -$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)) : $(call gb_ComponentTarget_get_inbuild_target,$(1)) $(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1)) -$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_inbuild_target,$(1)),$(call gb_ComponentTarget_get_inbuild_target,$(1)),$(1)) endef |