You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/01/03 13:16:57 UTC
svn commit: r1428312 - in /openoffice/trunk/main:
setup_native/source/win32/customactions/reg64/ shell/source/all/
shell/source/all/ooofilereader/ shell/source/all/zipfile/
shell/source/win32/ shell/source/win32/shlxthandler/
shell/source/win32/shlxtha...
Author: hdu
Date: Thu Jan 3 12:16:56 2013
New Revision: 1428312
URL: http://svn.apache.org/viewvc?rev=1428312&view=rev
Log:
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 <hj...@openoffice.org>
# Date 1300125618 -3600
# Node ID b4abd2828ea57472570b5b6ed991baf114e0f48f
# Parent f53b9337ae7a62b654cd60701660dfc7cf008aab
Modified:
openoffice/trunk/main/setup_native/source/win32/customactions/reg64/makefile.mk
openoffice/trunk/main/shell/source/all/makefile.mk
openoffice/trunk/main/shell/source/all/ooofilereader/makefile.mk
openoffice/trunk/main/shell/source/all/zipfile/makefile.mk
openoffice/trunk/main/shell/source/win32/makefile.mk
openoffice/trunk/main/shell/source/win32/shlxthandler/columninfo/makefile.mk
openoffice/trunk/main/shell/source/win32/shlxthandler/infotips/makefile.mk
openoffice/trunk/main/shell/source/win32/shlxthandler/makefile.mk
openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
openoffice/trunk/main/shell/source/win32/shlxthandler/propsheets/makefile.mk
openoffice/trunk/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
openoffice/trunk/main/shell/source/win32/shlxthandler/util/makefile.mk
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/reg64/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/reg64/makefile.mk?rev=1428312&r1=1428311&r2=1428312&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/reg64/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/reg64/makefile.mk Thu Jan 3 12:16:56 2013
@@ -97,7 +97,6 @@ DEF1EXPORTFILE=exports.dxp
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
# -------------------------------------------------------------------------
Modified: openoffice/trunk/main/shell/source/all/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/all/makefile.mk?rev=1428312&r1=1428311&r2=1428312&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/all/makefile.mk (original)
+++ openoffice/trunk/main/shell/source/all/makefile.mk Thu Jan 3 12:16:56 2013
@@ -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
Modified: openoffice/trunk/main/shell/source/all/ooofilereader/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/all/ooofilereader/makefile.mk?rev=1428312&r1=1428311&r2=1428312&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/all/ooofilereader/makefile.mk (original)
+++ openoffice/trunk/main/shell/source/all/ooofilereader/makefile.mk Thu Jan 3 12:16:56 2013
@@ -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
Modified: openoffice/trunk/main/shell/source/all/zipfile/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/all/zipfile/makefile.mk?rev=1428312&r1=1428311&r2=1428312&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/all/zipfile/makefile.mk (original)
+++ openoffice/trunk/main/shell/source/all/zipfile/makefile.mk Thu Jan 3 12:16:56 2013
@@ -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
Modified: openoffice/trunk/main/shell/source/win32/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/makefile.mk?rev=1428312&r1=1428311&r2=1428312&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/makefile.mk (original)
+++ openoffice/trunk/main/shell/source/win32/makefile.mk Thu Jan 3 12:16:56 2013
@@ -61,7 +61,7 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : target.mk
INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
ALLTAR : $(MISC)/syssh.component
Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/columninfo/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/columninfo/makefile.mk?rev=1428312&r1=1428311&r2=1428312&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/columninfo/makefile.mk (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/columninfo/makefile.mk Thu Jan 3 12:16:56 2013
@@ -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
Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/infotips/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/infotips/makefile.mk?rev=1428312&r1=1428311&r2=1428312&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/infotips/makefile.mk (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/infotips/makefile.mk Thu Jan 3 12:16:56 2013
@@ -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
Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/makefile.mk?rev=1428312&r1=1428311&r2=1428312&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/makefile.mk (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/makefile.mk Thu Jan 3 12:16:56 2013
@@ -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
Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk?rev=1428312&r1=1428311&r2=1428312&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk Thu Jan 3 12:16:56 2013
@@ -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
Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/makefile.mk?rev=1428312&r1=1428311&r2=1428312&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/makefile.mk (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/prophdl/makefile.mk Thu Jan 3 12:16:56 2013
@@ -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
Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/propsheets/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/propsheets/makefile.mk?rev=1428312&r1=1428311&r2=1428312&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/propsheets/makefile.mk (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/propsheets/makefile.mk Thu Jan 3 12:16:56 2013
@@ -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
Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk?rev=1428312&r1=1428311&r2=1428312&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk Thu Jan 3 12:16:56 2013
@@ -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
Modified: openoffice/trunk/main/shell/source/win32/shlxthandler/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/shell/source/win32/shlxthandler/util/makefile.mk?rev=1428312&r1=1428311&r2=1428312&view=diff
==============================================================================
--- openoffice/trunk/main/shell/source/win32/shlxthandler/util/makefile.mk (original)
+++ openoffice/trunk/main/shell/source/win32/shlxthandler/util/makefile.mk Thu Jan 3 12:16:56 2013
@@ -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