[Libreoffice-commits] .: 3 commits - cairo/cairo solenv/gdb sw/source
Michael Stahl
mst at kemper.freedesktop.org
Sat Dec 10 12:47:50 PST 2011
cairo/cairo/makefile.mk | 6 ++--
solenv/gdb/libreoffice/sw.py | 38 ++++++++++++++++++++++++-
sw/source/core/doc/docdde.cxx | 4 +-
sw/source/core/doc/docdesc.cxx | 21 ++++++++------
sw/source/core/doc/docedt.cxx | 61 ++++++++++++++++++++---------------------
5 files changed, 84 insertions(+), 46 deletions(-)
New commits:
commit b277d9a57e566c03f74dc6d82f2c0fe323eb83c2
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Dec 10 20:58:57 2011 +0100
sw: tweak comment translations:
5aff8df5 and ed870efe
diff --git a/sw/source/core/doc/docdde.cxx b/sw/source/core/doc/docdde.cxx
index 8a148cd..2d37606 100644
--- a/sw/source/core/doc/docdde.cxx
+++ b/sw/source/core/doc/docdde.cxx
@@ -301,7 +301,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
const CharClass& rCC = GetAppCharClass();
- // Extension for areas: not only link bookmarks/areas
+ // Extension for sections: not only link bookmarks/sections
// but also frames (text!), tables, outlines:
if( STRING_NOTFOUND != nPos )
{
@@ -356,7 +356,7 @@ sal_Bool SwDoc::SelectServerObj( const String& rStr, SwPaM*& rpPam,
rOutlNds.Seek_Entry( pNd, &nTmpPos );
rpRange = new SwNodeRange( aPos.nNode, 0, aPos.nNode );
- // look for the area's end, now
+ // look for the section's end, now
for( ++nTmpPos;
nTmpPos < rOutlNds.Count() &&
nLvl < rOutlNds[ nTmpPos ]->GetTxtNode()->
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index d17980e..2284b72 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -212,7 +212,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
if( rChged.GetNumType().GetNumberingType() != pDesc->GetNumType().GetNumberingType() )
{
pDesc->SetNumType( rChged.GetNumType() );
- // Notify page number fields, that NumFormat has changed
+ // Notify page number fields that NumFormat has changed
GetSysFldType( RES_PAGENUMBERFLD )->UpdateFlds();
GetSysFldType( RES_REFPAGEGETFLD )->UpdateFlds();
@@ -251,7 +251,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
pDesc->GetLeft().SetFmtAttr( pDesc->GetMaster().GetHeader() );
}
else if ( rHead.IsActive() )
- { // Left gets it's own header if the Format doesn't alrady have one.
+ { // Left gets its own header if the Format doesn't alrady have one.
// If it already has one and it points to the same Section as the
// Right one, it needs to get an own Header.
// The content is evidently copied.
@@ -275,8 +275,9 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), "Header",
GetDfltFrmFmt() );
::lcl_DescSetAttr( *pRight, *pFmt, sal_False );
- // The area which the right header attribute is pointing to is copied,
- // and the Index to the StartNode is set to the left header attribute.
+ // The section which the right header attribute is pointing
+ // is copied, and the Index to the StartNode is set to
+ // the left header attribute.
SwNodeIndex aTmp( GetNodes().GetEndOfAutotext() );
SwStartNode* pSttNd = GetNodes().MakeEmptySection( aTmp, SwHeaderStartNode );
SwNodeRange aRange( aRCnt.GetCntntIdx()->GetNode(), 0,
@@ -311,7 +312,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
// Left shares the Header with the Master.
pDesc->GetLeft().SetFmtAttr( pDesc->GetMaster().GetFooter() );
else if ( rFoot.IsActive() )
- { // Left gets it's own Footer if the Format does not already have one.
+ { // Left gets its own Footer if the Format does not already have one.
// If the Format already has a Footer and it points to the same section as the Right one,
// it needs to get an own one.
// The content is evidently copied.
@@ -335,8 +336,9 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), "Footer",
GetDfltFrmFmt() );
::lcl_DescSetAttr( *pRight, *pFmt, sal_False );
- // The Area to which the right header attribute is pointing to is being copied
- // and the Index to the StartNode is set to the left header attribute.
+ // The section to which the right footer attribute is pointing
+ // is copied, and the Index to the StartNode is set to
+ // the left footer attribute.
SwNodeIndex aTmp( GetNodes().GetEndOfAutotext() );
SwStartNode* pSttNd = GetNodes().MakeEmptySection( aTmp, SwFooterStartNode );
SwNodeRange aRange( aRCnt.GetCntntIdx()->GetNode(), 0,
@@ -416,7 +418,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
|*
|* SwDoc::DelPageDesc()
|*
-|* Description: All descriptors who's Follow point to the to-be-deleted
+|* Description: All descriptors whose Follow point to the to-be-deleted
|* have to be adapted.
|*
|*************************************************************************/
@@ -672,7 +674,8 @@ void SwDoc::PrtOLENotify( sal_Bool bAll )
{
// This doesn't make sense without a Shell and thus without a client, because
// the communication about size changes is implemented by these components.
- // Because we don't have a Shell we remember this unfortunate situtaion in the document,
+ // Because we don't have a Shell we remember this unfortunate situation
+ // in the document,
// which is made up for later on when creating the first Shell.
mbOLEPrtNotifyPending = sal_True;
if ( bAll )
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 4430f19..2ff6e81 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -50,7 +50,7 @@
#include <UndoManager.hxx>
#include <docsh.hxx>
#include <docary.hxx>
-#include <doctxm.hxx> // when moving: correct directories
+#include <doctxm.hxx> // when moving: correct indexes
#include <ftnidx.hxx>
#include <ftninfo.hxx>
#include <mdiexp.hxx> // status bar
@@ -270,14 +270,14 @@ void _SaveFlyInRange( const SwPaM& rPam, const SwNodeIndex& rInsPos,
if (pAPos &&
((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
(FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
- // do not move, if the InsPos is in the CntntArea of the Fly
+ // do not move if the InsPos is in the CntntArea of the Fly
( 0 == ( pCntntIdx = pFmt->GetCntnt().GetCntntIdx() ) ||
!( *pCntntIdx < rInsPos &&
rInsPos < pCntntIdx->GetNode().EndOfSectionIndex() )) )
{
if( !bMoveAllFlys && rEndNdIdx == pAPos->nNode )
{
- // Do not touch chaos::Anchor, if only a part of the EndNode
+ // Do not touch Anchor, if only a part of the EndNode
// or the whole EndNode is identical with the SttNode
if( rSttNdIdx != pAPos->nNode )
{
@@ -715,7 +715,7 @@ void SwDoc::DeleteSection( SwNode *pNode )
: pNode->StartOfSectionNode();
SwNodeIndex aSttIdx( *pSttNd ), aEndIdx( *pNode->EndOfSectionNode() );
- // delete all Flys, text::Bookmarks, ...
+ // delete all Flys, Bookmarks, ...
DelFlyInRange( aSttIdx, aEndIdx );
DeleteRedline( *pSttNd, true, USHRT_MAX );
_DelBookmarks(aSttIdx, aEndIdx);
@@ -856,7 +856,7 @@ bool SwDoc::MoveAndJoin( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
SwNodeIndex aNxtIdx( aIdx );
if( pTxtNd && pTxtNd->CanJoinNext( &aNxtIdx ) )
{
- { // Add Block to the Node, because of SwIndex
+ { // Block so SwIndex into node is deleted before Join
CorrRel( aNxtIdx, SwPosition( aIdx, SwIndex( pTxtNd,
pTxtNd->GetTxt().Len() ) ), 0, sal_True );
}
@@ -871,12 +871,12 @@ bool SwDoc::MoveAndJoin( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
// SwDoc::CopyRange (but I have not managed to actually hit that case).
bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
{
- // do not intercept moves
+ // nothing moved: return
const SwPosition *pStt = rPaM.Start(), *pEnd = rPaM.End();
if( !rPaM.HasMark() || *pStt >= *pEnd || (*pStt <= rPos && rPos < *pEnd))
return false;
- // Save the paragraph-bound Flys, so that they can be moved.
+ // Save the paragraph anchored Flys, so that they can be moved.
_SaveFlyArr aSaveFlyArr;
_SaveFlyInRange( rPaM, rPos.nNode, aSaveFlyArr, 0 != ( DOC_MOVEALLFLYS & eMvFlags ) );
@@ -903,7 +903,6 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
int bUpdateFtn = sal_False;
SwFtnIdxs aTmpFntIdx;
- // if Undo is switched on, create the UndoMove object
SwUndoMove * pUndoMove = 0;
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -921,7 +920,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
sal_Bool bSplit = sal_False;
SwPaM aSavePam( rPos, rPos );
- // Move the SPoint to the beginning of the area (according to it's definition)
+ // Move the SPoint to the beginning of the range
if( rPaM.GetPoint() == pEnd )
rPaM.Exchange();
@@ -929,7 +928,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
SwTxtNode* pSrcNd = rPaM.GetPoint()->nNode.GetNode().GetTxtNode();
sal_Bool bCorrSavePam = pSrcNd && pStt->nNode != pEnd->nNode;
- // If one ore more TextNodes are moved, create a SplitNode in the SwNodes::Move.
+ // If one ore more TextNodes are moved, SwNodes::Move will do a SplitNode.
// However, this does not update the cursor. So we create a TextNode to keep
// updating the indices. After the Move the Node is optionally deleted.
SwTxtNode * pTNd = rPos.nNode.GetNode().GetTxtNode();
@@ -957,7 +956,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
}
// Put back the Pam by one "content"; so that it's always outside of
- // the manipulated area.
+ // the manipulated range.
// If there's no content anymore, set it to the StartNode (that's
// always there).
sal_Bool bNullCntnt = !aSavePam.Move( fnMoveBackward, fnGoCntnt );
@@ -966,7 +965,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
aSavePam.GetPoint()->nNode--;
}
- // Copy all Bookmarks that are within the Move area into an array,
+ // Copy all Bookmarks that are within the Move range into an array,
// that saves the positon as an offset.
::std::vector< ::sw::mark::SaveBookmark> aSaveBkmks;
_DelBookmarks(
@@ -976,8 +975,8 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
&pStt->nContent,
&pEnd->nContent);
- // If there is no area anymore due to the above deletions (e.g. the footnotes
- // got deleted), it's still a valid Move!
+ // If there is no range anymore due to the above deletions (e.g. the
+ // footnotes got deleted), it's still a valid Move!
if( *rPaM.GetPoint() != *rPaM.GetMark() )
{
// now do the actual move
@@ -998,7 +997,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
"PaM was not moved. Aren't there ContentNodes at the beginning/end?" );
*aSavePam.GetMark() = rPos;
- rPaM.SetMark(); // create a Sel. around the new area
+ rPaM.SetMark(); // create a Sel. around the new range
pTNd = aSavePam.GetNode()->GetTxtNode();
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -1026,7 +1025,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
if( bJoin && pTNd->CanJoinNext() )
{
pTNd->JoinNext();
- // No temporary sdbcx::Index when using &&.
+ // No temporary Index when using &&.
// We probably only want to compare the indices.
if( bCorrSavePam && rPaM.GetPoint()->nNode.GetIndex()+1 ==
aSavePam.GetPoint()->nNode.GetIndex() )
@@ -1040,7 +1039,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
aSavePam.GetPoint()->nNode++;
}
- // The newly inserted area is now inbetween SPoint and GetMark.
+ // The newly inserted range is now inbetween SPoint and GetMark.
pUndoMove->SetDestRange( aSavePam, *rPaM.GetPoint(),
bJoin, bCorrSavePam );
GetIDocumentUndoRedo().AppendUndo( pUndoMove );
@@ -1070,7 +1069,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
}
}
- // Insert the text::Bookmarks back into the Document.
+ // Insert the Bookmarks back into the Document.
*rPaM.GetMark() = *aSavePam.Start();
for(
::std::vector< ::sw::mark::SaveBookmark>::iterator pBkmk = aSaveBkmks.begin();
@@ -1110,9 +1109,9 @@ bool SwDoc::MoveNodeRange( SwNodeRange& rRange, SwNodeIndex& rPos,
SwMoveFlags eMvFlags )
{
// Moves all Nodes to the new position.
- // text::Bookmarks is moved too (currently without Undo support)
+ // Bookmarks are moved too (currently without Undo support).
- // If footnotes are being introduced to the special area, remove them now.
+ // If footnotes are being moved to the special section, remove them now.
//
// Or else delete the Frames for all footnotes that are being moved
// and have it rebuild after the Move (footnotes can change pages).
@@ -1156,7 +1155,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange& rRange, SwNodeIndex& rPos,
}
}
- // Copy all Bookmarks that are within the Move area into an array
+ // Copy all Bookmarks that are within the Move range into an array
// that stores all references to positions as an offset.
// The final mapping happens after the Move.
::std::vector< ::sw::mark::SaveBookmark> aSaveBkmks;
@@ -1192,7 +1191,7 @@ bool SwDoc::MoveNodeRange( SwNodeRange& rRange, SwNodeIndex& rPos,
if( aSaveFlyArr.Count() )
_RestFlyInRange( aSaveFlyArr, aIdx, NULL );
- // Add the text::Bookmarks back to the Document
+ // Add the Bookmarks back to the Document
for(
::std::vector< ::sw::mark::SaveBookmark>::iterator pBkmk = aSaveBkmks.begin();
pBkmk != aSaveBkmks.end();
@@ -1521,7 +1520,9 @@ bool SwDoc::DeleteAndJoinWithRedlineImpl( SwPaM & rPam, const bool )
if (GetIDocumentUndoRedo().DoesUndo())
{
- // Still needs to be optimised!
+ /* please don't translate -- for cultural reasons this comment is protected
+ until the redline implementation is finally fixed some day */
+//JP 06.01.98: MUSS noch optimiert werden!!!
SetRedlineMode(
(RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE ));
@@ -1559,7 +1560,7 @@ bool SwDoc::DeleteAndJoinWithRedlineImpl( SwPaM & rPam, const bool )
}
}
}
-// Still needs to be optimised!
+//JP 06.01.98: MUSS noch optimiert werden!!!
SetRedlineMode( eOld );
}
return true;
@@ -1647,7 +1648,7 @@ bool SwDoc::DeleteRangeImplImpl(SwPaM & rPam)
{
// Send DataChanged before deletion, so that we still know
- // which objects are in the area.
+ // which objects are in the range.
// Afterwards they could be before/after the Position.
SwDataChanged aTmp( rPam, 0 );
}
@@ -2089,7 +2090,7 @@ void SwHyphArgs::SetPam( SwPaM *pPam ) const
// Returns sal_True if we can proceed.
sal_Bool lcl_HyphenateNode( const SwNodePtr& rpNd, void* pArgs )
{
- // Hyphenate returns sal_True, if there is a disconnection point and set pPam.
+ // Hyphenate returns true if there is a hyphenation point and sets pPam
SwTxtNode *pNode = rpNd->GetTxtNode();
SwHyphArgs *pHyphArgs = (SwHyphArgs*)pArgs;
if( pNode )
@@ -2263,7 +2264,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr,
{
// Create a copy of the Cursor in order to move all Pams from
- // the other views out of the deletion area.
+ // the other views out of the deletion range.
// Except for itself!
SwPaM aDelPam( *rPam.GetMark(), *rPam.GetPoint() );
::PaMCorrAbs( aDelPam, *aDelPam.GetPoint() );
@@ -2296,7 +2297,7 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr,
// If any Redline will change (split!) the node
const ::sw::mark::IMark* pBkmk = getIDocumentMarkAccess()->makeMark( aDelPam, ::rtl::OUString(), IDocumentMarkAccess::UNO_BOOKMARK );
- // Needs to be optimised!
+ //JP 06.01.98: MUSS noch optimiert werden!!!
SetRedlineMode(
(RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE ));
@@ -2394,8 +2395,8 @@ bool SwDoc::ReplaceRangeImpl( SwPaM& rPam, const String& rStr,
rPam.GetPoint()->nNode = 0;
rPam.GetPoint()->nContent = rIdx;
*rPam.GetMark() = *rPam.GetPoint();
- // Needs to be optimised!
- SetRedlineMode( eOld );
+//JP 06.01.98: MUSS noch optimiert werden!!!
+SetRedlineMode( eOld );
*rPam.GetPoint() = pBkmk->GetMarkPos();
if(pBkmk->IsExpanded())
commit 9f050aa772dd8d0b26dac4ef52fb5a5bd2825d4a
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Dec 10 19:32:21 2011 +0100
solenv: pimp the gdb nodes array pretty printer
diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py
index 2e07538..8f25522 100644
--- a/solenv/gdb/libreoffice/sw.py
+++ b/solenv/gdb/libreoffice/sw.py
@@ -48,7 +48,7 @@ class SwPaMPrinter(object):
def to_string(self):
return "%s" % (self.typename)
-
+
def children(self):
point = self.value['m_pPoint'].dereference()
mark = self.value['m_pMark'].dereference()
@@ -86,18 +86,52 @@ class BigPtrArrayPrinter(object):
self.block_count = array['nBlock']
self.block_pos = 0
self.block = None
+ self.indent = ""
+ self.max_indent = " "
self._next_block(False)
self._check_invariant()
def __iter__(self):
return self
+ def _node_value(self, node):
+ cur_indent = self.indent
+ if str(node.dynamic_type.target()) == "SwTxtNode":
+ # accessing this is completely non-obvious...
+ # also, node.dynamic_cast(node.dynamic_type) is null?
+ value = " TextNode " + \
+ str(node.cast(node.dynamic_type).dereference()['m_Text'])
+ elif str(node.dynamic_type.target()) == "SwOLENode":
+ value = " OLENode "
+ elif str(node.dynamic_type.target()) == "SwGrfNode":
+ value = " GrfNode "
+ elif str(node.dynamic_type.target()) == "SwSectionNode":
+ value = " SectionNode "
+ self.indent += " "
+ elif str(node.dynamic_type.target()) == "SwTableNode":
+ value = " TableNode "
+ self.indent += " "
+ elif str(node.dynamic_type.target()) == "SwStartNode":
+ value = " StartNode "
+ self.indent += " "
+ elif str(node.dynamic_type.target()) == "SwEndNode":
+ value = " EndNode "
+ self.indent = self.indent[:-1]
+ cur_indent = self.indent
+ elif str(node.dynamic_type.target()) == "SwDummySectionNode":
+ value = "DummySctNode "
+# return "\n[%s%4d%s] %s %s" % (cur_indent, self.pos, \
+# self.max_indent[len(cur_indent):], node, value)
+ return "\n[%4d] %s%s%s %s" % (self.pos, cur_indent, \
+ node, self.max_indent[len(cur_indent):], value)
+
def next(self):
if self.pos == self.count:
raise StopIteration()
name = str(self.pos)
- value = self.block['pData'][self.pos - self.block['nStart']]
+ node = self.block['pData'][self.pos - self.block['nStart']]
+ value = self._node_value(node)
if self.pos == self.block['nEnd']:
self._next_block()
self.pos += 1
commit 408672d41b261b33fb3bbc272d25815dda0e2663
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Dec 10 00:23:42 2011 +0100
cairo: fix RPATH:
The cairo configure script is called with -Wl,-rpath,"12345ORIGIN"
with funny results so tweak the quoting so that the $$ makes it through...
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index fda29af..1eccae5 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -126,9 +126,9 @@ OUT2INC+=src$/cairo-quartz.h
.ELSE
# ----------- Unix ---------------------------------------------------------
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack
+cairo_LDFLAGS+=-Wl,-rpath,\$$$$ORIGIN:\$$$$ORIGIN/../ure-link/lib -Wl,-z,noexecstack
.ELIF "$(OS)$(COM)"=="SOLARISC52"
-cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
+cairo_LDFLAGS+=-Wl,-R\$$$$ORIGIN:\$$$$ORIGIN/../ure-link/lib
.ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
.IF "$(SYSBASE)"!=""
@@ -206,7 +206,7 @@ cairo_CFLAGS+=-g
CONFIGURE_FLAGS+= STRIP=" "
.ENDIF
-CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAGS)" LDFLAGS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib $(cairo_LDFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)"
+CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAGS)" LDFLAGS='-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib $(cairo_LDFLAGS)' CPPFLAGS="$(cairo_CPPFLAGS)"
.ENDIF
More information about the Libreoffice-commits
mailing list