diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-31 14:02:40 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-31 15:42:24 +0000 |
| commit | 5d8f48c81eac8650315b936d0e89ad1d54b566fc (patch) | |
| tree | d13a700e9c6dfb72609a8331bbe55af5d8b866b3 /solenv/gbuild/LinkTarget.mk | |
| parent | DOCX filter: roundtrip more table cell border properties for table styles (diff) | |
| download | core-5d8f48c81eac8650315b936d0e89ad1d54b566fc.tar.gz core-5d8f48c81eac8650315b936d0e89ad1d54b566fc.zip | |
solver doesn't solve anything...
... it is an abbreviation of "Solar Version".
Since nobody can remember that:
remove OUTDIR OUTDIR_FOR_BUILD SOLARVER SOLARVERSION solarpath
and any mention thereof.
Change-Id: Idb3031c4f25a76ac05b22ec67e3ca3e1e8e512ad
Reviewed-on: https://gerrit.libreoffice.org/6515
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv/gbuild/LinkTarget.mk')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index b6d2ecf4259a..9669a5608849 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -508,8 +508,8 @@ $(WORKDIR)/Headers/% : # Explanation of some of the targets: # - gb_LinkTarget_get_headers_target is the target that guarantees all headers -# from the linked against the libraries and the linktargets own headers -# (including generated headers) are in the OUTDIR. +# from the linked against libraries and the linktargets own generated headers +# are generated. # - gb_LinkTarget_get_target links the objects into a file in WORKDIR. # gb_LinkTarget_get_target depends on gb_LinkTarget_get_headers_target. # gb_LinkTarget_get_target depends additionally on the objects, which in turn @@ -756,7 +756,7 @@ endef # call gb_LinkTarget_set_include,linktarget,includes define gb_LinkTarget_set_include $(call gb_LinkTarget__check_srcdir_paths,$(1),\ - $(patsubst -I%,%,$(filter -I$(SRCDIR)/%,$(filter-out -I$(OUTDIR)/% -I$(WORKDIR)/%,$(2))))) + $(patsubst -I%,%,$(filter -I$(SRCDIR)/%,$(filter-out -I$(WORKDIR)/%,$(2))))) $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2) ifeq ($(gb_FULLDEPS),$(true)) @@ -1392,7 +1392,7 @@ $$(call gb_Output_error,\ gb_LinkTarget_add_precompiled_header: use gb_LinkTarget_set_precompiled_header instead.) endef -# use a header package, possibly from another module (i.e. via OUTDIR) +# use a header package, possibly from another module # call gb_LinkTarget_use_package,linktarget,package define gb_LinkTarget_use_package $(call gb_LinkTarget_get_headers_target,$(1)) :| \ |