Kaydet (Commit) 7ff14a59 authored tarafından Herbert Dürr's avatar Herbert Dürr

ause130: #i117218# don't export INCLUDE in a local makefile.mk

To fix the build on some windows machines where exporting the changed INCLUDE paths messes things up.

Merged from revision 1409408 of https://svn.apache.org/repos/asf/incubator/ooo/branches/gbuild:
# HG changeset patch
# User Hans-Joachim Lankenau <hjs@openoffice.org>
# Date 1300125618 -3600
# Node ID b4abd2828ea57472570b5b6ed991baf114e0f48f
# Parent  f53b9337ae7a62b654cd60701660dfc7cf008aab
üst 42e1dd3c
...@@ -97,7 +97,6 @@ DEF1EXPORTFILE=exports.dxp ...@@ -97,7 +97,6 @@ DEF1EXPORTFILE=exports.dxp
.INCLUDE : target.mk .INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE)) INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
......
...@@ -63,7 +63,6 @@ SLOFILES_X64=$(SLO_X64)$/xml_parser.obj ...@@ -63,7 +63,6 @@ SLOFILES_X64=$(SLO_X64)$/xml_parser.obj
.INCLUDE : target.mk .INCLUDE : target.mk
.IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT"
INCLUDE!:=$(subst,/stl, $(INCLUDE)) INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
.ENDIF .ENDIF
.INCLUDE : tg_wntx64.mk .INCLUDE : tg_wntx64.mk
...@@ -79,7 +79,7 @@ LIB1FILES_X64=$(SLB_X64)$/zipfile.lib\ ...@@ -79,7 +79,7 @@ LIB1FILES_X64=$(SLB_X64)$/zipfile.lib\
.INCLUDE : target.mk .INCLUDE : target.mk
.IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT"
INCLUDE!:=$(subst,/stl, $(INCLUDE)) INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
.ENDIF .ENDIF
.INCLUDE : tg_wntx64.mk .INCLUDE : tg_wntx64.mk
...@@ -48,7 +48,7 @@ SLOFILES_X64=$(SLO_X64)$/zipfile.obj\ ...@@ -48,7 +48,7 @@ SLOFILES_X64=$(SLO_X64)$/zipfile.obj\
.INCLUDE : target.mk .INCLUDE : target.mk
.IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT"
INCLUDE!:=$(subst,/stl, $(INCLUDE)) INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
.ENDIF .ENDIF
.INCLUDE : tg_wntx64.mk .INCLUDE : tg_wntx64.mk
...@@ -61,7 +61,7 @@ DEF1EXPORTFILE= exports.dxp ...@@ -61,7 +61,7 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : target.mk .INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE)) INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
ALLTAR : $(MISC)/syssh.component ALLTAR : $(MISC)/syssh.component
......
...@@ -51,5 +51,5 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj ...@@ -51,5 +51,5 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.INCLUDE : set_wntx64.mk .INCLUDE : set_wntx64.mk
.INCLUDE : target.mk .INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE)) INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
.INCLUDE : tg_wntx64.mk .INCLUDE : tg_wntx64.mk
\ No newline at end of file
...@@ -52,5 +52,5 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj ...@@ -52,5 +52,5 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.INCLUDE : set_wntx64.mk .INCLUDE : set_wntx64.mk
.INCLUDE : target.mk .INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE)) INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
.INCLUDE : tg_wntx64.mk .INCLUDE : tg_wntx64.mk
\ No newline at end of file
...@@ -148,6 +148,6 @@ DEF1EXPORTFILE_X64=exports.dxp ...@@ -148,6 +148,6 @@ DEF1EXPORTFILE_X64=exports.dxp
.INCLUDE : set_wntx64.mk .INCLUDE : set_wntx64.mk
.INCLUDE : target.mk .INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE)) INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
.INCLUDE : tg_wntx64.mk .INCLUDE : tg_wntx64.mk
...@@ -133,5 +133,5 @@ DEF1EXPORTFILE_X64=exports.dxp ...@@ -133,5 +133,5 @@ DEF1EXPORTFILE_X64=exports.dxp
.INCLUDE : set_wntx64.mk .INCLUDE : set_wntx64.mk
.INCLUDE : target.mk .INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE)) INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
.INCLUDE : tg_wntx64.mk .INCLUDE : tg_wntx64.mk
...@@ -134,5 +134,5 @@ DEF1EXPORTFILE_X64=exports.dxp ...@@ -134,5 +134,5 @@ DEF1EXPORTFILE_X64=exports.dxp
.INCLUDE : set_wntx64.mk .INCLUDE : set_wntx64.mk
.INCLUDE : target.mk .INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE)) INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
.INCLUDE : tg_wntx64.mk .INCLUDE : tg_wntx64.mk
...@@ -57,5 +57,5 @@ SLOFILES_X64=$(SLO_X64)$/propsheets.obj\ ...@@ -57,5 +57,5 @@ SLOFILES_X64=$(SLO_X64)$/propsheets.obj\
.INCLUDE : set_wntx64.mk .INCLUDE : set_wntx64.mk
.INCLUDE : target.mk .INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE)) INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
.INCLUDE : tg_wntx64.mk .INCLUDE : tg_wntx64.mk
\ No newline at end of file
...@@ -53,6 +53,6 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj ...@@ -53,6 +53,6 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj
.INCLUDE : set_wntx64.mk .INCLUDE : set_wntx64.mk
.INCLUDE : target.mk .INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE)) INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
.INCLUDE : tg_wntx64.mk .INCLUDE : tg_wntx64.mk
...@@ -59,6 +59,6 @@ SLOFILES_X64=$(SLO_X64)$/dbgmacros.obj\ ...@@ -59,6 +59,6 @@ SLOFILES_X64=$(SLO_X64)$/dbgmacros.obj\
.INCLUDE : set_wntx64.mk .INCLUDE : set_wntx64.mk
.INCLUDE : target.mk .INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE)) INCLUDE!:=$(subst,/stl, $(INCLUDE))
.EXPORT : INCLUDE
.INCLUDE : tg_wntx64.mk .INCLUDE : tg_wntx64.mk
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment