diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2011-05-30 18:19:35 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-06-17 16:41:12 +0200 |
commit | 2a0a10364139ae9a6ee13fef2783e30656ea1e47 (patch) | |
tree | 1ea158e766c6f7aebf910bf7140ec14aded81a1e /shell | |
parent | f348c7fd936735e4029ca31b26b223ea039efd5c (diff) |
ause130: #i117218# don't export INCLUDE in a local makefile.mk
Diffstat (limited to 'shell')
-rwxr-xr-x | shell/source/all/makefile.mk | 1 | ||||
-rwxr-xr-x | shell/source/all/ooofilereader/makefile.mk | 2 | ||||
-rwxr-xr-x | shell/source/all/zipfile/makefile.mk | 2 | ||||
-rwxr-xr-x | shell/source/win32/makefile.mk | 2 | ||||
-rwxr-xr-x | shell/source/win32/shlxthandler/columninfo/makefile.mk | 4 | ||||
-rwxr-xr-x | shell/source/win32/shlxthandler/infotips/makefile.mk | 4 | ||||
-rwxr-xr-x | shell/source/win32/shlxthandler/makefile.mk | 2 | ||||
-rwxr-xr-x | shell/source/win32/shlxthandler/ooofilt/makefile.mk | 2 | ||||
-rwxr-xr-x | shell/source/win32/shlxthandler/prophdl/makefile.mk | 2 | ||||
-rwxr-xr-x | shell/source/win32/shlxthandler/propsheets/makefile.mk | 4 | ||||
-rwxr-xr-x | shell/source/win32/shlxthandler/thumbviewer/makefile.mk | 2 | ||||
-rwxr-xr-x | 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 b4cc34a42601..6c07f7079847 100755 --- a/shell/source/all/makefile.mk +++ b/shell/source/all/makefile.mk @@ -64,7 +64,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 67d29acaaf85..a8898978596e 100755 --- a/shell/source/all/ooofilereader/makefile.mk +++ b/shell/source/all/ooofilereader/makefile.mk @@ -78,7 +78,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 4e0af2891027..93fdf6602ae4 100755 --- a/shell/source/all/zipfile/makefile.mk +++ b/shell/source/all/zipfile/makefile.mk @@ -52,7 +52,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 7a01eefed89e..3878a8f9f456 100755 --- a/shell/source/win32/makefile.mk +++ b/shell/source/win32/makefile.mk @@ -65,7 +65,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 868a711e005c..29ebbbba6f7b 100755 --- a/shell/source/win32/shlxthandler/columninfo/makefile.mk +++ b/shell/source/win32/shlxthandler/columninfo/makefile.mk @@ -55,5 +55,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 f69f2cf2fd78..459f08cb6e3e 100755 --- a/shell/source/win32/shlxthandler/infotips/makefile.mk +++ b/shell/source/win32/shlxthandler/infotips/makefile.mk @@ -56,5 +56,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 fdaa1c43d92c..5e9b78a205f0 100755 --- a/shell/source/win32/shlxthandler/makefile.mk +++ b/shell/source/win32/shlxthandler/makefile.mk @@ -152,6 +152,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 fd1bc503cc33..a2ee326ecb53 100755 --- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk +++ b/shell/source/win32/shlxthandler/ooofilt/makefile.mk @@ -128,5 +128,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 dc6d0e159046..7900d149c1cd 100755 --- a/shell/source/win32/shlxthandler/prophdl/makefile.mk +++ b/shell/source/win32/shlxthandler/prophdl/makefile.mk @@ -138,5 +138,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 55a31c9c59d3..68c6407f6c7d 100755 --- a/shell/source/win32/shlxthandler/propsheets/makefile.mk +++ b/shell/source/win32/shlxthandler/propsheets/makefile.mk @@ -61,5 +61,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 01936460fae7..fddea0d51ae8 100755 --- a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk +++ b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk @@ -56,6 +56,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 8d54e138f350..1d47624a80d9 100755 --- a/shell/source/win32/shlxthandler/util/makefile.mk +++ b/shell/source/win32/shlxthandler/util/makefile.mk @@ -60,6 +60,6 @@ SLOFILES_X64=$(SLO_X64)$/fileextensions.obj\ .INCLUDE : set_wntx64.mk .INCLUDE : target.mk INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.EXPORT : INCLUDE + .INCLUDE : tg_wntx64.mk |