diff options
author | Herbert Dürr <hdu@apache.org> | 2013-01-03 11:16:56 +0000 |
---|---|---|
committer | Herbert Dürr <hdu@apache.org> | 2013-01-03 11:16:56 +0000 |
commit | 7ff14a597a09249d49b14ff8c43f770f3c4ae84d (patch) | |
tree | 3dc41a872a3c0ebbdd69e7c7cfb585e99de54408 /shell | |
parent | 42e1dd3cdf38e178bdb8969da697ff4119c6b486 (diff) |
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
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'shell')
-rw-r--r-- | shell/source/all/makefile.mk | 1 | ||||
-rw-r--r-- | shell/source/all/ooofilereader/makefile.mk | 2 | ||||
-rw-r--r-- | shell/source/all/zipfile/makefile.mk | 2 | ||||
-rw-r--r-- | shell/source/win32/makefile.mk | 2 | ||||
-rw-r--r-- | shell/source/win32/shlxthandler/columninfo/makefile.mk | 4 | ||||
-rw-r--r-- | shell/source/win32/shlxthandler/infotips/makefile.mk | 4 | ||||
-rw-r--r-- | shell/source/win32/shlxthandler/makefile.mk | 2 | ||||
-rw-r--r-- | shell/source/win32/shlxthandler/ooofilt/makefile.mk | 2 | ||||
-rw-r--r-- | shell/source/win32/shlxthandler/prophdl/makefile.mk | 2 | ||||
-rw-r--r-- | shell/source/win32/shlxthandler/propsheets/makefile.mk | 4 | ||||
-rw-r--r-- | shell/source/win32/shlxthandler/thumbviewer/makefile.mk | 2 | ||||
-rw-r--r-- | shell/source/win32/shlxthandler/util/makefile.mk | 2 |
12 files changed, 14 insertions, 15 deletions
diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk index 764886b11908..e15280e9e6f9 100644 --- a/shell/source/all/makefile.mk +++ b/shell/source/all/makefile.mk @@ -63,7 +63,6 @@ SLOFILES_X64=$(SLO_X64)$/xml_parser.obj .INCLUDE : target.mk .IF "$(OS)" == "WNT" INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.EXPORT : INCLUDE .ENDIF .INCLUDE : tg_wntx64.mk diff --git a/shell/source/all/ooofilereader/makefile.mk b/shell/source/all/ooofilereader/makefile.mk index ebebf2eb9f86..6c7d4279a201 100644 --- a/shell/source/all/ooofilereader/makefile.mk +++ b/shell/source/all/ooofilereader/makefile.mk @@ -79,7 +79,7 @@ LIB1FILES_X64=$(SLB_X64)$/zipfile.lib\ .INCLUDE : target.mk .IF "$(OS)" == "WNT" INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.EXPORT : INCLUDE + .ENDIF .INCLUDE : tg_wntx64.mk diff --git a/shell/source/all/zipfile/makefile.mk b/shell/source/all/zipfile/makefile.mk index 137bb83ec09b..e231974c89ba 100644 --- a/shell/source/all/zipfile/makefile.mk +++ b/shell/source/all/zipfile/makefile.mk @@ -48,7 +48,7 @@ SLOFILES_X64=$(SLO_X64)$/zipfile.obj\ .INCLUDE : target.mk .IF "$(OS)" == "WNT" INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.EXPORT : INCLUDE + .ENDIF .INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/makefile.mk b/shell/source/win32/makefile.mk index e4492ab6ab0e..797fd46dcc4b 100644 --- a/shell/source/win32/makefile.mk +++ b/shell/source/win32/makefile.mk @@ -61,7 +61,7 @@ DEF1EXPORTFILE= exports.dxp .INCLUDE : target.mk INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.EXPORT : INCLUDE + ALLTAR : $(MISC)/syssh.component diff --git a/shell/source/win32/shlxthandler/columninfo/makefile.mk b/shell/source/win32/shlxthandler/columninfo/makefile.mk index ed6232bd262e..de7ef1a5b632 100644 --- a/shell/source/win32/shlxthandler/columninfo/makefile.mk +++ b/shell/source/win32/shlxthandler/columninfo/makefile.mk @@ -51,5 +51,5 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj .INCLUDE : set_wntx64.mk .INCLUDE : target.mk INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.EXPORT : INCLUDE -.INCLUDE : tg_wntx64.mk
\ No newline at end of file + +.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/infotips/makefile.mk b/shell/source/win32/shlxthandler/infotips/makefile.mk index 11a60f778fbe..d3ca36ff31a1 100644 --- a/shell/source/win32/shlxthandler/infotips/makefile.mk +++ b/shell/source/win32/shlxthandler/infotips/makefile.mk @@ -52,5 +52,5 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj .INCLUDE : set_wntx64.mk .INCLUDE : target.mk INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.EXPORT : INCLUDE -.INCLUDE : tg_wntx64.mk
\ No newline at end of file + +.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk index 538ac8cab2c4..806cad385880 100644 --- a/shell/source/win32/shlxthandler/makefile.mk +++ b/shell/source/win32/shlxthandler/makefile.mk @@ -148,6 +148,6 @@ DEF1EXPORTFILE_X64=exports.dxp .INCLUDE : set_wntx64.mk .INCLUDE : target.mk INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.EXPORT : INCLUDE + .INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk index e3784184944a..55abcef20a7e 100644 --- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk +++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk @@ -133,5 +133,5 @@ DEF1EXPORTFILE_X64=exports.dxp .INCLUDE : set_wntx64.mk .INCLUDE : target.mk INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.EXPORT : INCLUDE + .INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk index e2453f4fe7cf..22b8c885526d 100644 --- a/shell/source/win32/shlxthandler/prophdl/makefile.mk +++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk @@ -134,5 +134,5 @@ DEF1EXPORTFILE_X64=exports.dxp .INCLUDE : set_wntx64.mk .INCLUDE : target.mk INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.EXPORT : INCLUDE + .INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/propsheets/makefile.mk b/shell/source/win32/shlxthandler/propsheets/makefile.mk index cce217303744..277fe470c3ea 100644 --- a/shell/source/win32/shlxthandler/propsheets/makefile.mk +++ b/shell/source/win32/shlxthandler/propsheets/makefile.mk @@ -57,5 +57,5 @@ SLOFILES_X64=$(SLO_X64)$/propsheets.obj\ .INCLUDE : set_wntx64.mk .INCLUDE : target.mk INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.EXPORT : INCLUDE -.INCLUDE : tg_wntx64.mk
\ No newline at end of file + +.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk index bbf9d02313de..a498d14a8598 100644 --- a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk +++ b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk @@ -53,6 +53,6 @@ SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj .INCLUDE : set_wntx64.mk .INCLUDE : target.mk INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.EXPORT : INCLUDE + .INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk index b38e2f34f9e3..b527a76a5811 100644 --- a/shell/source/win32/shlxthandler/util/makefile.mk +++ b/shell/source/win32/shlxthandler/util/makefile.mk @@ -59,6 +59,6 @@ SLOFILES_X64=$(SLO_X64)$/dbgmacros.obj\ .INCLUDE : set_wntx64.mk .INCLUDE : target.mk INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.EXPORT : INCLUDE + .INCLUDE : tg_wntx64.mk |