openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ar...@apache.org
Subject svn commit: r1409408 - in /incubator/ooo/branches/gbuild/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/...
Date Wed, 14 Nov 2012 21:18:15 GMT
Author: arist
Date: Wed Nov 14 21:18:14 2012
New Revision: 1409408

URL: http://svn.apache.org/viewvc?rev=1409408&view=rev
Log:
aause130_6_b4abd2828ea5.patch

# HG changeset patch
# User Hans-Joachim Lankenau <hjs@openoffice.org>
# Date 1300125618 -3600
# Node ID b4abd2828ea57472570b5b6ed991baf114e0f48f
# Parent  f53b9337ae7a62b654cd60701660dfc7cf008aab
ause130: #i117218# don't export INCLUDE in a local makefile.mk


Modified:
    incubator/ooo/branches/gbuild/main/setup_native/source/win32/customactions/reg64/makefile.mk
    incubator/ooo/branches/gbuild/main/shell/source/all/makefile.mk
    incubator/ooo/branches/gbuild/main/shell/source/all/ooofilereader/makefile.mk
    incubator/ooo/branches/gbuild/main/shell/source/all/zipfile/makefile.mk
    incubator/ooo/branches/gbuild/main/shell/source/win32/makefile.mk
    incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/columninfo/makefile.mk
    incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/infotips/makefile.mk
    incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/makefile.mk
    incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
    incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
    incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/propsheets/makefile.mk
    incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
    incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/util/makefile.mk

Modified: incubator/ooo/branches/gbuild/main/setup_native/source/win32/customactions/reg64/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/setup_native/source/win32/customactions/reg64/makefile.mk?rev=1409408&r1=1409407&r2=1409408&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/setup_native/source/win32/customactions/reg64/makefile.mk
(original)
+++ incubator/ooo/branches/gbuild/main/setup_native/source/win32/customactions/reg64/makefile.mk
Wed Nov 14 21:18:14 2012
@@ -97,7 +97,6 @@ DEF1EXPORTFILE=exports.dxp
 
 .INCLUDE : target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
 
 # -------------------------------------------------------------------------
 

Modified: incubator/ooo/branches/gbuild/main/shell/source/all/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/shell/source/all/makefile.mk?rev=1409408&r1=1409407&r2=1409408&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/shell/source/all/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/shell/source/all/makefile.mk Wed Nov 14 21:18:14 2012
@@ -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: incubator/ooo/branches/gbuild/main/shell/source/all/ooofilereader/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/shell/source/all/ooofilereader/makefile.mk?rev=1409408&r1=1409407&r2=1409408&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/shell/source/all/ooofilereader/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/shell/source/all/ooofilereader/makefile.mk Wed Nov
14 21:18:14 2012
@@ -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: incubator/ooo/branches/gbuild/main/shell/source/all/zipfile/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/shell/source/all/zipfile/makefile.mk?rev=1409408&r1=1409407&r2=1409408&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/shell/source/all/zipfile/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/shell/source/all/zipfile/makefile.mk Wed Nov 14 21:18:14
2012
@@ -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: incubator/ooo/branches/gbuild/main/shell/source/win32/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/shell/source/win32/makefile.mk?rev=1409408&r1=1409407&r2=1409408&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/shell/source/win32/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/shell/source/win32/makefile.mk Wed Nov 14 21:18:14
2012
@@ -61,7 +61,7 @@ DEF1EXPORTFILE=	exports.dxp
 
 .INCLUDE :	target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
+
 
 
 ALLTAR : $(MISC)/syssh.component

Modified: incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/columninfo/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/columninfo/makefile.mk?rev=1409408&r1=1409407&r2=1409408&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/columninfo/makefile.mk
(original)
+++ incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/columninfo/makefile.mk
Wed Nov 14 21:18:14 2012
@@ -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: incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/infotips/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/infotips/makefile.mk?rev=1409408&r1=1409407&r2=1409408&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/infotips/makefile.mk
(original)
+++ incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/infotips/makefile.mk
Wed Nov 14 21:18:14 2012
@@ -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: incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/makefile.mk?rev=1409408&r1=1409407&r2=1409408&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/makefile.mk Wed Nov
14 21:18:14 2012
@@ -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: incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk?rev=1409408&r1=1409407&r2=1409408&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
(original)
+++ incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
Wed Nov 14 21:18:14 2012
@@ -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: incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/prophdl/makefile.mk?rev=1409408&r1=1409407&r2=1409408&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
(original)
+++ incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
Wed Nov 14 21:18:14 2012
@@ -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: incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/propsheets/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/propsheets/makefile.mk?rev=1409408&r1=1409407&r2=1409408&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/propsheets/makefile.mk
(original)
+++ incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/propsheets/makefile.mk
Wed Nov 14 21:18:14 2012
@@ -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: incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk?rev=1409408&r1=1409407&r2=1409408&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
(original)
+++ incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/thumbviewer/makefile.mk
Wed Nov 14 21:18:14 2012
@@ -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: incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/util/makefile.mk?rev=1409408&r1=1409407&r2=1409408&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/util/makefile.mk (original)
+++ incubator/ooo/branches/gbuild/main/shell/source/win32/shlxthandler/util/makefile.mk Wed
Nov 14 21:18:14 2012
@@ -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
 



Mime
View raw message