You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/10/01 20:54:23 UTC
svn commit: r1528180 - in /openoffice/branches/l10n40/main/sal: ./
cppunittester/ qa/ByteSequence/ qa/OStringBuffer/ qa/osl/mutex/
qa/osl/pipe/ qa/osl/profile/ qa/osl/setthreadname/ qa/rtl/math/
Author: jani
Date: Tue Oct 1 18:54:22 2013
New Revision: 1528180
URL: http://svn.apache.org/r1528180
Log:
genPO integration in module sal conflicted with normal build, corrected
Modified:
openoffice/branches/l10n40/main/sal/ (props changed)
openoffice/branches/l10n40/main/sal/cppunittester/makefile.mk
openoffice/branches/l10n40/main/sal/qa/ByteSequence/makefile.mk
openoffice/branches/l10n40/main/sal/qa/OStringBuffer/makefile.mk
openoffice/branches/l10n40/main/sal/qa/osl/mutex/makefile.mk
openoffice/branches/l10n40/main/sal/qa/osl/pipe/makefile.mk
openoffice/branches/l10n40/main/sal/qa/osl/profile/makefile.mk
openoffice/branches/l10n40/main/sal/qa/osl/setthreadname/makefile.mk
openoffice/branches/l10n40/main/sal/qa/rtl/math/makefile.mk
Propchange: openoffice/branches/l10n40/main/sal/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 1 18:54:22 2013
@@ -0,0 +1,2 @@
+/openoffice/branches/AOO400/main/sal:1503684
+/openoffice/trunk/main/sal:1505446-1528173
Modified: openoffice/branches/l10n40/main/sal/cppunittester/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/cppunittester/makefile.mk?rev=1528180&r1=1528179&r2=1528180&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/cppunittester/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/cppunittester/makefile.mk Tue Oct 1 18:54:22 2013
@@ -32,7 +32,8 @@ ENABLE_EXCEPTIONS = TRUE
.IF "$(WITH_CPPUNIT)" != "YES"
all:
@echo cppunit disabled. nothing to do.
-.INCLUDE: target.mk
+
+genPO:
.ELSE
Modified: openoffice/branches/l10n40/main/sal/qa/ByteSequence/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/ByteSequence/makefile.mk?rev=1528180&r1=1528179&r2=1528180&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/ByteSequence/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/ByteSequence/makefile.mk Tue Oct 1 18:54:22 2013
@@ -22,7 +22,9 @@
.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-.INCLUDE: target.mk
+genPO:
+
+nothing .PHONY:
.ELSE
PRJ = ../..
Modified: openoffice/branches/l10n40/main/sal/qa/OStringBuffer/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/OStringBuffer/makefile.mk?rev=1528180&r1=1528179&r2=1528180&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/OStringBuffer/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/OStringBuffer/makefile.mk Tue Oct 1 18:54:22 2013
@@ -22,7 +22,9 @@
.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-.INCLUDE : target.mk
+genPO:
+
+nothing .PHONY:
.ELSE
PRJ=..$/..
Modified: openoffice/branches/l10n40/main/sal/qa/osl/mutex/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/osl/mutex/makefile.mk?rev=1528180&r1=1528179&r2=1528180&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/osl/mutex/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/osl/mutex/makefile.mk Tue Oct 1 18:54:22 2013
@@ -22,7 +22,9 @@
.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-.INCLUDE : target.mk
+genPO:
+
+nothing .PHONY:
.ELSE
PRJ=..$/..$/..
Modified: openoffice/branches/l10n40/main/sal/qa/osl/pipe/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/osl/pipe/makefile.mk?rev=1528180&r1=1528179&r2=1528180&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/osl/pipe/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/osl/pipe/makefile.mk Tue Oct 1 18:54:22 2013
@@ -22,7 +22,9 @@
.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-.INCLUDE : target.mk
+genPO:
+
+nothing .PHONY:
.ELSE
PRJ=..$/..$/..
Modified: openoffice/branches/l10n40/main/sal/qa/osl/profile/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/osl/profile/makefile.mk?rev=1528180&r1=1528179&r2=1528180&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/osl/profile/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/osl/profile/makefile.mk Tue Oct 1 18:54:22 2013
@@ -22,7 +22,9 @@
.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-.INCLUDE : target.mk
+genPO:
+
+nothing .PHONY:
.ELSE
PRJ=..$/..$/..
Modified: openoffice/branches/l10n40/main/sal/qa/osl/setthreadname/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/osl/setthreadname/makefile.mk?rev=1528180&r1=1528179&r2=1528180&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/osl/setthreadname/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/osl/setthreadname/makefile.mk Tue Oct 1 18:54:22 2013
@@ -22,7 +22,9 @@
.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-.INCLUDE: target.mk
+genPO:
+
+nothing .PHONY:
.ELSE
PRJ = ..$/..$/..
Modified: openoffice/branches/l10n40/main/sal/qa/rtl/math/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sal/qa/rtl/math/makefile.mk?rev=1528180&r1=1528179&r2=1528180&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sal/qa/rtl/math/makefile.mk (original)
+++ openoffice/branches/l10n40/main/sal/qa/rtl/math/makefile.mk Tue Oct 1 18:54:22 2013
@@ -22,7 +22,9 @@
.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-.INCLUDE: target.mk
+genPO:
+
+nothing .PHONY:
.ELSE
PRJ = ../../..