Menu
▾
▴
wxdevcenter-cvs — cvs/svn commits for wxDevCenter and StdPlugin
You can subscribe to this list here.
| 2005 |
Jan
(98) |
Feb
(101) |
Mar
(60) |
Apr
(38) |
May
(26) |
Jun
|
Jul
|
Aug
(159) |
Sep
(78) |
Oct
(31) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(6) |
Oct
|
Nov
(1) |
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(8) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <cur...@us...> - 2011-01-09 13:36:39
|
Revision: 78
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=78&view=rev
Author: cursorstar
Date: 2011-01-09 13:36:31 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
Add icons for text view
Modified Paths:
--------------
trunk/wxdevcenter/plugins/text/text.cpp
Added Paths:
-----------
trunk/wxdevcenter/share/pixmaps/wxDevCenter/bookmark-next.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/bookmark-previous.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/bookmark-remove-all.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/bookmark-toggle.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/document-remove.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/plugins/
trunk/wxdevcenter/share/pixmaps/wxDevCenter/plugins/process/
trunk/wxdevcenter/share/pixmaps/wxDevCenter/plugins/process/execute.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/plugins/text/
trunk/wxdevcenter/share/pixmaps/wxDevCenter/plugins/text/end-of-lines.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/plugins/text/fast-find.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/plugins/text/indent-lines.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/plugins/text/line-numbers.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/plugins/text/long-lines.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/plugins/text/toggle-folder.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/plugins/text/white-spaces.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/plugins/text/wrap-mode.svg
Modified: trunk/wxdevcenter/plugins/text/text.cpp
===================================================================
--- trunk/wxdevcenter/plugins/text/text.cpp 2011-01-06 19:00:28 UTC (rev 77)
+++ trunk/wxdevcenter/plugins/text/text.cpp 2011-01-09 13:36:31 UTC (rev 78)
@@ -450,14 +450,14 @@
entry = new dcActionGroupEntry(viewTempl, wxID_ANY, wxdcACTION_GROUP_ENTRY_SHOW, wxT(""), wxT(""), wxT(""), wxdcACTION_GROUP_PRIORITY_SHOW);
dcActionManager::Register(entry);
group = new dcActionGroup(wxID_ANY, wxT("Decoration"));
- group->AppendCheck(XRCID("LINE_NUMBERS"), _("Line numbers"), _("Show line numbers"), _("Show line numbers at left of the text."));
- group->AppendCheck(XRCID("DISPLAY_EOL"), _("Display end-of-lines"), _("Display end-of-line characters"), _("end-of-line characters"));
- group->AppendCheck(XRCID("INDENT_GUIDES"), _("Indent guides"), _("Show indent guides"), _("Show indent guides."));
- group->AppendCheck(XRCID("LONG_LINES"), _("Long lines"), _("Show long lines"), _("Show long lines."));
- group->AppendCheck(XRCID("WHITE_SPACES"), _("White spaces"), _("Show white spaces"), _("Show white space characters."));
- group->AppendCheck(XRCID("WRAP_MODE"), _("Wrap mode"));
- group->Append(XRCID("TOGGLE_FOLD"), _("Toggle fold"), _("Toggle current folder"), _("Toggle current folder."));
- group->AppendCheck(XRCID("SHOW_FAST_FIND"), _T("Fast find"), _T("Show fast find"), _T("Show fast find field"));
+ group->AppendCheck(XRCID("LINE_NUMBERS"), _("Line numbers"), _("Show line numbers"), _("Show line numbers at left of the text."), dcART_PLUGIN("text", "line-numbers"));
+ group->AppendCheck(XRCID("DISPLAY_EOL"), _("Display end-of-lines"), _("Display end-of-line characters"), _("end-of-line characters"), dcART_PLUGIN("text", "end-of-lines"));
+ group->AppendCheck(XRCID("INDENT_GUIDES"), _("Indent guides"), _("Show indent guides"), _("Show indent guides."), dcART_PLUGIN("text", "indent-lines"));
+ group->AppendCheck(XRCID("LONG_LINES"), _("Long lines"), _("Show long lines"), _("Show long lines."), dcART_PLUGIN("text", "long-lines"));
+ group->AppendCheck(XRCID("WHITE_SPACES"), _("White spaces"), _("Show white spaces"), _("Show white space characters."), dcART_PLUGIN("text", "white-spaces"));
+ group->AppendCheck(XRCID("WRAP_MODE"), _("Wrap mode"))->Art(dcART_PLUGIN("text", "wrap-mode"));
+ group->Append(XRCID("TOGGLE_FOLD"), _("Toggle fold"), _("Toggle current folder"), _("Toggle current folder."), dcART_PLUGIN("text", "toggle-folder"));
+ group->AppendCheck(XRCID("SHOW_FAST_FIND"), _T("Fast find"), _T("Show fast find"), _T("Show fast find field"), dcART_PLUGIN("text", "fast-find"));
entry->Append(group);
group = new dcActionGroup(wxID_ANY, wxT("Zoom"));
group->Append(XRCID("ZOOM_IN"), _("Zoom in"))->Accelerator(dcKeyCombo(wxT('+')).Ctrl()).Art("zoom-in");
@@ -477,7 +477,7 @@
}
entry->Append(group);
group = new dcActionGroup(wxID_ANY, wxT("Bookmarks"));
- group->Append(XRCID("TOGGLE_BOOKMARK"), _("Toggle bookmark"))->Accelerator(dcKeyCombo(wxT('K')).Ctrl()).Target(viewTempl).Art("bookmark-new");
+ group->Append(XRCID("TOGGLE_BOOKMARK"), _("Toggle bookmark"))->Accelerator(dcKeyCombo(wxT('K')).Ctrl()).Target(viewTempl).Art("bookmark-toggle");
group->Append(XRCID("CLEAR_BOOKMARK"), _("Remove all bookmarks"))->Target(viewTempl).Art("bookmark-remove-all");
group->Append(XRCID("NEXT_BOOKMARK"), _("Next bookmark"))->Accelerator(dcKeyCombo(wxT('N')).Ctrl()).Target(viewTempl).Art("bookmark-next");
group->Append(XRCID("PREV_BOOKMARK"), _("Previous bookmark"))->Accelerator(dcKeyCombo(wxT('P')).Ctrl()).Target(viewTempl).Art("bookmark-previous");
Added: trunk/wxdevcenter/share/pixmaps/wxDevCenter/bookmark-next.svg
===================================================================
--- trunk/wxdevcenter/share/pixmaps/wxDevCenter/bookmark-next.svg (rev 0)
+++ trunk/wxdevcenter/share/pixmaps/wxDevCenter/bookmark-next.svg 2011-01-09 13:36:31 UTC (rev 78)
@@ -0,0 +1,761 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:export-ydpi="240.00000"
+ inkscape:export-xdpi="240.00000"
+ inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
+ sodipodi:docname="bookmark-next.svg"
+ inkscape:version="0.48.0 r9654"
+ sodipodi:version="0.32"
+ id="svg249"
+ height="48.000000px"
+ width="48.000000px"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ version="1.1">
+ <defs
+ id="defs3">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 24 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="48 : 24 : 1"
+ inkscape:persp3d-origin="24 : 16 : 1"
+ id="perspective100" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient5031"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5060">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop5062" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5064" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient5029"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ id="linearGradient5048">
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="0"
+ id="stop5050" />
+ <stop
+ id="stop5056"
+ offset="0.5"
+ style="stop-color:black;stop-opacity:1;" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5052" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5048"
+ id="linearGradient5027"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+ x1="302.85715"
+ y1="366.64789"
+ x2="302.85715"
+ y2="609.50507" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2906">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2908" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2910" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2896">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop2898" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop2900" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2598">
+ <stop
+ style="stop-color:#859dbc;stop-opacity:1;"
+ offset="0"
+ id="stop2600" />
+ <stop
+ style="stop-color:#547299;stop-opacity:1;"
+ offset="1"
+ id="stop2602" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2590">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2592" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2594" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5897">
+ <stop
+ style="stop-color:#000000;stop-opacity:0.0000000;"
+ offset="0.0000000"
+ id="stop5899" />
+ <stop
+ id="stop5905"
+ offset="0.50000000"
+ style="stop-color:#000000;stop-opacity:0.56701028;" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.0000000;"
+ offset="1.0000000"
+ id="stop5901" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5866">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop5868" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop5870" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4404">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4406" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4408" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4542">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4544" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop4546" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient15662">
+ <stop
+ id="stop15664"
+ offset="0.0000000"
+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+ <stop
+ id="stop15666"
+ offset="1.0000000"
+ style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient269">
+ <stop
+ id="stop270"
+ offset="0.0000000"
+ style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+ <stop
+ id="stop271"
+ offset="1.0000000"
+ style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient259">
+ <stop
+ id="stop260"
+ offset="0.0000000"
+ style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+ <stop
+ id="stop261"
+ offset="1.0000000"
+ style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient12512">
+ <stop
+ id="stop12513"
+ offset="0.0000000"
+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+ <stop
+ id="stop12517"
+ offset="0.50000000"
+ style="stop-color:#fff520;stop-opacity:0.89108908;" />
+ <stop
+ id="stop12514"
+ offset="1.0000000"
+ style="stop-color:#fff300;stop-opacity:0.0000000;" />
+ </linearGradient>
+ <radialGradient
+ r="14.375000"
+ fy="125.00000"
+ fx="55.000000"
+ cy="125.00000"
+ cx="55.000000"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient278"
+ xlink:href="#linearGradient12512"
+ inkscape:collect="always" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient269"
+ id="radialGradient15656"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.968273,0.000000,0.000000,1.036374,3.250000,0.489522)"
+ cx="8.8244190"
+ cy="3.7561285"
+ fx="8.8244190"
+ fy="3.7561285"
+ r="37.751713" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient259"
+ id="radialGradient15658"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.960493,0.000000,0.000000,1.044769,-0.103553,-0.159183)"
+ cx="33.966679"
+ cy="35.736916"
+ fx="33.966679"
+ fy="35.736916"
+ r="86.708450" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient15662"
+ id="radialGradient15668"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.973033,0.000000,0.000000,1.034937,3.168754,0.555277)"
+ cx="8.1435566"
+ cy="7.2678967"
+ fx="8.1435566"
+ fy="7.2678967"
+ r="38.158695" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4542"
+ id="radialGradient4548"
+ cx="24.306795"
+ cy="42.07798"
+ fx="24.306795"
+ fy="42.07798"
+ r="15.821514"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.284916,0.000000,30.08928)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4404"
+ id="linearGradient4410"
+ x1="16.812500"
+ y1="1.8750000"
+ x2="16.812500"
+ y2="4.7187500"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.319549,0.000000,0.000000,1.362060,40.38853,-0.362057)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5866"
+ id="linearGradient5872"
+ x1="19.452349"
+ y1="13.174174"
+ x2="19.685436"
+ y2="27.095339"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.224255,0.000000,0.000000,1.282176,0.371569,0.264657)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5897"
+ id="linearGradient5903"
+ x1="19.000000"
+ y1="9.7738247"
+ x2="19.000000"
+ y2="15.635596"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.319549,0.000000,0.000000,2.133926,-4.476133,-14.64845)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2590"
+ id="linearGradient2596"
+ x1="19.970377"
+ y1="6.1167107"
+ x2="19.970377"
+ y2="2.53125"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.319549,0.000000,0.000000,1.280356,-5.745298,0.249007)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2598"
+ id="linearGradient2604"
+ x1="18.431311"
+ y1="19.119474"
+ x2="18.402472"
+ y2="4.2702327"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.319549,0.000000,0.000000,1.299013,-3.106200,-1.336165)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2896"
+ id="linearGradient2902"
+ x1="14.584077"
+ y1="1.6392649"
+ x2="14.552828"
+ y2="2.4912448"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,1.594214,0.000000,-0.790249)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2906"
+ id="linearGradient2912"
+ x1="13.354311"
+ y1="1.4866425"
+ x2="14.075844"
+ y2="2.4017651"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,1.184816,0.000000,-0.727880)" />
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.046729,0,0,1.55761,-48.688428,-1.1977447)"
+ r="17.171415"
+ fy="2.8969381"
+ fx="19.701141"
+ cy="2.8969381"
+ cx="19.701141"
+ id="radialGradient8656"
+ xlink:href="#linearGradient8650"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient8650"
+ inkscape:collect="always">
+ <stop
+ id="stop8652"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop8654"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2591"
+ id="radialGradient2597"
+ cx="22.291636"
+ cy="32.797512"
+ fx="22.291636"
+ fy="32.797512"
+ r="16.9562"
+ gradientTransform="matrix(0.843022,0,0,1.020168,4.499298,1.381992)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient2591">
+ <stop
+ style="stop-color:#73d216"
+ offset="0"
+ id="stop2593" />
+ <stop
+ style="stop-color:#4e9a06"
+ offset="1.0000000"
+ id="stop2595" />
+ </linearGradient>
+ <radialGradient
+ r="16.9562"
+ fy="32.797512"
+ fx="22.291636"
+ cy="32.797512"
+ cx="22.291636"
+ gradientTransform="matrix(0.843022,0,0,1.020168,-24.671141,-3.2678387)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient3147"
+ xlink:href="#linearGradient2591"
+ inkscape:collect="always" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2591"
+ id="radialGradient3209"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.843022,0,0,1.020168,-24.671141,-3.2678387)"
+ cx="22.291636"
+ cy="32.797512"
+ fx="22.291636"
+ fy="32.797512"
+ r="16.9562" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8650"
+ id="radialGradient3211"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.046729,0,0,1.55761,-48.688428,-1.1977447)"
+ cx="19.701141"
+ cy="2.8969381"
+ fx="19.701141"
+ fy="2.8969381"
+ r="17.171415" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-y="25"
+ inkscape:window-x="0"
+ inkscape:window-height="850"
+ inkscape:window-width="1440"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ showgrid="false"
+ inkscape:current-layer="layer5"
+ inkscape:cy="24.452119"
+ inkscape:cx="29.952904"
+ inkscape:zoom="13.270833"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ borderopacity="0.25490196"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ inkscape:showpageshadow="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>New Bookmark</dc:title>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>bookmark</rdf:li>
+ <rdf:li>remember</rdf:li>
+ <rdf:li>favorite</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Andreas Nilsson</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source />
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:contributor>
+ <dc:description>create bookmark action</dc:description>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer6"
+ inkscape:label="Shadow">
+ <g
+ style="display:inline"
+ id="g5022"
+ transform="matrix(2.165152e-2,0,0,1.485743e-2,43.0076,42.68539)">
+ <rect
+ y="-150.69685"
+ x="-1559.2523"
+ height="478.35718"
+ width="1339.6335"
+ id="rect4173"
+ style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path5058"
+ d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+ id="path5018"
+ sodipodi:nodetypes="cccc" />
+ </g>
+ </g>
+ <g
+ style="display:inline"
+ inkscape:groupmode="layer"
+ inkscape:label="Base"
+ id="layer1">
+ <rect
+ style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ id="rect15391"
+ width="34.875000"
+ height="41.063431"
+ x="6.5000000"
+ y="3.5000000"
+ ry="1.1490481"
+ rx="1.1490486" />
+ <rect
+ style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ id="rect15660"
+ width="32.937012"
+ height="39.028210"
+ x="7.5024552"
+ y="4.5010486"
+ ry="0.14904849"
+ rx="0.14904852" />
+ <path
+ style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.98855311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.017543854"
+ d="M 11.505723,5.4942766 L 11.505723,43.400869"
+ id="path15672"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.20467831"
+ d="M 12.500000,5.0205154 L 12.500000,43.038228"
+ id="path15674"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Text"
+ style="display:inline">
+ <g
+ id="g2188">
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15686"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="9.0000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15688"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="11.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15690"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="13.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15692"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="15.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15694"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="17.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15696"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="19.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15698"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="21.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15700"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="23.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15732"
+ width="9.0000057"
+ height="1.0000000"
+ x="15.999986"
+ y="25.000000"
+ rx="0.062003858"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15736"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999986"
+ y="29.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15738"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999986"
+ y="31.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15740"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999986"
+ y="33.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15742"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999986"
+ y="35.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15744"
+ width="14.000014"
+ height="1.0000000"
+ x="15.999986"
+ y="37.000000"
+ rx="0.096450485"
+ ry="0.065390877" />
+ </g>
+ <path
+ style="opacity:0.28021976;fill:url(#linearGradient5872);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 28.245858,31.324906 L 21.147869,27.133701 L 14.30757,30.8838 L 13.761859,3.9475667 L 28.549598,3.9475667 L 28.245858,31.324906 z "
+ id="path5138"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ style="fill:url(#linearGradient2604);fill-opacity:1;fill-rule:evenodd;stroke:#364878;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ d="M 12.427339,3.5180202 C 12.427339,3.5180202 12.240033,0.60520607 15.107867,0.54270607 L 25.119343,0.50728624 C 26.277287,0.50728624 26.581888,1.1910178 26.581888,2.1095589 L 26.581888,29.729916 L 20.545426,24.533862 L 14.674346,29.729916 L 14.591655,3.519629 L 12.427339,3.5180202 z "
+ id="path2204"
+ sodipodi:nodetypes="ccccccccc" />
+ <path
+ style="opacity:0.4450549;fill:url(#linearGradient4410);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 13.030252,3.0117919 C 13.011046,2.225362 13.312918,1.0801307 15.375418,1.0176307 L 25.027906,1 C 25.640922,1 26.090152,1.1674319 26.090152,1.7994802 L 26.060994,10.491851 L 15.317102,10.491851 L 15.192102,2.9993251 C 15.192102,2.9993251 13.030252,3.0117919 13.030252,3.0117919 z "
+ id="path3668"
+ sodipodi:nodetypes="cccccccs" />
+ <rect
+ style="opacity:0.28021976;fill:url(#linearGradient5903);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect5895"
+ width="10.556392"
+ height="12.803556"
+ x="15.317101"
+ y="6.6907959"
+ rx="0.062003858"
+ ry="0.065390877" />
+ <path
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2596);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.19125683;display:inline"
+ d="M 24.476832,2.2095507 L 25.575535,3.113139 L 25.547445,27.511911 L 20.497463,23.203758 L 15.704084,27.415203 L 15.699081,2.7495618 L 24.476832,2.2095507 z "
+ id="path5969"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ style="opacity:0.48295456;color:#000000;fill:url(#linearGradient2912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 15.158602,3.9384083 L 15.114407,1.0335178 C 12.983906,1.0335178 12.993087,2.9680775 12.993087,3.9384083 L 15.158602,3.9384083 z "
+ id="path2894"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path2904"
+ d="M 15.158602,3.9384086 L 15.114407,1.8247593 C 12.81631,1.8426926 12.993087,3.9384086 12.993087,3.9384086 L 15.158602,3.9384086 z "
+ style="opacity:0.35795455;color:#000000;fill:url(#linearGradient2902);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <g
+ id="g3204"
+ transform="matrix(0.5,0,0,0.5,34.248038,25.620094)">
+ <path
+ style="color:#000000;fill:url(#radialGradient3209);fill-opacity:1;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.00000036;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+ d="m -20.616251,10.867517 0,16.994419 12.9838134,0 0,8.545038 19.9598346,-16.90644 -20.0786446,-17.0252481 0,8.3975351 -12.8650034,-0.0053 z"
+ id="path8643"
+ sodipodi:nodetypes="cccccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ style="opacity:0.5080214;color:#000000;fill:url(#radialGradient3211);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+ d="m -7.2080526,3.5986724 0,7.8064746 -12.8171714,0 0,9.040713 c 17.7500014,1.999999 16.6335384,-7.455288 31.383538,-0.955288 L -7.2080526,3.5986724 z"
+ id="path8645"
+ sodipodi:nodetypes="cccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccc"
+ id="path8658"
+ d="m -19.632737,11.912061 0,14.984439 12.9853684,0 0,7.395166 17.4780136,-14.79569 -17.4939746,-14.7804003 0,7.2013823 -12.9694074,-0.0049 z"
+ style="opacity:0.48128339;color:#000000;fill:none;stroke:#ffffff;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+</svg>
Added: trunk/wxdevcenter/share/pixmaps/wxDevCenter/bookmark-previous.svg
===================================================================
--- trunk/wxdevcenter/share/pixmaps/wxDevCenter/bookmark-previous.svg (rev 0)
+++ trunk/wxdevcenter/share/pixmaps/wxDevCenter/bookmark-previous.svg 2011-01-09 13:36:31 UTC (rev 78)
@@ -0,0 +1,817 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:export-ydpi="240.00000"
+ inkscape:export-xdpi="240.00000"
+ inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
+ sodipodi:docname="bookmark-previous.svg"
+ inkscape:version="0.48.0 r9654"
+ sodipodi:version="0.32"
+ id="svg249"
+ height="48.000000px"
+ width="48.000000px"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ version="1.1">
+ <defs
+ id="defs3">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 24 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="48 : 24 : 1"
+ inkscape:persp3d-origin="24 : 16 : 1"
+ id="perspective100" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient5031"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5060">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop5062" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5064" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient5029"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ id="linearGradient5048">
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="0"
+ id="stop5050" />
+ <stop
+ id="stop5056"
+ offset="0.5"
+ style="stop-color:black;stop-opacity:1;" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5052" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5048"
+ id="linearGradient5027"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+ x1="302.85715"
+ y1="366.64789"
+ x2="302.85715"
+ y2="609.50507" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2906">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2908" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2910" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2896">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop2898" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop2900" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2598">
+ <stop
+ style="stop-color:#859dbc;stop-opacity:1;"
+ offset="0"
+ id="stop2600" />
+ <stop
+ style="stop-color:#547299;stop-opacity:1;"
+ offset="1"
+ id="stop2602" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2590">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2592" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2594" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5897">
+ <stop
+ style="stop-color:#000000;stop-opacity:0.0000000;"
+ offset="0.0000000"
+ id="stop5899" />
+ <stop
+ id="stop5905"
+ offset="0.50000000"
+ style="stop-color:#000000;stop-opacity:0.56701028;" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.0000000;"
+ offset="1.0000000"
+ id="stop5901" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5866">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop5868" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop5870" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4404">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4406" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4408" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4542">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4544" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop4546" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient15662">
+ <stop
+ id="stop15664"
+ offset="0.0000000"
+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+ <stop
+ id="stop15666"
+ offset="1.0000000"
+ style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient269">
+ <stop
+ id="stop270"
+ offset="0.0000000"
+ style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+ <stop
+ id="stop271"
+ offset="1.0000000"
+ style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient259">
+ <stop
+ id="stop260"
+ offset="0.0000000"
+ style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+ <stop
+ id="stop261"
+ offset="1.0000000"
+ style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient12512">
+ <stop
+ id="stop12513"
+ offset="0.0000000"
+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+ <stop
+ id="stop12517"
+ offset="0.50000000"
+ style="stop-color:#fff520;stop-opacity:0.89108908;" />
+ <stop
+ id="stop12514"
+ offset="1.0000000"
+ style="stop-color:#fff300;stop-opacity:0.0000000;" />
+ </linearGradient>
+ <radialGradient
+ r="14.375000"
+ fy="125.00000"
+ fx="55.000000"
+ cy="125.00000"
+ cx="55.000000"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient278"
+ xlink:href="#linearGradient12512"
+ inkscape:collect="always" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient269"
+ id="radialGradient15656"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.968273,0.000000,0.000000,1.036374,3.250000,0.489522)"
+ cx="8.8244190"
+ cy="3.7561285"
+ fx="8.8244190"
+ fy="3.7561285"
+ r="37.751713" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient259"
+ id="radialGradient15658"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.960493,0.000000,0.000000,1.044769,-0.103553,-0.159183)"
+ cx="33.966679"
+ cy="35.736916"
+ fx="33.966679"
+ fy="35.736916"
+ r="86.708450" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient15662"
+ id="radialGradient15668"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.973033,0.000000,0.000000,1.034937,3.168754,0.555277)"
+ cx="8.1435566"
+ cy="7.2678967"
+ fx="8.1435566"
+ fy="7.2678967"
+ r="38.158695" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4542"
+ id="radialGradient4548"
+ cx="24.306795"
+ cy="42.07798"
+ fx="24.306795"
+ fy="42.07798"
+ r="15.821514"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.284916,0.000000,30.08928)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4404"
+ id="linearGradient4410"
+ x1="16.812500"
+ y1="1.8750000"
+ x2="16.812500"
+ y2="4.7187500"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.319549,0.000000,0.000000,1.362060,40.38853,-0.362057)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5866"
+ id="linearGradient5872"
+ x1="19.452349"
+ y1="13.174174"
+ x2="19.685436"
+ y2="27.095339"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.224255,0.000000,0.000000,1.282176,0.371569,0.264657)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5897"
+ id="linearGradient5903"
+ x1="19.000000"
+ y1="9.7738247"
+ x2="19.000000"
+ y2="15.635596"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.319549,0.000000,0.000000,2.133926,-4.476133,-14.64845)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2590"
+ id="linearGradient2596"
+ x1="19.970377"
+ y1="6.1167107"
+ x2="19.970377"
+ y2="2.53125"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.319549,0.000000,0.000000,1.280356,-5.745298,0.249007)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2598"
+ id="linearGradient2604"
+ x1="18.431311"
+ y1="19.119474"
+ x2="18.402472"
+ y2="4.2702327"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.319549,0.000000,0.000000,1.299013,-3.106200,-1.336165)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2896"
+ id="linearGradient2902"
+ x1="14.584077"
+ y1="1.6392649"
+ x2="14.552828"
+ y2="2.4912448"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,1.594214,0.000000,-0.790249)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2906"
+ id="linearGradient2912"
+ x1="13.354311"
+ y1="1.4866425"
+ x2="14.075844"
+ y2="2.4017651"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,1.184816,0.000000,-0.727880)" />
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.046729,0,0,1.55761,-32.487486,-9.5619521)"
+ r="17.171415"
+ fy="2.8969381"
+ fx="19.701141"
+ cy="2.8969381"
+ cx="19.701141"
+ id="radialGradient8656"
+ xlink:href="#linearGradient8650"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient8650"
+ inkscape:collect="always">
+ <stop
+ id="stop8652"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop8654"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2591"
+ id="radialGradient2597"
+ cx="22.291636"
+ cy="32.797512"
+ fx="22.291636"
+ fy="32.797512"
+ r="16.9562"
+ gradientTransform="matrix(0.843022,0,0,1.020168,4.499298,1.381992)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient2591">
+ <stop
+ style="stop-color:#73d216"
+ offset="0"
+ id="stop2593" />
+ <stop
+ style="stop-color:#4e9a06"
+ offset="1.0000000"
+ id="stop2595" />
+ </linearGradient>
+ <radialGradient
+ r="16.9562"
+ fy="32.797512"
+ fx="22.291636"
+ cy="32.797512"
+ cx="22.291636"
+ gradientTransform="matrix(0.843022,0,0,1.020168,-8.4701982,-11.632046)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient3147"
+ xlink:href="#linearGradient2591"
+ inkscape:collect="always" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2591-1"
+ id="radialGradient2597-8"
+ cx="22.291636"
+ cy="32.797512"
+ fx="22.291636"
+ fy="32.797512"
+ r="16.9562"
+ gradientTransform="matrix(-0.843022,0,0,1.020168,43.57646,1.205215)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient2591-1">
+ <stop
+ style="stop-color:#73d216"
+ offset="0"
+ id="stop2593-9" />
+ <stop
+ style="stop-color:#4e9a06"
+ offset="1.0000000"
+ id="stop2595-9" />
+ </linearGradient>
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-2.046729,0,0,1.55761,38.15461,-1.3613048)"
+ r="17.171415"
+ fy="5.7859797"
+ fx="25.075571"
+ cy="5.7859797"
+ cx="25.075571"
+ id="radialGradient8656-7"
+ xlink:href="#linearGradient8650-8"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient8650-8"
+ inkscape:collect="always">
+ <stop
+ id="stop8652-2"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop8654-5"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ r="16.9562"
+ fy="32.797512"
+ fx="22.291636"
+ cy="32.797512"
+ cx="22.291636"
+ gradientTransform="matrix(-0.843022,0,0,1.020168,14.13732,-3.4313988)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient3170"
+ xlink:href="#linearGradient2591-1"
+ inkscape:collect="always" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2591-1"
+ id="radialGradient3276"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.843022,0,0,1.020168,14.13732,-3.4313988)"
+ cx="22.291636"
+ cy="32.797512"
+ fx="22.291636"
+ fy="32.797512"
+ r="16.9562" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8650-8"
+ id="radialGradient3278"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-2.046729,0,0,1.55761,38.15461,-1.3613048)"
+ cx="25.075571"
+ cy="5.7859797"
+ fx="25.075571"
+ fy="5.7859797"
+ r="17.171415" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-y="25"
+ inkscape:window-x="0"
+ inkscape:window-height="850"
+ inkscape:window-width="1440"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ showgrid="false"
+ inkscape:current-layer="layer5"
+ inkscape:cy="24"
+ inkscape:cx="8.2511774"
+ inkscape:zoom="13.270833"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ borderopacity="0.25490196"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ inkscape:showpageshadow="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>New Bookmark</dc:title>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>bookmark</rdf:li>
+ <rdf:li>remember</rdf:li>
+ <rdf:li>favorite</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Andreas Nilsson</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source />
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:contributor>
+ <dc:description>create bookmark action</dc:description>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer6"
+ inkscape:label="Shadow">
+ <g
+ style="display:inline"
+ id="g5022"
+ transform="matrix(2.165152e-2,0,0,1.485743e-2,43.0076,42.68539)">
+ <rect
+ y="-150.69685"
+ x="-1559.2523"
+ height="478.35718"
+ width="1339.6335"
+ id="rect4173"
+ style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path5058"
+ d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+ id="path5018"
+ sodipodi:nodetypes="cccc" />
+ </g>
+ </g>
+ <g
+ style="display:inline"
+ inkscape:groupmode="layer"
+ inkscape:label="Base"
+ id="layer1">
+ <rect
+ style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ id="rect15391"
+ width="34.875000"
+ height="41.063431"
+ x="6.5000000"
+ y="3.5000000"
+ ry="1.1490481"
+ rx="1.1490486" />
+ <rect
+ style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ id="rect15660"
+ width="32.937012"
+ height="39.028210"
+ x="7.5024552"
+ y="4.5010486"
+ ry="0.14904849"
+ rx="0.14904852" />
+ <path
+ style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.988553...
[truncated message content] |
|
From: <cur...@us...> - 2011-01-06 19:00:34
|
Revision: 77
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=77&view=rev
Author: cursorstar
Date: 2011-01-06 19:00:28 +0000 (Thu, 06 Jan 2011)
Log Message:
-----------
Asynchronously update UI (including ribbon) to prevent crach.
Modified Paths:
--------------
trunk/wxdevcenter/src/uistd/stdframe.cpp
trunk/wxdevcenter/src/uistd/stdframe.hpp
Modified: trunk/wxdevcenter/src/uistd/stdframe.cpp
===================================================================
--- trunk/wxdevcenter/src/uistd/stdframe.cpp 2011-01-04 20:43:12 UTC (rev 76)
+++ trunk/wxdevcenter/src/uistd/stdframe.cpp 2011-01-06 19:00:28 UTC (rev 77)
@@ -109,6 +109,31 @@
}
//==========================================================================
+// dcStandardTopFrameUpdateUIEvent
+//==========================================================================
+
+wxDECLARE_EVENT(STANDARDTOPFRAME_UPDATEUI_EVENT, dcStandardTopFrameUpdateUIEvent);
+
+class dcStandardTopFrameUpdateUIEvent: public wxEvent
+{
+private:
+ dcPerspective perspec;
+public:
+ dcStandardTopFrameUpdateUIEvent(const dcPerspective& perspec)
+ : wxEvent(wxID_ANY, STANDARDTOPFRAME_UPDATEUI_EVENT),
+ perspec(perspec)
+ {
+ }
+ virtual ~dcStandardTopFrameUpdateUIEvent(){}
+ virtual wxEvent *Clone() const { return new dcStandardTopFrameUpdateUIEvent(perspec); }
+ const dcPerspective& GetPerspective() const { return perspec; }
+};
+
+wxDEFINE_EVENT(STANDARDTOPFRAME_UPDATEUI_EVENT, dcStandardTopFrameUpdateUIEvent);
+#define dcStandardTopFrameUpdateUIEventHandler(func) (&func)
+#define EVT_STANDARDTOPFRAME_UPDATEUI(func) wx__DECLARE_EVT1(STANDARDTOPFRAME_UPDATEUI_EVENT, wxID_ANY, dcStandardTopFrameUpdateUIEventHandler(func))
+
+//==========================================================================
// dcStandardTopFrame
//==========================================================================
@@ -117,6 +142,7 @@
BEGIN_EVENT_TABLE(dcStandardTopFrame, dcTopFrame)
EVT_RIBBONBUTTONBAR_CLICKED(wxID_ANY, dcStandardTopFrame::OnRibbonButtonBar)
EVT_PERSPECTIVE_CHANGED(dcStandardTopFrame::OnPerspectiveChanged)
+ EVT_STANDARDTOPFRAME_UPDATEUI(dcStandardTopFrame::OnUpdateUi)
EVT_ACTIVATE(dcStandardTopFrame::OnWindowActivate)
EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, dcStandardTopFrame::OnNotebookChanged)
EVT_AUINOTEBOOK_PAGE_CHANGING(wxID_ANY, dcStandardTopFrame::OnNotebookChanging)
@@ -125,8 +151,6 @@
EVT_ACTION(XRCID("STF_WORK_BARS"), dcStandardTopFrame::OnShowWorkBar)
END_EVENT_TABLE()
-
-
dcStandardTopFrame::dcStandardTopFrame():
dcTopFrame(),
m_isInit(false),
@@ -218,20 +242,23 @@
void dcStandardTopFrame::UpdateUI(dcPerspective perspect)
{
+ dcStandardTopFrameUpdateUIEvent event(perspect);
+ AddPendingEvent(event);
+}
+
+void dcStandardTopFrame::OnUpdateUi(dcStandardTopFrameUpdateUIEvent& event)
+{
+ dcPerspective perspec = event.GetPerspective();
+
// Freeze UI update
Freeze();
// Update the WorkBar
- UpdateWorkBars(perspect);
+ UpdateWorkBars(perspec);
// Update the RibbonBar
- UpdateRibbon(perspect);
-
- // Update action tree and UI
-/* wxMenuBar* menubar = GetMenuBar();
- if(menubar)
- dcActionManager::GetManager().GetTree().FillMenuBar(menubar, perspect);
-*/
+ UpdateRibbon(perspec);
+
m_mgr.Update();
UpdateTitle();
Modified: trunk/wxdevcenter/src/uistd/stdframe.hpp
===================================================================
--- trunk/wxdevcenter/src/uistd/stdframe.hpp 2011-01-04 20:43:12 UTC (rev 76)
+++ trunk/wxdevcenter/src/uistd/stdframe.hpp 2011-01-06 19:00:28 UTC (rev 77)
@@ -13,6 +13,8 @@
class wxRibbonBar;
class wxRibbonButtonBarEvent;
+class dcStandardTopFrameUpdateUIEvent; // Private
+
/**
* Standard top-frame implementation.
* Implementation of top frame with std mdi frame and wxAUI.
@@ -70,7 +72,7 @@
virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
void UpdateRibbon(dcPerspective& perspect);
-
+
private:
dcPerspective GetTabPerspective(int index);
@@ -81,6 +83,7 @@
void DoInitWorkBar();
void ShowWorkBar(dcWorkBar* bar, bool shown, bool force, dcPerspective& perspect);
+ void OnUpdateUi(dcStandardTopFrameUpdateUIEvent& event);
void OnPerspectiveChanged(dcPerspectiveEvent& event);
void OnWindowActivate(wxActivateEvent& event);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2011-01-04 20:43:18
|
Revision: 76
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=76&view=rev
Author: cursorstar
Date: 2011-01-04 20:43:12 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
Remove debug traces
Modified Paths:
--------------
trunk/wxdevcenter/src/ui/art.cpp
Modified: trunk/wxdevcenter/src/ui/art.cpp
===================================================================
--- trunk/wxdevcenter/src/ui/art.cpp 2011-01-04 20:17:15 UTC (rev 75)
+++ trunk/wxdevcenter/src/ui/art.cpp 2011-01-04 20:43:12 UTC (rev 76)
@@ -52,27 +52,18 @@
wxPathList list = dcConfig::GetArtPathList();
wxString path;
-printf("nb : %d\n", list.GetCount());
-for(unsigned int i=0; i<list.GetCount(); i++)
- printf(" -> %s\n", (const char*)list.Item(i).c_str());
-
wxSize sz = size;
if(sz==wxDefaultSize)
sz = wxArtProvider::GetSizeHint(client, true);
-printf(">> %s\n", (const char*)id.c_str());
-
path=id+wxT(".svg");
path=list.FindValidPath(path);
if(!path.IsEmpty())
{
-printf("++ %s\n", (const char*)path.c_str());
wxBitmap bmp = dcSVG::LoadSVG(path, size);
if(bmp.IsOk())
return bmp;
}
- else
-printf("--\n");
if(size!=wxDefaultSize)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2011-01-04 20:17:27
|
Revision: 75
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=75&view=rev
Author: cursorstar
Date: 2011-01-04 20:17:15 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
Move share/pixmaps/wxdevcenter to share/pixmaps/wxDevCenter
Added Paths:
-----------
trunk/wxdevcenter/share/pixmaps/wxDevCenter/
trunk/wxdevcenter/share/pixmaps/wxDevCenter/Preferences.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/Terminal.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/application-exit.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/document-close-all.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/document-close.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/document-new.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/document-open.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/document-revert.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/document-save-all.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/document-save-as.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/document-save.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/edit-clear.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/edit-copy.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/edit-cut.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/edit-delete.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/edit-find-replace.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/edit-find.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/edit-paste.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/edit-redo.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/edit-select-all.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/edit-select-line.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/edit-undo.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/help-about.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/image-missing.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/system-search.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/window-close.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/workbar.svg
trunk/wxdevcenter/share/pixmaps/wxDevCenter/wxdevcenter.png
trunk/wxdevcenter/share/pixmaps/wxDevCenter/wxdevcenter.svg
Added: trunk/wxdevcenter/share/pixmaps/wxDevCenter/Preferences.svg
===================================================================
--- trunk/wxdevcenter/share/pixmaps/wxDevCenter/Preferences.svg (rev 0)
+++ trunk/wxdevcenter/share/pixmaps/wxDevCenter/Preferences.svg 2011-01-04 20:17:15 UTC (rev 75)
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:export-ydpi="90.000000"
+ inkscape:export-xdpi="90.000000"
+ inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+ width="48px"
+ height="48px"
+ id="svg11300"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/categories"
+ sodipodi:docname="preferences-system.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs3">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 24 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="48 : 24 : 1"
+ inkscape:persp3d-origin="24 : 16 : 1"
+ id="perspective60" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2250">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2252" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2254" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2265">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop2267" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop2269" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2257">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2259" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2261" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3087">
+ <stop
+ style="stop-color:#3465a4;stop-opacity:1;"
+ offset="0"
+ id="stop3089" />
+ <stop
+ id="stop3095"
+ offset="0"
+ style="stop-color:#9fbce1;stop-opacity:1;" />
+ <stop
+ style="stop-color:#6b95ca;stop-opacity:1;"
+ offset="0"
+ id="stop2242" />
+ <stop
+ id="stop2244"
+ offset="0.75"
+ style="stop-color:#3d6aa5;stop-opacity:1;" />
+ <stop
+ style="stop-color:#386eb4;stop-opacity:1;"
+ offset="1"
+ id="stop3091" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3077">
+ <stop
+ style="stop-color:#98a0a9;stop-opacity:1;"
+ offset="0"
+ id="stop3079" />
+ <stop
+ style="stop-color:#c3d0dd;stop-opacity:1;"
+ offset="1"
+ id="stop3081" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3061">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3063" />
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="1"
+ id="stop3065" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3049">
+ <stop
+ style="stop-color:#b6b6b6;stop-opacity:1;"
+ offset="0"
+ id="stop3051" />
+ <stop
+ id="stop2262"
+ offset="0.5"
+ style="stop-color:#f2f2f2;stop-opacity:1;" />
+ <stop
+ style="stop-color:#fafafa;stop-opacity:1;"
+ offset="0.67612958"
+ id="stop2264" />
+ <stop
+ id="stop2268"
+ offset="0.84051722"
+ style="stop-color:#d8d8d8;stop-opacity:1;" />
+ <stop
+ id="stop2266"
+ offset="0.875"
+ style="stop-color:#f2f2f2;stop-opacity:1;" />
+ <stop
+ style="stop-color:#dbdbdb;stop-opacity:1;"
+ offset="1"
+ id="stop3053" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3041">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3043" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3045" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3041"
+ id="radialGradient3047"
+ cx="24.8125"
+ cy="39.125"
+ fx="24.8125"
+ fy="39.125"
+ r="17.6875"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.374558,7.194333e-15,24.47041)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3049"
+ id="linearGradient3055"
+ x1="19.648342"
+ y1="42.253601"
+ x2="20.631224"
+ y2="6.7758031"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.878270,0.000000,0.000000,0.878270,2.536988,4.967681)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3061"
+ id="linearGradient3067"
+ x1="50.152931"
+ y1="-3.6324477"
+ x2="25.291086"
+ y2="-4.3002653"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.878270,-1.375944e-15,1.375944e-15,0.878270,5.328299,1.650243)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3077"
+ id="linearGradient3083"
+ x1="38.227654"
+ y1="13.602527"
+ x2="37.53537"
+ y2="6.6285896"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.878270,0.000000,0.000000,0.878270,2.847503,5.588712)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3087"
+ id="linearGradient3093"
+ x1="9.7503242"
+ y1="32.28376"
+ x2="16.915297"
+ y2="39.443218"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.878270,0.000000,0.000000,0.878270,2.536988,4.967681)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2257"
+ id="linearGradient2263"
+ x1="12.004697"
+ y1="35.688461"
+ x2="10.650805"
+ y2="33.194965"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.007254,-2.636526e-2,2.636526e-2,1.007254,1.593411,7.919100e-2)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2265"
+ id="linearGradient2271"
+ x1="14.017542"
+ y1="36.942543"
+ x2="15.415793"
+ y2="38.268368"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.878099,-1.732370e-2,1.732370e-2,0.878099,2.163687,4.067899)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2250"
+ id="linearGradient2256"
+ x1="31.177404"
+ y1="19.821514"
+ x2="40.859177"
+ y2="9.6568537"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3041"
+ id="radialGradient2260"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.374558,7.272829e-15,24.47041)"
+ cx="24.8125"
+ cy="39.125"
+ fx="24.8125"
+ fy="39.125"
+ r="17.6875" />
+ </defs>
+ <sodipodi:namedview
+ stroke="#204a87"
+ fill="#3465a4"
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="0.25490196"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4"
+ inkscape:cx="19.425317"
+ inkscape:cy="26.37487"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:showpageshadow="false"
+ inkscape:window-width="1034"
+ inkscape:window-height="818"
+ inkscape:window-x="400"
+ inkscape:window-y="30" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source>http://jimmac.musichall.cz</dc:source>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ <dc:title>Preferences System</dc:title>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>preferences</rdf:li>
+ <rdf:li>settings</rdf:li>
+ <rdf:li>control panel</rdf:li>
+ <rdf:li>tweaks</rdf:li>
+ <rdf:li>system</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <path
+ transform="matrix(0.751118,0.000000,0.000000,0.578703,17.04087,19.36341)"
+ d="M 42.5 39.125 A 17.6875 6.625 0 1 1 7.125,39.125 A 17.6875 6.625 0 1 1 42.5 39.125 z"
+ sodipodi:ry="6.625"
+ sodipodi:rx="17.6875"
+ sodipodi:cy="39.125"
+ sodipodi:cx="24.8125"
+ id="path2258"
+ style="opacity:0.19886367;color:#000000;fill:url(#radialGradient2260);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.3125;color:#000000;fill:url(#radialGradient3047);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="path3039"
+ sodipodi:cx="24.8125"
+ sodipodi:cy="39.125"
+ sodipodi:rx="17.6875"
+ sodipodi:ry="6.625"
+ d="M 42.5 39.125 A 17.6875 6.625 0 1 1 7.125,39.125 A 17.6875 6.625 0 1 1 42.5 39.125 z"
+ transform="matrix(0.836071,0.000000,0.000000,0.685436,-7.959607,15.71781)" />
+ <path
+ style="opacity:1;color:#000000;fill:url(#linearGradient3055);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 17.906713,21.215676 L 36.899302,40.6474 C 37.667788,41.52567 40.102812,42.204461 41.729787,40.6474 C 43.300913,39.143787 42.937408,37.024536 41.400436,35.487563 L 23.176333,15.946056 C 25.426333,9.696056 20.872444,4.446488 14.997444,5.571488 L 13.73493,6.7242174 L 17.687145,10.456865 L 17.906713,13.750381 L 14.955871,16.443984 L 11.429472,16.05584 L 7.8066086,12.652544 C 7.8066086,12.652544 6.5364873,13.907448 6.5364873,13.907448 C 5.9457238,19.548765 11.844213,24.590676 17.906713,21.215676 z "
+ id="path2140"
+ sodipodi:nodetypes="cczcccccccccsc" />
+ <path
+ sodipodi:nodetypes="cczccccccccccc"
+ id="path3057"
+ d="M 18.117385,19.9401 L 37.320267,39.967712 C 37.915174,40.647605 39.800194,41.173077 41.059681,39.967712 C 42.275934,38.803723 41.994534,37.163152 40.804721,35.973338 L 22.313189,16.352183 C 23.813189,9.852183 20.454401,6.3475455 15.454401,6.4725455 L 15.18427,6.7459223 L 18.787193,9.982189 L 18.917359,14.163983 L 15.303442,17.462466 L 11.061136,17.004257 L 7.8845536,14.012776 L 7.5319165,14.442835 C 7.2194165,20.411585 14.023635,23.1276 18.117385,19.9401 z "
+ style="opacity:0.42613639;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999917;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <rect
+ style="opacity:0.17045456;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3067);stroke-width:0.9999972;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect3059"
+ width="23.268276"
+ height="2.0554912"
+ x="28.185335"
+ y="-2.6184492"
+ rx="0.88388073"
+ ry="0.88388073"
+ transform="matrix(0.697938,0.716158,-0.716158,0.697938,0.000000,0.000000)" />
+ <path
+ style="opacity:1;color:#000000;fill:url(#linearGradient3083);fill-opacity:1;fill-rule:nonzero;stroke:#878f9d;stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 22.498794,30.12538 C 23.332335,29.410917 35.782628,16.676871 35.782628,16.676871 L 38.856573,16.457303 L 43.687058,9.7604906 L 39.662731,6.1752987 L 33.405057,11.554705 L 33.405057,14.628651 L 20.670142,27.857593 C 20.066332,28.461403 21.730308,30.784082 22.498794,30.12538 z "
+ id="path2144"
+ sodipodi:nodetypes="ccccccccc" />
+ <path
+ sodipodi:nodetypes="ccccccccc"
+ id="path3085"
+ d="M 22.401987,29.085455 C 23.04876,28.531078 35.426388,15.855648 35.426388,15.855648 L 38.354971,15.607649 L 42.568887,9.945584 L 39.679156,7.3965946 L 34.202578,12.114067 L 34.357836,14.965022 L 21.681731,28.257345 C 21.213213,28.725863 21.805692,29.596565 22.401987,29.085455 z "
+ style="opacity:0.53977272;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2256);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="color:#000000;fill:url(#linearGradient3093);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible"
+ d="M 8.4653111,43.611561 C 9.7818986,45.07679 13.438996,45.739726 15.060755,42.901647 C 15.767862,41.664211 17.154698,38.198845 23.341883,32.630379 C 24.381029,31.696208 25.481792,29.559241 24.54863,28.406512 L 22.133387,25.991269 C 21.145334,24.893432 18.398973,25.40552 17.272212,26.942145 C 13.913455,31.538339 8.4261393,35.197025 7.1887023,35.638967 C 4.8207828,36.484652 5.0872917,39.975116 6.6538792,41.635454 L 8.4653111,43.611561 z "
+ id="path2142"
+ sodipodi:nodetypes="ccccccscc" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#a1a1a1;stroke-width:1.13860166;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="path2146"
+ sodipodi:cx="41.875"
+ sodipodi:cy="37.5"
+ sodipodi:rx="1.375"
+ sodipodi:ry="1.375"
+ d="M 43.25 37.5 A 1.375 1.375 0 1 1 40.5,37.5 A 1.375 1.375 0 1 1 43.25 37.5 z"
+ transform="matrix(0.878270,0.000000,0.000000,0.878270,2.427204,5.077464)" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:0.60227272;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="path3101"
+ sodipodi:cx="19.003494"
+ sodipodi:cy="28.20101"
+ sodipodi:rx="1.767767"
+ sodipodi:ry="1.767767"
+ d="M 20.771261 28.20101 A 1.767767 1.767767 0 1 1 17.235727,28.20101 A 1.767767 1.767767 0 1 1 20.771261 28.20101 z"
+ transform="matrix(0.570876,0.000000,0.000000,0.570876,9.154848,11.25111)" />
+ <path
+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2263);stroke-width:2.29450917;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 18.678905,29.624807 C 18.678905,29.624807 11.509014,36.92442 8.1502573,38.161857"
+ id="path3103"
+ sodipodi:nodetypes="cc" />
+ <path
+ sodipodi:nodetypes="csccccscc"
+ id="path2270"
+ d="M 8.8060013,42.48669 C 10.247267,44.232307 13.405535,44.647919 14.397161,42.116101 C 15.078468,40.376589 17.730783,36.450314 22.594745,32.072748 C 23.411654,31.338363 24.277003,29.658419 23.543411,28.752218 L 21.644704,26.853511 C 20.867961,25.990463 18.708951,26.393033 17.823164,27.601028 C 15.182728,31.214257 9.3398194,35.940582 7.9274145,36.406654 C 5.7406198,37.128264 6.1504221,39.627953 7.3819713,40.933203 L 8.8060013,42.48669 z "
+ style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999946;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;opacity:0.19886364" />
+ <path
+ style="opacity:0.27840911;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2271);stroke-width:2.29450917;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 20.824602,31.261024 C 20.824602,31.261024 13.501839,37.878429 11.910849,42.121069"
+ id="path2247"
+ sodipodi:nodetypes="cc" />
+ </g>
+</svg>
Added: trunk/wxdevcenter/share/pixmaps/wxDevCenter/Terminal.svg
===================================================================
--- trunk/wxdevcenter/share/pixmaps/wxDevCenter/Terminal.svg (rev 0)
+++ trunk/wxdevcenter/share/pixmaps/wxDevCenter/Terminal.svg 2011-01-04 20:17:15 UTC (rev 75)
@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48px"
+ height="48px"
+ id="svg1306"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/apps"
+ sodipodi:docname="utilities-terminal.svg"
+ inkscape:export-filename="/home/andreas/projekt/bild/tango/terminal4.png"
+ inkscape:export-xdpi="240.00000"
+ inkscape:export-ydpi="240.00000"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs1308">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 24 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="48 : 24 : 1"
+ inkscape:persp3d-origin="24 : 16 : 1"
+ id="perspective79" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient5031"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5060">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop5062" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5064" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient5029"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ id="linearGradient5048">
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="0"
+ id="stop5050" />
+ <stop
+ id="stop5056"
+ offset="0.5"
+ style="stop-color:black;stop-opacity:1;" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5052" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5048"
+ id="linearGradient5027"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+ x1="302.85715"
+ y1="366.64789"
+ x2="302.85715"
+ y2="609.50507" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6447">
+ <stop
+ style="stop-color:#777973;stop-opacity:1;"
+ offset="0"
+ id="stop6449" />
+ <stop
+ style="stop-color:#777973;stop-opacity:0;"
+ offset="1"
+ id="stop6451" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4254">
+ <stop
+ style="stop-color:#616161;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop4256" />
+ <stop
+ style="stop-color:#a0a0a0;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop4258" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5176">
+ <stop
+ id="stop5178"
+ offset="0.0000000"
+ style="stop-color:#a2a59c;stop-opacity:1.0000000;" />
+ <stop
+ id="stop5180"
+ offset="1.0000000"
+ style="stop-color:#535750;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2667">
+ <stop
+ id="stop2669"
+ offset="0.0000000"
+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+ <stop
+ id="stop2671"
+ offset="1.0000000"
+ style="stop-color:#fcfcff;stop-opacity:0.0000000;" />
+ </linearGradient>
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="26.729263"
+ x2="17.199417"
+ y1="1.6537577"
+ x1="11.492236"
+ gradientTransform="matrix(1.236157,0.000000,0.000000,0.896051,-1.081820,2.830699)"
+ id="linearGradient2673"
+ xlink:href="#linearGradient2667"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2238">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2240" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2242" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2224">
+ <stop
+ style="stop-color:#32342f;stop-opacity:0.54639173;"
+ offset="0.0000000"
+ id="stop2226" />
+ <stop
+ style="stop-color:#32342f;stop-opacity:0;"
+ offset="1"
+ id="stop2228" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2214">
+ <stop
+ style="stop-color:#a9aaa7;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop2216" />
+ <stop
+ style="stop-color:#676964;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop2218" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2206">
+ <stop
+ style="stop-color:#777973;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop2208" />
+ <stop
+ style="stop-color:#cbccca;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop2210" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2198">
+ <stop
+ style="stop-color:#748f48;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop2200" />
+ <stop
+ style="stop-color:#1f2816;stop-opacity:1.0000000;"
+ offset="1.0000000"
+ id="stop2202" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2198"
+ id="linearGradient2204"
+ x1="23.118565"
+ y1="9.5830288"
+ x2="22.440805"
+ y2="34.225887"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.950085,0.000000,0.000000,0.965659,1.243978,0.255342)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2206"
+ id="linearGradient2212"
+ x1="29.870447"
+ y1="32.285740"
+ x2="24.841814"
+ y2="14.157946"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.957412,0.000000,0.000000,0.952331,1.022766,0.133307)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5176"
+ id="linearGradient2220"
+ x1="8.6529236"
+ y1="9.5865316"
+ x2="21.305075"
+ y2="32.497993"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.957412,0.000000,0.000000,0.952331,1.022766,0.133307)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2224"
+ id="radialGradient2230"
+ cx="24.041630"
+ cy="42.242130"
+ fx="24.041630"
+ fy="42.242130"
+ r="17.576654"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.304598,-1.841788e-16,29.37527)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2238"
+ id="linearGradient2244"
+ x1="20.338758"
+ y1="19.636894"
+ x2="48.845253"
+ y2="49.730762"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.953506,0.000000,0.000000,0.947873,1.141528,1.205591)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4254"
+ id="linearGradient4260"
+ x1="11.048059"
+ y1="9.1463490"
+ x2="26.178129"
+ y2="30.343304"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.997583,0.000000,0.000000,0.989941,0.104141,7.028871e-2)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2214"
+ id="linearGradient5719"
+ x1="40.253334"
+ y1="42.318577"
+ x2="36.451904"
+ y2="37.999615"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.744756,0.000000,9.569132)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6447"
+ id="radialGradient6453"
+ cx="37.495606"
+ cy="39.510023"
+ fx="37.495606"
+ fy="39.510023"
+ r="2.5100370"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.737790,0.000000,9.844321)"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="0.19607843"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1"
+ inkscape:cx="-138.1893"
+ inkscape:cy="12.124648"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="926"
+ inkscape:window-height="818"
+ inkscape:window-x="0"
+ inkscape:window-y="30"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:showpageshadow="false" />
+ <metadata
+ id="metadata1311">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Terminal</dc:title>
+ <dc:date>2005-10-15</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Andreas Nilsson</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>terminal</rdf:li>
+ <rdf:li>emulator</rdf:li>
+ <rdf:li>term</rdf:li>
+ <rdf:li>command line</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:contributor>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <g
+ id="g5022"
+ transform="matrix(2.454499e-2,0,0,2.086758e-2,46.14369,39.34109)">
+ <rect
+ y="-150.69685"
+ x="-1559.2523"
+ height="478.35718"
+ width="1339.6335"
+ id="rect4173"
+ style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path5058"
+ d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+ id="path5018"
+ sodipodi:nodetypes="cccc" />
+ </g>
+ <rect
+ style="opacity:1.0000000;fill:url(#linearGradient2212);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2220);stroke-width:0.99999946;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+ id="rect1316"
+ width="44.996037"
+ height="38.998734"
+ x="1.5026338"
+ y="3.5015533"
+ rx="4.8517075"
+ ry="4.8517079" />
+ <rect
+ style="opacity:1.0000000;fill:url(#linearGradient2204);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient4260);stroke-width:0.99495775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+ id="rect1314"
+ width="37.088005"
+ height="29.022322"
+ x="5.4962788"
+ y="7.4827089"
+ rx="1.6452150"
+ ry="1.6452144" />
+ <g
+ id="g2286"
+ style="opacity:0.25568182">
+ <path
+ id="path1345"
+ d="M 8.0152033,11.500361 L 39.994145,11.500361"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 8.0152033,13.500361 L 39.994145,13.500361"
+ id="path2264" />
+ <path
+ id="path2266"
+ d="M 8.0152033,15.500361 L 39.994145,15.500361"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 8.0152033,17.500361 L 39.994145,17.500361"
+ id="path2268" />
+ <path
+ id="path2270"
+ d="M 8.0152033,19.500361 L 39.994145,19.500361"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 8.0152033,21.500361 L 39.994145,21.500361"
+ id="path2272" />
+ <path
+ id="path2274"
+ d="M 8.0152033,23.500361 L 39.994145,23.500361"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 8.0152033,25.500361 L 39.994145,25.500361"
+ id="path2276" />
+ <path
+ id="path2278"
+ d="M 8.0152033,27.500361 L 39.994145,27.500361"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 8.0152033,29.500361 L 39.994145,29.500361"
+ id="path2280" />
+ <path
+ id="path2282"
+ d="M 8.0152033,31.500361 L 39.994145,31.500361"
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 8.0152033,33.500361 L 39.994145,33.500361"
+ id="path2284" />
+ </g>
+ <rect
+ style="opacity:0.76373626;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2244);stroke-width:0.99999946;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect2232"
+ width="42.945141"
+ height="37.000587"
+ x="2.5542557"
+ y="4.5007114"
+ rx="3.7910469"
+ ry="3.7910469" />
+ <path
+ style="font-size:18.585011px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1.0000000;stroke:#6ed66e;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.27868852;font-family:Bitstream Vera Sans Mono"
+ d="M 11.625000,20.679392 L 11.625000,17.625000 L 20.609828,21.685794 L 20.609828,23.541713 L 11.625000,27.629147 L 11.625000,24.583829 L 18.589396,22.729971 L 11.625000,20.679392 z M 30.517635,30.705752 L 30.517635,32.679948 L 19.614229,32.679948 L 19.614229,30.705752 L 30.517635,30.705752"
+ id="text1340"
+ sodipodi:nodetypes="ccccccccccccc" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ style="opacity:0.53142856;fill:url(#linearGradient2673);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 7.625388,8 C 7.102102,8 6.05153,8.190188 6.05153,9.0259761 L 6.16958,25.542519 C 23.841567,24.579133 20.294433,17.286426 42,13.633318 L 41.937264,9.2913791 C 41.859002,8.1662868 41.397947,8.0594548 40.327115,8.066071 L 7.625388,8 z "
+ id="path2443" />
+ <rect
+ style="opacity:0.71428573;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.9999992;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+ id="rect1340"
+ width="34.026031"
+ height="26.057468"
+ x="6.9894562"
+ y="8.9805145"
+ rx="0.11773217"
+ ry="0.11773217" />
+ <rect
+ style="opacity:1;fill:url(#radialGradient6453);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5719);stroke-width:1.00000119;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect5025"
+ width="4.0200734"
+ height="2.9590063"
+ x="35.485569"
+ y="37.514935"
+ rx="0.35819405"
+ ry="0.56022596" />
+ <rect
+ style="opacity:1;fill:#93d94c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect6458"
+ width="2"
+ height="2"
+ x="32"
+ y="38"
+ rx="0.56022543"
+ ry="0.56022543" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="path2300"
+ sodipodi:cx="28.3125"
+ sodipodi:cy="38.75"
+ sodipodi:rx="0.5625"
+ sodipodi:ry="0.5625"
+ d="M 28.875 38.75 A 0.5625 0.5625 0 1 1 27.75,38.75 A 0.5625 0.5625 0 1 1 28.875 38.75 z"
+ transform="translate(4.375000,-6.250000e-2)" />
+ </g>
+</svg>
Added: trunk/wxdevcenter/share/pixmaps/wxDevCenter/application-exit.svg
===================================================================
--- trunk/wxdevcenter/share/pixmaps/wxDevCenter/application-exit.svg (rev 0)
+++ trunk/wxdevcenter/share/pixmaps/wxDevCenter/application-exit.svg 2011-01-04 20:17:15 UTC (rev 75)
@@ -0,0 +1,457 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:export-ydpi="90.000000"
+ inkscape:export-xdpi="90.000000"
+ inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
+ width="48px"
+ height="48px"
+ id="svg11300"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
+ sodipodi:docname="system-log-out.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ sodipodi:modified="true">
+ <defs
+ id="defs3">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 24 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="48 : 24 : 1"
+ inkscape:persp3d-origin="24 : 16 : 1"
+ id="perspective70" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6467">
+ <stop
+ style="stop-color:#babdb6;stop-opacity:1;"
+ offset="0"
+ id="stop6469" />
+ <stop
+ style="stop-color:#babdb6;stop-opacity:0;"
+ offset="1"
+ id="stop6471" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient6365">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop6367" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop6369" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6347">
+ <stop
+ style="stop-color:#4e9a06;stop-opacity:1;"
+ offset="0"
+ id="stop6349" />
+ <stop
+ style="stop-color:#2d5903;stop-opacity:1;"
+ offset="1"
+ id="stop6351" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9896">
+ <stop
+ id="stop9898"
+ offset="0"
+ style="stop-color:#cecece;stop-opacity:1;" />
+ <stop
+ id="stop9900"
+ offset="1.0000000"
+ style="stop-color:#9e9e9e;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9888"
+ inkscape:collect="always">
+ <stop
+ id="stop9890"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop9892"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9880"
+ inkscape:collect="always">
+ <stop
+ id="stop9882"
+ offset="0"
+ style="stop-color:#525252;stop-opacity:1;" />
+ <stop
+ id="stop9884"
+ offset="1"
+ style="stop-color:#525252;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9868">
+ <stop
+ style="stop-color:#4e4e4e;stop-opacity:1.0000000;"
+ offset="0.0000000"
+ id="stop9870" />
+ <stop
+ style="stop-color:#616161;stop-opacity:0.0000000;"
+ offset="1.0000000"
+ id="stop9872" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9854">
+ <stop
+ id="stop9856"
+ offset="0.0000000"
+ style="stop-color:#4e4e4e;stop-opacity:1.0000000;" />
+ <stop
+ id="stop9858"
+ offset="1.0000000"
+ style="stop-color:#ababab;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9830">
+ <stop
+ id="stop9832"
+ offset="0.0000000"
+ style="stop-color:#505050;stop-opacity:1.0000000;" />
+ <stop
+ id="stop9834"
+ offset="1.0000000"
+ style="stop-color:#181818;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient8662">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop8664" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop8666" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient8650">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop8652" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop8654" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8650"
+ id="radialGradient8656"
+ cx="19.701141"
+ cy="2.8969381"
+ fx="19.701141"
+ fy="2.8969381"
+ r="17.171415"
+ gradientTransform="matrix(1.253442,-2.296195e-16,1.747460e-16,0.953900,-15.47908,11.27663)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ r="15.644737"
+ fy="36.421127"
+ fx="24.837126"
+ cy="36.421127"
+ cx="24.837126"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.673575e-15,16.87306)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient9826"
+ xlink:href="#linearGradient8662"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="27.759069"
+ x2="18.031221"
+ y1="19.804117"
+ x1="46.845825"
+ id="linearGradient9864"
+ xlink:href="#linearGradient9854"
+ inkscape:collect="always"
+ gradientTransform="translate(-12.020815,0)" />
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.565823,0,0,1.403262,-49.804045,-9.483303)"
+ r="9.7227182"
+ fy="7.1396070"
+ fx="27.883883"
+ cy="7.1396070"
+ cx="27.883883"
+ id="radialGradient9876"
+ xlink:href="#linearGradient9868"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(-13.136935,0)"
+ gradientUnits="userSpaceOnUse"
+ y2="24.764584"
+ x2="34.007416"
+ y1="19.107729"
+ x1="31.852951"
+ id="linearGradient9886"
+ xlink:href="#linearGradient9880"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="43.449947"
+ x2="19.755548"
+ y1="13.663074"
+ x1="8.7600641"
+ id="linearGradient9894"
+ xlink:href="#linearGradient9888"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="18.064039"
+ x2="33.710651"
+ y1="21.511185"
+ x1="31.078955"
+ id="linearGradient9902"
+ xlink:href="#linearGradient9896"
+ inkscape:collect="always"
+ gradientTransform="translate(-12.020815,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6365"
+ id="linearGradient6371"
+ x1="40.25"
+ y1="31.625"
+ x2="40.25"
+ y2="43.25"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-12.020815,0)" />
+ <filter
+ inkscape:collect="always"
+ x="-0.14153846"
+ width="1.2830769"
+ y="-0.10415094"
+ height="1.2083019"
+ id="filter6421">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="2.07"
+ id="feGaussianBlur6423" />
+ </filter>
+ <filter
+ inkscape:collect="always"
+ x="-0.066812893"
+ width="1.1336258"
+ y="-0.11952912"
+ height="1.2390582"
+ id="filter6451">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.76879489"
+ id="feGaussianBlur6453" />
+ </filter>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8662"
+ id="radialGradient6461"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+ cx="24.837126"
+ cy="36.421127"
+ fx="24.837126"
+ fy="36.421127"
+ r="15.644737" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient8650"
+ id="radialGradient6463"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.253442,0,0,0.9539,-15.47908,11.27663)"
+ cx="19.701141"
+ cy="2.8969381"
+ fx="19.701141"
+ fy="2.8969381"
+ r="17.171415" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9888"
+ id="linearGradient6465"
+ gradientUnits="userSpaceOnUse"
+ x1="8.7600641"
+ y1="13.663074"
+ x2="19.755548"
+ y2="43.449947"
+ gradientTransform="matrix(0.968718,0,0,0.9689198,0.3616813,0.7378237)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient6467"
+ id="linearGradient6473"
+ x1="18.729185"
+ y1="44"
+ x2="18.729185"
+ y2="29.068014"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ stroke="#a40000"
+ fill="#727e0a"
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="0.25490196"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1"
+ inkscape:cx="-103.37653"
+ inkscape:cy="5.4914491"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:showpageshadow="false"
+ inkscape:window-width="966"
+ inkscape:window-height="762"
+ inkscape:window-x="468"
+ inkscape:window-y="86" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source>http://jimmac.musichall.cz</dc:source>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ <dc:title>System Log Out</dc:title>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>log out</rdf:li>
+ <rdf:li>logout</rdf:li>
+ <rdf:li>exit</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <rect
+ ry="0.7071048"
+ rx="0.70710522"
+ y="2.5692098"
+ x="1.4809071"
+ height="41.942028"
+ width="31.99555"
+ id="rect9828"
+ style="opacity:1;color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000048;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true" />
+ <rect
+ y="17.240852"
+ x="1.9791847"
+ height="26.759148"
+ width="30.999998"
+ id="rect9840"
+ style="opacity:1;color:#000000;fill:url(#linearGradient6473);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true" />
+ <path
+ style="opacity:0.55428569;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter6451)"
+ d="M 2.1041847,43.875 L 23.479185,35 C 23.479185,35 26.992726,32.780416 23.729185,31.5 C 20.314184,30.16016 16.729185,32 16.729185,32 L 2.1041847,43.875 z "
+ id="path6425"
+ sodipodi:nodetypes="cczcc" />
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path9852"
+ d="M 2.0168467,43.944859 L 1.9780137,3.0545252 L 21.92031,3.0987194 L 21.964504,33.018175 L 2.0168467,43.944859 z "
+ style="opacity:1;color:#000000;fill:url(#linearGradient9864);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="opacity:0.42222224;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
+ d="M 1.9489857,43.944859 L 22.097088,33.062369 L 3.5355337,41.989592 L 3.5355337,3.0103306 L 1.9650707,3.0103306 L 1.9489857,43.944859 z "
+ id="path1360"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ style="opacity:1;color:#000000;fill:url(#radialGradient9876);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 2.0239957,43.757359 L 1.9791847,3.0545252 L 21.92031,3.0545252 L 21.741064,33.681088 L 2.0239957,43.757359 z "
+ id="path9866"
+ sodipodi:nodetypes="ccccc"
+ inkscape:r_cx="true"
+ inkscape:r_cy="true" />
+ <path
+ sodipodi:nodetypes="cccsscc"
+ id="path9878"
+ d="M 17.62221,18.456195 L 19.544657,20.908971 L 18.086249,25.726136 C 18.086249,25.726136 18.351414,27.228738 19.124812,26.212272 C 19.89821,25.195806 22.097267,22.630218 21.710171,20.754291 C 21.422909,19.362175 20.627414,18.699263 20.627414,18.699263 L 17.62221,18.456195 z "
+ style="opacity:1;color:#000000;fill:url(#linearGradient9886);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="csccscs"
+ id="path9862"
+ d="M 19.456269,17.35134 C 19.456269,17.35134 21.619539,18.353058 21.688074,19.229593 C 21.789855,20.531315 17.445433,24.665476 17.445433,24.665476 C 16.9372,25.284194 16.097511,24.731767 16.56155,24.135146 C 16.56155,24.135146 20.028154,20.017173 19.809822,19.693631 C 19.536211,19.288174 17.843181,18.655068 17.843181,18.655068 C 16.826715,17.903768 18.110802,16.349605 19.456269,17.35134 z "
+ style="opacity:1;color:#000000;fill:url(#line...
[truncated message content] |
|
From: <cur...@us...> - 2011-01-04 20:13:23
|
Revision: 74
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=74&view=rev
Author: cursorstar
Date: 2011-01-04 20:13:17 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
Move share/pixmaps/wxdevcenter to share/pixmaps/wxDevCenter
Removed Paths:
-------------
trunk/wxdevcenter/share/pixmaps/wxdevcenter/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2011-01-04 19:43:16
|
Revision: 73
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=73&view=rev
Author: cursorstar
Date: 2011-01-04 19:43:09 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
More cleanup
Removed Paths:
-------------
trunk/wxdevcenter/INSTALL
Deleted: trunk/wxdevcenter/INSTALL
===================================================================
--- trunk/wxdevcenter/INSTALL 2011-01-04 19:03:42 UTC (rev 72)
+++ trunk/wxdevcenter/INSTALL 2011-01-04 19:43:09 UTC (rev 73)
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
-
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2011-01-04 19:03:50
|
Revision: 72
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=72&view=rev
Author: cursorstar
Date: 2011-01-04 19:03:42 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
More configure/bakefilization cleanup.
Removed Paths:
-------------
trunk/wxdevcenter/aclocal.m4
trunk/wxdevcenter/autoconf_inc.m4
trunk/wxdevcenter/config.guess
trunk/wxdevcenter/config.h.in
trunk/wxdevcenter/config.sub
trunk/wxdevcenter/depcomp
trunk/wxdevcenter/install-sh
trunk/wxdevcenter/intltool-extract
trunk/wxdevcenter/intltool-extract.in
trunk/wxdevcenter/intltool-merge
trunk/wxdevcenter/intltool-merge.in
trunk/wxdevcenter/intltool-update
trunk/wxdevcenter/intltool-update.in
trunk/wxdevcenter/ltmain.sh
trunk/wxdevcenter/missing
trunk/wxdevcenter/mkinstalldirs
Deleted: trunk/wxdevcenter/aclocal.m4
===================================================================
--- trunk/wxdevcenter/aclocal.m4 2011-01-04 19:00:00 UTC (rev 71)
+++ trunk/wxdevcenter/aclocal.m4 2011-01-04 19:03:42 UTC (rev 72)
@@ -1,10864 +0,0 @@
-# generated automatically by aclocal 1.10.3 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-AC_DEFUN([AC_BAKEFILE_CREATE_FILE_DLLAR_SH],
-[
-dnl ===================== dllar.sh begins here =====================
-dnl (Created by merge-scripts.py from dllar.sh
-dnl file do not edit here!)
-D='$'
-cat <<EOF >dllar.sh
-#!/bin/sh
-#
-# dllar - a tool to build both a .dll and an .a file
-# from a set of object (.o) files for EMX/OS2.
-#
-# Written by Andrew Zabolotny, bi...@fr...
-# Ported to Unix like shell by Stefan Neis, Ste...@t-...
-#
-# This script will accept a set of files on the command line.
-# All the public symbols from the .o files will be exported into
-# a .DEF file, then linker will be run (through gcc) against them to
-# build a shared library consisting of all given .o files. All libraries
-# (.a) will be first decompressed into component .o files then act as
-# described above. You can optionally give a description (-d "description")
-# which will be put into .DLL. To see the list of accepted options (as well
-# as command-line format) simply run this program without options. The .DLL
-# is built to be imported by name (there is no guarantee that new versions
-# of the library you build will have same ordinals for same symbols).
-#
-# dllar is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# dllar is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with dllar; see the file COPYING. If not, write to the Free
-# Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# To successfuly run this program you will need:
-# - Current drive should have LFN support (HPFS, ext2, network, etc)
-# (Sometimes dllar generates filenames which won't fit 8.3 scheme)
-# - gcc
-# (used to build the .dll)
-# - emxexp
-# (used to create .def file from .o files)
-# - emximp
-# (used to create .a file from .def file)
-# - GNU text utilites (cat, sort, uniq)
-# used to process emxexp output
-# - GNU file utilities (mv, rm)
-# - GNU sed
-# - lxlite (optional, see flag below)
-# (used for general .dll cleanup)
-#
-
-flag_USE_LXLITE=1;
-
-#
-# helper functions
-# basnam, variant of basename, which does _not_ remove the path, _iff_
-# second argument (suffix to remove) is given
-basnam(){
- case ${D}# in
- 1)
- echo ${D}1 | sed 's/.*\\///' | sed 's/.*\\\\//'
- ;;
- 2)
- echo ${D}1 | sed 's/'${D}2'${D}//'
- ;;
- *)
- echo "error in basnam ${D}*"
- exit 8
- ;;
- esac
-}
-
-# Cleanup temporary files and output
-CleanUp() {
- cd ${D}curDir
- for i in ${D}inputFiles ; do
- case ${D}i in
- *!)
- rm -rf \`basnam ${D}i !\`
- ;;
- *)
- ;;
- esac
- done
-
- # Kill result in case of failure as there is just to many stupid make/nmake
- # things out there which doesn't do this.
- if @<:@ ${D}# -eq 0 @:>@; then
- rm -f ${D}arcFile ${D}arcFile2 ${D}defFile ${D}dllFile
- fi
-}
-
-# Print usage and exit script with rc=1.
-PrintHelp() {
- echo 'Usage: dllar.sh @<:@-o@<:@utput@:>@ output_file@:>@ @<:@-i@<:@mport@:>@ importlib_name@:>@'
- echo ' @<:@-name-mangler-script script.sh@:>@'
- echo ' @<:@-d@<:@escription@:>@ "dll descrption"@:>@ @<:@-cc "CC"@:>@ @<:@-f@<:@lags@:>@ "CFLAGS"@:>@'
- echo ' @<:@-ord@<:@inals@:>@@:>@ -ex@<:@clude@:>@ "symbol(s)"'
- echo ' @<:@-libf@<:@lags@:>@ "{INIT|TERM}{GLOBAL|INSTANCE}"@:>@ @<:@-nocrt@<:@dll@:>@@:>@ @<:@-nolxl@<:@ite@:>@@:>@'
- echo ' @<:@*.o@:>@ @<:@*.a@:>@'
- echo '*> "output_file" should have no extension.'
- echo ' If it has the .o, .a or .dll extension, it is automatically removed.'
- echo ' The import library name is derived from this and is set to "name".a,'
- echo ' unless overridden by -import'
- echo '*> "importlib_name" should have no extension.'
- echo ' If it has the .o, or .a extension, it is automatically removed.'
- echo ' This name is used as the import library name and may be longer and'
- echo ' more descriptive than the DLL name which has to follow the old '
- echo ' 8.3 convention of FAT.'
- echo '*> "script.sh may be given to override the output_file name by a'
- echo ' different name. It is mainly useful if the regular make process'
- echo ' of some package does not take into account OS/2 restriction of'
- echo ' DLL name lengths. It takes the importlib name as input and is'
- echo ' supposed to procude a shorter name as output. The script should'
- echo ' expect to get importlib_name without extension and should produce'
- echo ' a (max.) 8 letter name without extension.'
- echo '*> "cc" is used to use another GCC executable. (default: gcc.exe)'
- echo '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)'
- echo ' These flags will be put at the start of GCC command line.'
- echo '*> -ord@<:@inals@:>@ tells dllar to export entries by ordinals. Be careful.'
- echo '*> -ex@<:@clude@:>@ defines symbols which will not be exported. You can define'
- echo ' multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".'
- echo ' If the last character of a symbol is "*", all symbols beginning'
- echo ' with the prefix before "*" will be exclude, (see _GLOBAL* above).'
- echo '*> -libf@<:@lags@:>@ can be used to add INITGLOBAL/INITINSTANCE and/or'
- echo ' TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.'
- echo '*> -nocrt@<:@dll@:>@ switch will disable linking the library against emx''s'
- echo ' C runtime DLLs.'
- echo '*> -nolxl@<:@ite@:>@ switch will disable running lxlite on the resulting DLL.'
- echo '*> All other switches (for example -L./ or -lmylib) will be passed'
- echo ' unchanged to GCC at the end of command line.'
- echo '*> If you create a DLL from a library and you do not specify -o,'
- echo ' the basename for DLL and import library will be set to library name,'
- echo ' the initial library will be renamed to 'name'_s.a (_s for static)'
- echo ' i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial'
- echo ' library will be renamed into gcc_s.a.'
- echo '--------'
- echo 'Example:'
- echo ' dllar -o gcc290.dll libgcc.a -d "GNU C runtime library" -ord'
- echo ' -ex "__main __ctordtor*" -libf "INITINSTANCE TERMINSTANCE"'
- CleanUp
- exit 1
-}
-
-# Execute a command.
-# If exit code of the commnad <> 0 CleanUp() is called and we'll exit the script.
-# @Uses Whatever CleanUp() uses.
-doCommand() {
- echo "${D}*"
- eval ${D}*
- rcCmd=${D}?
-
- if @<:@ ${D}rcCmd -ne 0 @:>@; then
- echo "command failed, exit code="${D}rcCmd
- CleanUp
- exit ${D}rcCmd
- fi
-}
-
-# main routine
-# setup globals
-cmdLine=${D}*
-outFile=""
-outimpFile=""
-inputFiles=""
-renameScript=""
-description=""
-CC=gcc.exe
-CFLAGS="-s -Zcrtdll"
-EXTRA_CFLAGS=""
-EXPORT_BY_ORDINALS=0
-exclude_symbols=""
-library_flags=""
-curDir=\`pwd\`
-curDirS=curDir
-case ${D}curDirS in
-*/)
- ;;
-*)
- curDirS=${D}{curDirS}"/"
- ;;
-esac
-# Parse commandline
-libsToLink=0
-omfLinking=0
-while @<:@ ${D}1 @:>@; do
- case ${D}1 in
- -ord*)
- EXPORT_BY_ORDINALS=1;
- ;;
- -o*)
- shift
- outFile=${D}1
- ;;
- -i*)
- shift
- outimpFile=${D}1
- ;;
- -name-mangler-script)
- shift
- renameScript=${D}1
- ;;
- -d*)
- shift
- description=${D}1
- ;;
- -f*)
- shift
- CFLAGS=${D}1
- ;;
- -c*)
- shift
- CC=${D}1
- ;;
- -h*)
- PrintHelp
- ;;
- -ex*)
- shift
- exclude_symbols=${D}{exclude_symbols}${D}1" "
- ;;
- -libf*)
- shift
- library_flags=${D}{library_flags}${D}1" "
- ;;
- -nocrt*)
- CFLAGS="-s"
- ;;
- -nolxl*)
- flag_USE_LXLITE=0
- ;;
- -* | /*)
- case ${D}1 in
- -L* | -l*)
- libsToLink=1
- ;;
- -Zomf)
- omfLinking=1
- ;;
- *)
- ;;
- esac
- EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
- ;;
- *.dll)
- EXTRA_CFLAGS="${D}{EXTRA_CFLAGS} \`basnam ${D}1 .dll\`"
- if @<:@ ${D}omfLinking -eq 1 @:>@; then
- EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.lib"
- else
- EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.a"
- fi
- ;;
- *)
- found=0;
- if @<:@ ${D}libsToLink -ne 0 @:>@; then
- EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
- else
- for file in ${D}1 ; do
- if @<:@ -f ${D}file @:>@; then
- inputFiles="${D}{inputFiles} ${D}file"
- found=1
- fi
- done
- if @<:@ ${D}found -eq 0 @:>@; then
- echo "ERROR: No file(s) found: "${D}1
- exit 8
- fi
- fi
- ;;
- esac
- shift
-done # iterate cmdline words
-
-#
-if @<:@ -z "${D}inputFiles" @:>@; then
- echo "dllar: no input files"
- PrintHelp
-fi
-
-# Now extract all .o files from .a files
-newInputFiles=""
-for file in ${D}inputFiles ; do
- case ${D}file in
- *.a | *.lib)
- case ${D}file in
- *.a)
- suffix=".a"
- AR="ar"
- ;;
- *.lib)
- suffix=".lib"
- AR="emxomfar"
- EXTRA_CFLAGS="${D}EXTRA_CFLAGS -Zomf"
- ;;
- *)
- ;;
- esac
- dirname=\`basnam ${D}file ${D}suffix\`"_%"
- mkdir ${D}dirname
- if @<:@ ${D}? -ne 0 @:>@; then
- echo "Failed to create subdirectory ./${D}dirname"
- CleanUp
- exit 8;
- fi
- # Append '!' to indicate archive
- newInputFiles="${D}newInputFiles ${D}{dirname}!"
- doCommand "cd ${D}dirname; ${D}AR x ../${D}file"
- cd ${D}curDir
- found=0;
- for subfile in ${D}dirname/*.o* ; do
- if @<:@ -f ${D}subfile @:>@; then
- found=1
- if @<:@ -s ${D}subfile @:>@; then
- # FIXME: This should be: is file size > 32 byte, _not_ > 0!
- newInputFiles="${D}newInputFiles ${D}subfile"
- fi
- fi
- done
- if @<:@ ${D}found -eq 0 @:>@; then
- echo "WARNING: there are no files in archive \\'${D}file\\'"
- fi
- ;;
- *)
- newInputFiles="${D}{newInputFiles} ${D}file"
- ;;
- esac
-done
-inputFiles="${D}newInputFiles"
-
-# Output filename(s).
-do_backup=0;
-if @<:@ -z ${D}outFile @:>@; then
- do_backup=1;
- set outFile ${D}inputFiles; outFile=${D}2
-fi
-
-# If it is an archive, remove the '!' and the '_%' suffixes
-case ${D}outFile in
-*_%!)
- outFile=\`basnam ${D}outFile _%!\`
- ;;
-*)
- ;;
-esac
-case ${D}outFile in
-*.dll)
- outFile=\`basnam ${D}outFile .dll\`
- ;;
-*.DLL)
- outFile=\`basnam ${D}outFile .DLL\`
- ;;
-*.o)
- outFile=\`basnam ${D}outFile .o\`
- ;;
-*.obj)
- outFile=\`basnam ${D}outFile .obj\`
- ;;
-*.a)
- outFile=\`basnam ${D}outFile .a\`
- ;;
-*.lib)
- outFile=\`basnam ${D}outFile .lib\`
- ;;
-*)
- ;;
-esac
-case ${D}outimpFile in
-*.a)
- outimpFile=\`basnam ${D}outimpFile .a\`
- ;;
-*.lib)
- outimpFile=\`basnam ${D}outimpFile .lib\`
- ;;
-*)
- ;;
-esac
-if @<:@ -z ${D}outimpFile @:>@; then
- outimpFile=${D}outFile
-fi
-defFile="${D}{outFile}.def"
-arcFile="${D}{outimpFile}.a"
-arcFile2="${D}{outimpFile}.lib"
-
-#create ${D}dllFile as something matching 8.3 restrictions,
-if @<:@ -z ${D}renameScript @:>@ ; then
- dllFile="${D}outFile"
-else
- dllFile=\`${D}renameScript ${D}outimpFile\`
-fi
-
-if @<:@ ${D}do_backup -ne 0 @:>@ ; then
- if @<:@ -f ${D}arcFile @:>@ ; then
- doCommand "mv ${D}arcFile ${D}{outFile}_s.a"
- fi
- if @<:@ -f ${D}arcFile2 @:>@ ; then
- doCommand "mv ${D}arcFile2 ${D}{outFile}_s.lib"
- fi
-fi
-
-# Extract public symbols from all the object files.
-tmpdefFile=${D}{defFile}_%
-rm -f ${D}tmpdefFile
-for file in ${D}inputFiles ; do
- case ${D}file in
- *!)
- ;;
- *)
- doCommand "emxexp -u ${D}file >> ${D}tmpdefFile"
- ;;
- esac
-done
-
-# Create the def file.
-rm -f ${D}defFile
-echo "LIBRARY \`basnam ${D}dllFile\` ${D}library_flags" >> ${D}defFile
-dllFile="${D}{dllFile}.dll"
-if @<:@ ! -z ${D}description @:>@; then
- echo "DESCRIPTION \\"${D}{description}\\"" >> ${D}defFile
-fi
-echo "EXPORTS" >> ${D}defFile
-
-doCommand "cat ${D}tmpdefFile | sort.exe | uniq.exe > ${D}{tmpdefFile}%"
-grep -v "^ *;" < ${D}{tmpdefFile}% | grep -v "^ *${D}" >${D}tmpdefFile
-
-# Checks if the export is ok or not.
-for word in ${D}exclude_symbols; do
- grep -v ${D}word < ${D}tmpdefFile >${D}{tmpdefFile}%
- mv ${D}{tmpdefFile}% ${D}tmpdefFile
-done
-
-
-if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
- sed "=" < ${D}tmpdefFile | \\
- sed '
- N
- : loop
- s/^\\(@<:@0-9@:>@\\+\\)\\(@<:@^;@:>@*\\)\\(;.*\\)\\?/\\2 @\\1 NONAME/
- t loop
- ' > ${D}{tmpdefFile}%
- grep -v "^ *${D}" < ${D}{tmpdefFile}% > ${D}tmpdefFile
-else
- rm -f ${D}{tmpdefFile}%
-fi
-cat ${D}tmpdefFile >> ${D}defFile
-rm -f ${D}tmpdefFile
-
-# Do linking, create implib, and apply lxlite.
-gccCmdl="";
-for file in ${D}inputFiles ; do
- case ${D}file in
- *!)
- ;;
- *)
- gccCmdl="${D}gccCmdl ${D}file"
- ;;
- esac
-done
-doCommand "${D}CC ${D}CFLAGS -Zdll -o ${D}dllFile ${D}defFile ${D}gccCmdl ${D}EXTRA_CFLAGS"
-touch "${D}{outFile}.dll"
-
-doCommand "emximp -o ${D}arcFile ${D}defFile"
-if @<:@ ${D}flag_USE_LXLITE -ne 0 @:>@; then
- add_flags="";
- if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
- add_flags="-ynd"
- fi
- doCommand "lxlite -cs -t: -mrn -mln ${D}add_flags ${D}dllFile"
-fi
-doCommand "emxomf -s -l ${D}arcFile"
-
-# Successful exit.
-CleanUp 1
-exit 0
-EOF
-dnl ===================== dllar.sh ends here =====================
-])
-
-dnl
-dnl This file is part of Bakefile (http://www.bakefile.org)
-dnl
-dnl Copyright (C) 2003-2007 Vaclav Slavik, David Elliott and others
-dnl
-dnl Permission is hereby granted, free of charge, to any person obtaining a
-dnl copy of this software and associated documentation files (the "Software"),
-dnl to deal in the Software without restriction, including without limitation
-dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
-dnl and/or sell copies of the Software, and to permit persons to whom the
-dnl Software is furnished to do so, subject to the following conditions:
-dnl
-dnl The above copyright notice and this permission notice shall be included in
-dnl all copies or substantial portions of the Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-dnl DEALINGS IN THE SOFTWARE.
-dnl
-dnl $Id: bakefile-lang.m4 1278 2008-11-17 22:26:10Z vadz $
-dnl
-dnl Compiler detection macros by David Elliott and Vadim Zeitlin
-dnl
-
-
-dnl ===========================================================================
-dnl Macros to detect different C/C++ compilers
-dnl ===========================================================================
-
-dnl Based on autoconf _AC_LANG_COMPILER_GNU
-dnl _AC_BAKEFILE_LANG_COMPILER(NAME, LANG, SYMBOL, IF-YES, IF-NO)
-AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
-[
- AC_LANG_PUSH($2)
- AC_CACHE_CHECK(
- [whether we are using the $1 $2 compiler],
- [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3],
- [AC_TRY_COMPILE(
- [],
- [
- #ifndef $3
- choke me
- #endif
- ],
- [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=yes],
- [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=no]
- )
- ]
- )
- if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then
- :; $4
- else
- :; $5
- fi
- AC_LANG_POP($2)
-])
-
-dnl More specific version of the above macro checking whether the compiler
-dnl version is at least the given one (assumes that we do use this compiler)
-dnl
-dnl _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(NAME, LANG, SYMBOL, VER, VERMSG, IF-YES, IF-NO)
-AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_LATER_THAN],
-[
- AC_LANG_PUSH($2)
- AC_CACHE_CHECK(
- [whether we are using $1 $2 compiler v$5 or later],
- [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4],
- [AC_TRY_COMPILE(
- [],
- [
- #ifndef $3 || $3 < $4
- choke me
- #endif
- ],
- [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=yes],
- [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=no]
- )
- ]
- )
- if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4" = "xyes"; then
- :; $6
- else
- :; $7
- fi
- AC_LANG_POP($2)
-])
-
-dnl CodeWarrior Metrowerks compiler defines __MWERKS__ for both C and C++
-AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
-[
- _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C, __MWERKS__, MWCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_MWCXX],
-[
- _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C++, __MWERKS__, MWCXX=yes)
-])
-
-dnl IBM xlC compiler defines __xlC__ for both C and C++
-AC_DEFUN([AC_BAKEFILE_PROG_XLCC],
-[
- _AC_BAKEFILE_LANG_COMPILER([IBM xlC], C, __xlC__, XLCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_XLCXX],
-[
- _AC_BAKEFILE_LANG_COMPILER([IBM xlC], C++, __xlC__, XLCXX=yes)
-])
-
-dnl recent versions of SGI mipsPro compiler define _SGI_COMPILER_VERSION
-dnl
-dnl NB: old versions define _COMPILER_VERSION but this could probably be
-dnl defined by other compilers too so don't test for it to be safe
-AC_DEFUN([AC_BAKEFILE_PROG_SGICC],
-[
- _AC_BAKEFILE_LANG_COMPILER(SGI, C, _SGI_COMPILER_VERSION, SGICC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_SGICXX],
-[
- _AC_BAKEFILE_LANG_COMPILER(SGI, C++, _SGI_COMPILER_VERSION, SGICXX=yes)
-])
-
-dnl Sun compiler defines __SUNPRO_C/__SUNPRO_CC
-AC_DEFUN([AC_BAKEFILE_PROG_SUNCC],
-[
- _AC_BAKEFILE_LANG_COMPILER(Sun, C, __SUNPRO_C, SUNCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_SUNCXX],
-[
- _AC_BAKEFILE_LANG_COMPILER(Sun, C++, __SUNPRO_CC, SUNCXX=yes)
-])
-
-dnl Intel icc compiler defines __INTEL_COMPILER for both C and C++
-AC_DEFUN([AC_BAKEFILE_PROG_INTELCC],
-[
- _AC_BAKEFILE_LANG_COMPILER(Intel, C, __INTEL_COMPILER, INTELCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX],
-[
- _AC_BAKEFILE_LANG_COMPILER(Intel, C++, __INTEL_COMPILER, INTELCXX=yes)
-])
-
-dnl Intel compiler command line options changed in incompatible ways sometimes
-dnl before v8 (-KPIC was replaced with gcc-compatible -fPIC) and again in v10
-dnl (-create-pch deprecated in favour of -pch-create) so we need to test for
-dnl its exact version too
-AC_DEFUN([AC_BAKEFILE_PROG_INTELCC_8],
-[
- _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C, __INTEL_COMPILER, 800, 8, INTELCC8=yes)
-])
-AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX_8],
-[
- _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C++, __INTEL_COMPILER, 800, 8, INTELCXX8=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_INTELCC_10],
-[
- _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C, __INTEL_COMPILER, 1000, 10, INTELCC10=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX_10],
-[
- _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C++, __INTEL_COMPILER, 1000, 10, INTELCXX10=yes)
-])
-
-dnl HP-UX aCC: see http://docs.hp.com/en/6162/preprocess.htm#macropredef
-AC_DEFUN([AC_BAKEFILE_PROG_HPCC],
-[
- _AC_BAKEFILE_LANG_COMPILER(HP, C, __HP_cc, HPCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_HPCXX],
-[
- _AC_BAKEFILE_LANG_COMPILER(HP, C++, __HP_aCC, HPCXX=yes)
-])
-
-dnl Tru64 cc and cxx
-AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCC],
-[
- _AC_BAKEFILE_LANG_COMPILER(Compaq, C, __DECC, COMPAQCC=yes)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCXX],
-[
- _AC_BAKEFILE_LANG_COMPILER(Compaq, C++, __DECCXX, COMPAQCXX=yes)
-])
-
-dnl ===========================================================================
-dnl macros to detect specialty compiler options
-dnl ===========================================================================
-
-dnl Figure out if we need to pass -ext o to compiler (MetroWerks)
-AC_DEFUN([AC_BAKEFILE_METROWERKS_EXTO],
-[AC_CACHE_CHECK([if the _AC_LANG compiler requires -ext o], bakefile_cv_[]_AC_LANG_ABBREV[]_exto,
-dnl First create an empty conf test
-[AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
-dnl Now remove .o and .c.o or .cc.o
-rm -f conftest.$ac_objext conftest.$ac_ext.o
-dnl Now compile the test
-AS_IF([AC_TRY_EVAL(ac_compile)],
-dnl If the test succeeded look for conftest.c.o or conftest.cc.o
-[for ac_file in `(ls conftest.* 2>/dev/null)`; do
- case $ac_file in
- conftest.$ac_ext.o)
- bakefile_cv_[]_AC_LANG_ABBREV[]_exto="-ext o"
- ;;
- *)
- ;;
- esac
-done],
-[AC_MSG_FAILURE([cannot figure out if compiler needs -ext o: cannot compile])
-]) dnl AS_IF
-
-rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext
-]) dnl AC_CACHE_CHECK
-
-if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_exto" '!=' "x"; then
- if test "[]_AC_LANG_ABBREV[]" = "c"; then
- CFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CFLAGS"
- fi
- if test "[]_AC_LANG_ABBREV[]" = "cxx"; then
- CXXFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CXXFLAGS"
- fi
-fi
-]) dnl AC_DEFUN
-
-
-dnl ===========================================================================
-dnl Macros to do all of the compiler detections as one macro
-dnl ===========================================================================
-
-dnl check for different proprietary compilers depending on target platform
-dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
-AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
-[
- AC_PROG_$1
-
- dnl Intel compiler can be used under several different OS and even
- dnl different architectures (x86, amd64 and Itanium) so it's easier to just
- dnl always test for it
- AC_BAKEFILE_PROG_INTEL$1
-
- dnl If we use Intel compiler we also need to know its version
- if test "$INTEL$1" = "yes"; then
- AC_BAKEFILE_PROG_INTEL$1_8
- AC_BAKEFILE_PROG_INTEL$1_10
- fi
-
- dnl if we're using gcc, we can't be using any of incompatible compilers
- if test "x$G$1" != "xyes"; then
- if test "x$1" = "xC"; then
- AC_BAKEFILE_METROWERKS_EXTO
- if test "x$bakefile_cv_c_exto" '!=' "x"; then
- unset ac_cv_prog_cc_g
- _AC_PROG_CC_G
- fi
- fi
-
- dnl most of these compilers are only used under well-defined OS so
- dnl don't waste time checking for them on other ones
- case `uname -s` in
- AIX*)
- AC_BAKEFILE_PROG_XL$1
- ;;
-
- Darwin)
- AC_BAKEFILE_PROG_MW$1
- if test "$MW$1" != "yes"; then
- AC_BAKEFILE_PROG_XL$1
- fi
- ;;
-
- IRIX*)
- AC_BAKEFILE_PROG_SGI$1
- ;;
-
- Linux*)
- dnl Sun CC is now available under Linux too, test for it unless
- dnl we already found that we were using a different compiler
- if test "$INTEL$1" != "yes"; then
- AC_BAKEFILE_PROG_SUN$1
- fi
- ;;
-
- HP-UX*)
- AC_BAKEFILE_PROG_HP$1
- ;;
-
- OSF1)
- AC_BAKEFILE_PROG_COMPAQ$1
- ;;
-
- SunOS)
- AC_BAKEFILE_PROG_SUN$1
- ;;
- esac
- fi
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_CC],
-[
- _AC_BAKEFILE_PROG_COMPILER(CC)
-])
-
-AC_DEFUN([AC_BAKEFILE_PROG_CXX],
-[
- _AC_BAKEFILE_PROG_COMPILER(CXX)
-])
-
-
-dnl
-dnl This file is part of Bakefile (http://www.bakefile.org)
-dnl
-dnl Copyright (C) 2003-2007 Vaclav Slavik and others
-dnl
-dnl Permission is hereby granted, free of charge, to any person obtaining a
-dnl copy of this software and associated documentation files (the "Software"),
-dnl to deal in the Software without restriction, including without limitation
-dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
-dnl and/or sell copies of the Software, and to permit persons to whom the
-dnl Software is furnished to do so, subject to the following conditions:
-dnl
-dnl The above copyright notice and this permission notice shall be included in
-dnl all copies or substantial portions of the Software.
-dnl
-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-dnl DEALINGS IN THE SOFTWARE.
-dnl
-dnl $Id: bakefile.m4 1327 2009-10-24 10:10:38Z vaclavslavik $
-dnl
-dnl Support macros for makefiles generated by BAKEFILE.
-dnl
-
-
-dnl ---------------------------------------------------------------------------
-dnl Lots of compiler & linker detection code contained here was taken from
-dnl wxWidgets configure.in script (see http://www.wxwidgets.org)
-dnl ---------------------------------------------------------------------------
-
-
-
-dnl ---------------------------------------------------------------------------
-dnl AC_BAKEFILE_GNUMAKE
-dnl
-dnl Detects GNU make
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AC_BAKEFILE_GNUMAKE],
-[
- dnl does make support "-include" (only GNU make does AFAIK)?
- AC_CACHE_CHECK([if make is GNU make], bakefile_cv_prog_makeisgnu,
- [
- if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
- egrep -s GNU > /dev/null); then
- bakefile_cv_prog_makeisgnu="yes"
- else
- bakefile_cv_prog_makeisgnu="no"
- fi
- ])
-
- if test "x$bakefile_cv_prog_makeisgnu" = "xyes"; then
- IF_GNU_MAKE=""
- else
- IF_GNU_MAKE="#"
- fi
- AC_SUBST(IF_GNU_MAKE)
-])
-
-dnl ---------------------------------------------------------------------------
-dnl AC_BAKEFILE_PLATFORM
-dnl
-dnl Detects platform and sets PLATFORM_XXX variables accordingly
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AC_BAKEFILE_PLATFORM],
-[
- PLATFORM_UNIX=0
- PLATFORM_WIN32=0
- PLATFORM_MSDOS=0
- PLATFORM_MAC=0
- PLATFORM_MACOS=0
- PLATFORM_MACOSX=0
- PLATFORM_OS2=0
- PLATFORM_BEOS=0
-
- if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then
- case "${BAKEFILE_HOST}" in
- *-*-mingw32* )
- PLATFORM_WIN32=1
- ;;
- *-pc-msdosdjgpp )
- PLATFORM_MSDOS=1
- ;;
- *-pc-os2_emx | *-pc-os2-emx )
- PLATFORM_OS2=1
- ;;
- *-*-darwin* )
- PLATFORM_MAC=1
- PLATFORM_MACOSX=1
- ;;
- *-*-beos* )
- PLATFORM_BEOS=1
- ;;
- powerpc-apple-macos* )
- PLATFORM_MAC=1
- PLATFORM_MACOS=1
- ;;
- * )
- PLATFORM_UNIX=1
- ;;
- esac
- else
- case "$BAKEFILE_FORCE_PLATFORM" in
- win32 )
- PLATFORM_WIN32=1
- ;;
- msdos )
- PLATFORM_MSDOS=1
- ;;
- os2 )
- PLATFORM_OS2=1
- ;;
- darwin )
- PLATFORM_MAC=1
- PLATFORM_MACOSX=1
- ;;
- unix )
- PLATFORM_UNIX=1
- ;;
- beos )
- PLATFORM_BEOS=1
- ;;
- * )
- AC_MSG_ERROR([Unknown platform: $BAKEFILE_FORCE_PLATFORM])
- ;;
- esac
- fi
-
- AC_SUBST(PLATFORM_UNIX)
- AC_SUBST(PLATFORM_WIN32)
- AC_SUBST(PLATFORM_MSDOS)
- AC_SUBST(PLATFORM_MAC)
- AC_SUBST(PLATFORM_MACOS)
- AC_SUBST(PLATFORM_MACOSX)
- AC_SUBST(PLATFORM_OS2)
- AC_SUBST(PLATFORM_BEOS)
-])
-
-
-dnl ---------------------------------------------------------------------------
-dnl AC_BAKEFILE_PLATFORM_SPECIFICS
-dnl
-dnl Sets misc platform-specific settings
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AC_BAKEFILE_PLATFORM_SPECIFICS],
-[
- AC_ARG_ENABLE([omf], AS_HELP_STRING([--enable-omf],
- [use OMF object format (OS/2)]),
- [bk_os2_use_omf="$enableval"])
-
- case "${BAKEFILE_HOST}" in
- *-*-darwin* )
- dnl For Unix to MacOS X porting instructions, see:
- dnl http://fink.sourceforge.net/doc/porting/porting.html
- if test "x$GCC" = "xyes"; then
- CFLAGS="$CFLAGS -fno-common"
- CXXFLAGS="$CXXFLAGS -fno-common"
- fi
- if test "x$XLCC" = "xyes"; then
- CFLAGS="$CFLAGS -qnocommon"
- CXXFLAGS="$CXXFLAGS -qnocommon"
- fi
- ;;
-
- *-pc-os2_emx | *-pc-os2-emx )
- if test "x$bk_os2_use_omf" = "xyes" ; then
- AR=emxomfar
- RANLIB=:
- LDFLAGS="-Zomf $LDFLAGS"
- CFLAGS="-Zomf $CFLAGS"
- CXXFLAGS="-Zomf $CXXFLAGS"
- OS2_LIBEXT="lib"
- else
- OS2_LIBEXT="a"
- fi
- ;;
-
- i*86-*-beos* )
- LDFLAGS="-L/boot/develop/lib/x86 $LDFLAGS"
- ;;
- esac
-])
-
-dnl ---------------------------------------------------------------------------
-dnl AC_BAKEFILE_SUFFIXES
-dnl
-dnl Detects shared various suffixes for shared libraries, libraries, programs,
-dnl plugins etc.
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AC_BAKEFILE_SUFFIXES],
-[
- SO_SUFFIX="so"
- SO_SUFFIX_MODULE="so"
- EXEEXT=""
- LIBPREFIX="lib"
- LIBEXT=".a"
- DLLPREFIX="lib"
- DLLPREFIX_MODULE=""
- DLLIMP_SUFFIX=""
- dlldir="$libdir"
-
- case "${BAKEFILE_HOST}" in
- dnl PA-RISC HP systems used .sl but IA64 use ELF-64 and so use the
- dnl standard .so extension
- ia64-hp-hpux* )
- ;;
- *-hp-hpux* )
- SO_SUFFIX="sl"
- SO_SUFFIX_MODULE="sl"
- ;;
- *-*-aix* )
- dnl quoting from
- dnl http://www-1.ibm.com/servers/esdd/articles/gnu.html:
- dnl Both archive libraries and shared libraries on AIX have an
- dnl .a extension. This will explain why you can't link with an
- dnl .so and why it works with the name changed to .a.
- SO_SUFFIX="a"
- SO_SUFFIX_MODULE="a"
- ;;
- *-*-cygwin* )
- SO_SUFFIX="dll"
- SO_SUFFIX_MODULE="dll"
- DLLIMP_SUFFIX="dll.a"
- EXEEXT=".exe"
- DLLPREFIX="cyg"
- dlldir="$bindir"
- ;;
- *-*-mingw32* )
- SO_SUFFIX="dll"
- SO_SUFFIX_MODULE="dll"
- DLLIMP_SUFFIX="dll.a"
- EXEEXT=".exe"
- DLLPREFIX=""
- dlldir="$bindir"
- ;;
- *-pc-msdosdjgpp )
- EXEEXT=".exe"
- DLLPREFIX=""
- dlldir="$bindir"
- ;;
- *-pc-os2_emx | *-pc-os2-emx )
- SO_SUFFIX="dll"
- SO_SUFFIX_MODULE="dll"
- DLLIMP_SUFFIX=$OS2_LIBEXT
- EXEEXT=".exe"
- DLLPREFIX=""
- LIBPREFIX=""
- LIBEXT=".$OS2_LIBEXT"
- dlldir="$bindir"
- ;;
- *-*-darwin* )
- SO_SUFFIX="dylib"
- SO_SUFFIX_MODULE="bundle"
- ;;
- esac
-
- if test "x$DLLIMP_SUFFIX" = "x" ; then
- DLLIMP_SUFFIX="$SO_SUFFIX"
- fi
-
- AC_SUBST(SO_SUFFIX)
- AC_SUBST(SO_SUFFIX_MODULE)
- AC_SUBST(DLLIMP_SUFFIX)
- AC_SUBST(EXEEXT)
- AC_SUBST(LIBPREFIX)
- AC_SUBST(LIBEXT)
- AC_SUBST(DLLPREFIX)
- AC_SUBST(DLLPREFIX_MODULE)
- AC_SUBST(dlldir)
-])
-
-
-dnl ---------------------------------------------------------------------------
-dnl AC_BAKEFILE_SHARED_LD
-dnl
-dnl Detects command for making shared libraries, substitutes SHARED_LD_CC
-dnl and SHARED_LD_CXX.
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AC_BAKEFILE_SHARED_LD],
-[
- dnl the extra compiler flags needed for compilation of shared library
- PIC_FLAG=""
- if test "x$GCC" = "xyes"; then
- dnl the switch for gcc is the same under all platforms
- PIC_FLAG="-fPIC"
- fi
-
- dnl Defaults for GCC and ELF .so shared libs:
- SHARED_LD_CC="\$(CC) -shared ${PIC_FLAG} -o"
- SHARED_LD_CXX="\$(CXX) -shared ${PIC_FLAG} -o"
- WINDOWS_IMPLIB=0
-
- case "${BAKEFILE_HOST}" in
- *-hp-hpux* )
- dnl default settings are good for gcc but not for the native HP-UX
- if test "x$GCC" != "xyes"; then
- dnl no idea why it wants it, but it does
- LDFLAGS="$LDFLAGS -L/usr/lib"
-
- SHARED_LD_CC="${CC} -b -o"
- SHARED_LD_CXX="${CXX} -b -o"
- PIC_FLAG="+Z"
- fi
- ;;
-
- *-*-linux* )
- dnl newer icc versions use -fPIC just as gcc does and, in fact, the
- dnl newest (v10+) ones don't even understand -KPIC any longer
- if test "$INTELCC" = "yes" -a "$INTELCC8" != "yes"; then
- PIC_FLAG="-KPIC"
- elif test "x$SUNCXX" = "xyes"; then
- SHARED_LD_CC="${CC} -G -o"
- SHARED_LD_CXX="${CXX} -G -o"
- PIC_FLAG="-KPIC"
- fi
- ;;
-
- *-*-solaris2* )
- if test "x$SUNCXX" = xyes ; then
- SHARED_LD_CC="${CC} -G -o"
- SHARED_LD_CXX="${CXX} -G -o"
- PIC_FLAG="-KPIC"
- fi
- ;;
-
- *-*-darwin* )
- AC_BAKEFILE_CREATE_FILE_SHARED_LD_SH
- chmod +x shared-ld-sh
-
- SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
- SHARED_LD_MODULE_CXX="CXX=\"\$(CXX)\" $SHARED_LD_MODULE_CC"
-
- dnl Most apps benefit from being fully binded (its faster and static
- dnl variables initialized at startup work).
- dnl This can be done either with the exe linker flag -Wl,-bind_at_load
- dnl or with a double stage link in order to create a single module
- dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
-
- dnl If using newer dev tools then there is a -single_module flag that
- dnl we can use to do this for dylibs, otherwise we'll need to use a helper
- dnl script. Check the version of gcc to see which way we can go:
- AC_CACHE_CHECK([for gcc 3.1 or later], bakefile_cv_gcc31, [
- AC_TRY_COMPILE([],
- [
- #if (__GNUC__ < 3) || \
- ((__GNUC__ == 3) && (__GNUC_MINOR__ < 1))
- This is old gcc
- #endif
- ],
- [
- bakefile_cv_gcc31=yes
- ],
- [
- bakefile_cv_gcc31=no
- ]
- )
- ])
- if test "$bakefile_cv_gcc31" = "no"; then
- dnl Use the shared-ld-sh helper script
- SHARED_LD_CC="`pwd`/shared-ld-sh -dynamiclib -headerpad_max_install_names -o"
- SHARED_LD_CXX="$SHARED_LD_CC"
- else
- dnl Use the -single_module flag and let the linker do it for us
- SHARED_LD_CC="\${CC} -dynamiclib -single_module -headerpad_max_install_names -o"
- SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
- fi
-
- if test "x$GCC" == "xyes"; then
- PIC_FLAG="-dynamic -fPIC"
- fi
- if test "x$XLCC" = "xyes"; then
- PIC_FLAG="-dynamic -DPIC"
- fi
- ;;
-
- *-*-aix* )
- if test "x$GCC" = "xyes"; then
- dnl at least gcc 2.95 warns that -fPIC is ignored when
- dnl compiling each and every file under AIX which is annoying,
- dnl so don't use it there (it's useless as AIX runs on
- dnl position-independent architectures only anyhow)
- PIC_FLAG=""
-
- dnl -bexpfull is needed by AIX linker to export all symbols (by
- dnl default it doesn't export any and even with -bexpall it
- dnl doesn't export all C++ support symbols, e.g. vtable
- dnl pointers) but it's only available starting from 5.1 (with
- dnl maintenance pack 2, whatever this is), see
- dnl http://www-128.ibm.com/developerworks/eserver/articles/gnu.html
- case "${BAKEFILE_HOST}" in
- *-*-aix5* )
- LD_EXPFULL="-Wl,-bexpfull"
- ;;
- esac
-
- SHARED_LD_CC="\$(CC) -shared $LD_EXPFULL -o"
- SHARED_LD_CXX="\$(CXX) -shared $LD_EXPFULL -o"
- else
- dnl FIXME: makeC++SharedLib is obsolete, what should we do for
- dnl recent AIX versions?
- AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
- makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
- SHARED_LD_CC="$AIX_CC_LD -p 0 -o"
- SHARED_LD_CXX="$AIX_CXX_LD -p 0 -o"
- fi
- ;;
-
- *-*-beos* )
- dnl can't use gcc under BeOS for shared library creation because it
- dnl complains about missing 'main'
- SHARED_LD_CC="${LD} -nostart -o"
- SHARED_LD_CXX="${LD} -nostart -o"
- ;;
-
- *-*-irix* )
- dnl default settings are ok for gcc
- if test "x$GCC" != "xyes"; then
- PIC_FLAG="-KPIC"
- fi
- ;;
-
- *-*-cygwin* | *-*-mingw32* )
- PIC_FLAG=""
- SHARED_LD_CC="\$(CC) -shared -o"
- SHARED_LD_CXX="\$(CXX) -shared -o"
- WINDOWS_IMPLIB=1
- ;;
-
- *-pc-os2_emx | *-pc-os2-emx )
- SHARED_LD_CC="`pwd`/dllar.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
- SHARED_LD_CXX="`pwd`/dllar.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
- PIC_FLAG=""
- AC_BAKEFILE_CREATE_FILE_DLLAR_SH
- chmod +x dllar.sh
- ;;
-
- powerpc-apple-macos* | \
- *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
- *-*-mirbsd* | \
- *-*-sunos4* | \
- *-*-osf* | \
- *-*-dgux5* | \
- *-*-sysv5* | \
- *-pc-msdosdjgpp )
- dnl defaults are ok
- ;;
-
- *)
- AC_MSG_ERROR(unknown system type $BAKEFILE_HOST.)
- esac
-
- if test "x$PIC_FLAG" != "x" ; then
- PIC_FLAG="$PIC_FLAG -DPIC"
- fi
-
- if test "x$SHARED_LD_MODULE_CC" = "x" ; then
- SHARED_LD_MODULE_CC="$SHARED_LD_CC"
- fi
- if test "x$SHARED_LD_MODULE_CXX" = "x" ; then
- SHARED_LD_MODULE_CXX="$SHARED_LD_CXX"
- fi
-
- AC_SUBST(SHARED_LD_CC)
- AC_SUBST(SHARED_LD_CXX)
- AC_SUBST(SHARED_LD_MODULE_CC)
- AC_SUBST(SHARED_LD_MODULE_CXX)
- AC_SUBST(PIC_FLAG)
- AC_SUBST(WINDOWS_IMPLIB)
-])
-
-
-dnl ---------------------------------------------------------------------------
-dnl AC_BAKEFILE_SHARED_VERSIONS
-dnl
-dnl Detects linker options for attaching versions (sonames) to shared libs.
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AC_BAKEFILE_SHARED_VERSIONS],
-[
- USE_SOVERSION=0
- USE_SOVERLINUX=0
- USE_SOVERSOLARIS=0
- USE_SOVERCYGWIN=0
- USE_SOTWOSYMLINKS=0
- USE_MACVERSION=0
- SONAME_FLAG=
-
- case "${BAKEFILE_HOST}" in
- *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
- *-*-k*bsd*-gnu | *-*-mirbsd* )
- if test "x$SUNCXX" = "xyes"; then
- SONAME_FLAG="-h "
- else
- SONAME_FLAG="-Wl,-soname,"
- fi
- USE_SOVERSION=1
- USE_SOVERLINUX=1
- USE_SOTWOSYMLINKS=1
- ;;
-
- *-*-solaris2* )
- SONAME_FLAG="-h "
- USE_SOVERSION=1
- USE_SOVERSOLARIS=1
- ;;
-
- *-*-darwin* )
- USE_MACVERSION=1
- USE_SOVERSION=1
- USE_SOTWOSYMLINKS=1
- ;;
-
- *-*-cygwin* )
- USE_SOVERSION=1
- USE_SOVERCYGWIN=1
- ;;
- esac
-
- AC_SUBST(USE_SOVERSION)
- AC_SUBST(USE_SOVERLINUX)
- AC_SUBST(USE_SOVERSOLARIS)
- AC_SUBST(USE_SOVERCYGWIN)
- AC_SUBST(USE_MACVERSION)
- AC_SUBST(USE_SOTWOSYMLINKS)
- AC_SUBST(SONAME_FLAG)
-])
-
-
-dnl ---------------------------------------------------------------------------
-dnl AC_BAKEFILE_DEPS
-dnl
-dnl Detects available C/C++ dependency tracking options
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AC_BAKEFILE_DEPS],
-[
- AC_ARG_ENABLE([dependency-tracking],
- AS_HELP_STRING([--disable-dependency-tracking],
- [don't use dependency tracking even if the compiler can]),
- [bk_use_trackdeps="$enableval"])
-
- AC_MSG_CHECKING([for dependency tracking method])
-
- BK_DEPS=""
- if test "x$bk_use_trackdeps" = "xno" ; then
- DEPS_TRACKING=0
- AC_MSG_RESULT([disabled])
- else
- DEPS_TRACKING=1
-
- if test "x$GCC" = "xyes"; then
- DEPSMODE=gcc
- case "${BAKEFILE_HOST}" in
- *-*-darwin* )
- dnl -cpp-precomp (the default) conflicts with -MMD option
- dnl used by bk-deps (see also http://developer.apple.com/documentation/Darwin/Conceptual/PortingUnix/compiling/chapter_4_section_3.html)
- DEPSFLAG="-no-cpp-precomp -MMD"
- ;;
- * )
- DEPSFLAG="-MMD"
- ;;
- esac
- AC_MSG_RESULT([gcc])
- elif test "x$MWCC" = "xyes"; then
- DEPSMODE=mwcc
- DEPSFLAG="-MM"
- AC_MSG_RESULT([mwcc])
- elif test "x$SUNCC" = "xyes"; then
- DEPSMODE=unixcc
- DEPSFLAG="-xM1"
- AC_MSG_RESULT([Sun cc])
- elif test "x$SGICC" = "xyes"; then
- DEPSMODE=unixcc
- DEPSFLAG="-M"
- AC_MSG_RESULT([SGI cc])
- elif test "x$HPCC" = "xyes"; then
- DEPSMODE=unixcc
- DEPSFLAG="+make"
- AC_MSG_RESULT([HP cc])
- elif test "x$COMPAQCC" = "xyes"; then
- DEPSMODE=gcc
- DEPSFLAG="-MD"
- AC_MSG_RESULT([Compaq cc])
- else
- DEPS_TRACKING=0
- AC_MSG_RESULT([none])
- fi
-
- if test $DEPS_TRACKING = 1 ; then
- AC_BAKEFILE_CREATE_FILE_BK_DEPS
- chmod +x bk-deps
- dnl FIXME: make this $(top_builddir)/bk-deps once autoconf-2.60
- dnl is required (and so top_builddir is never empty):
- BK_DEPS="`pwd`/bk-deps"
- fi
- fi
-
- AC_SUBST(DEPS_TRACKING)
- AC_SUBST(BK_DEPS)
-])
-
-dnl ---------------------------------------------------------------------------
-dnl AC_BAKEFILE_CHECK_BASIC_STUFF
-dnl
-dnl Checks for presence of basic programs, such as C and C++ compiler, "ranlib"
-dnl or "install"
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
-[
- AC_PROG_RANLIB
- AC_PROG_INSTALL
- AC_PROG_LN_S
-
- AC_PROG_MAKE_SET
- AC_SUBST(MAKE_SET)
-
- if test "x$SUNCXX" = "xyes"; then
- dnl Sun C++ compiler requires special way of creating static libs;
- dnl see here for more details:
- dnl https://sourceforge.net/tracker/?func=detail&atid=109863&aid=1229751&group_id=9863
- AR=$CXX
- AROPTIONS="-xar -o"
- AC_SUBST(AR)
- elif test "x$SGICC" = "xyes"; then
- dnl Almost the same as above for SGI mipsPro compiler
- AR=$CXX
- AROPTIONS="-ar -o"
- AC_SUBST(AR)
- else
- AC_CHECK_TOOL(AR, ar, ar)
- AROPTIONS=rcu
- fi
- AC_SUBST(AROPTIONS)
-
- AC_CHECK_TOOL(STRIP, strip, :)
- AC_CHECK_TOOL(NM, nm, :)
-
- dnl This check is necessary because "install -d" doesn't exist on
- dnl all platforms (e.g. HP/UX), see http://www.bakefile.org/ticket/80
- AC_MSG_CHECKING([for command to install directories])
- INSTALL_TEST_DIR=acbftest$$
- $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1
- if test $? = 0 -a -d $INSTALL_TEST_DIR; then
- rmdir $INSTALL_TEST_DIR
- dnl we must refer to makefile's $(INSTALL) variable and not
- dnl current value of shell variable, hence the single quoting:
- INSTALL_DIR='$(INSTALL) -d'
- AC_MSG_RESULT([$INSTALL -d])
- else
- INSTALL_DIR="mkdir -p"
- AC_MSG_RESULT([mkdir -p])
- fi
- AC_SUBST(INSTALL_DIR)
-
- LDFLAGS_GUI=
- case ${BAKEFILE_HOST} in
- *-*-cygwin* | *-*-mingw32* )
- LDFLAGS_GUI="-mwindows"
- esac
- AC_SUBST(LDFLAGS_GUI)
-])
-
-
-dnl ---------------------------------------------------------------------------
-dnl AC_BAKEFILE_RES_COMPILERS
-dnl
-dnl Checks for presence of resource compilers for win32 or mac
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AC_BAKEFILE_RES_COMPILERS],
-[
- case ${BAKEFILE_HOST} in
- *-*-cygwin* | *-*-mingw32* )
- dnl Check for win32 resources compiler:
- AC_CHECK_TOOL(WINDRES, windres)
- ;;
-
- *-*-darwin* | powerpc-apple-macos* )
- AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez)
- AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
- ;;
- esac
-
- AC_SUBST(WINDRES)
- AC_SUBST(REZ)
- AC_SUBST(SETFILE)
-])
-
-dnl ---------------------------------------------------------------------------
-dnl AC_BAKEFILE_PRECOMP_HEADERS
-dnl
-dnl Check for precompiled headers support (GCC >= 3.4)
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AC_BAKEFILE_PRECOMP_HEADERS],
-[
-
- AC_ARG_ENABLE([precomp-headers],
- AS_HELP_STRING([--disable-precomp-headers],
- [don't use precompiled headers even if compiler can]),
- [bk_use_pch="$enableval"])
-
- GCC_PCH=0
- ICC_PCH=0
- USE_PCH=0
- BK_MAKE_PCH=""
-
- case ${BAKEFILE_HOST} in
- *-*-cygwin* )
- dnl PCH support is broken in cygwin gcc because of unportable
- dnl assumptions about mmap() in gcc code which make PCH generation
- dnl fail erratically; disable PCH completely until this is fixed
- bk_use_pch="no"
- ;;
- esac
-
- if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then
- if test "x$GCC" = "xyes"; then
- dnl test if we have gcc-3.4:
- AC_MSG_CHECKING([if the compiler supports precompiled headers])
- AC_TRY_COMPILE([],
- [
- #if !defined(__GNUC__) || !defined(__GNUC_MINOR__)
- There is no PCH support
- #endif
- #if (__GNUC__ < 3)
- There is no PCH support
- #endif
- #if (__GNUC__ == 3) && \
- ((!defined(__APPLE_CC__) && (__GNUC_MINOR__ < 4)) || \
- ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) || \
- ( defined(__INTEL_COMPILER) )
- There is no PCH support
- #endif
- ],
- [
- AC_MSG_RESULT([yes])
- GCC_PCH=1
- ],
- [
- if test "$INTELCXX8" = "yes"; then
- AC_MSG_RESULT([yes])
- ICC_PCH=1
- if test "$INTELCXX10" = "yes"; then
- ICC_PCH_CREATE_SWITCH="-pch-create"
- ICC_PCH_USE_SWITCH="-pch-use"
- else
- ICC_PCH_CREATE_SWITCH="-create-pch"
- ICC_PCH_USE_SWITCH="-use-pch"
- fi
- else
- AC_MSG_RESULT([no])
- fi
- ])
- if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then
- USE_PCH=1
- AC_BAKEFILE_CREATE_FILE_BK_MAKE_PCH
- chmod +x bk-make-pch
- dnl FIXME: make this $(top_builddir)/bk-make-pch once
- dnl autoconf-2.60 is required (and so top_builddir is
- dnl never empty):
- BK_MAKE_PCH="`pwd`/bk-make-pch"
- fi
- fi
- fi
-
- AC_SUBST(GCC_PCH)
- AC_SUBST(ICC_PCH)
- AC_SUBST(ICC_PCH_CREATE_SWITCH)
- AC_SUBST(ICC_PCH_USE_SWITCH)
- AC_SUBST(BK_MAKE_PCH)
-])
-
-
-
-dnl ---------------------------------------------------------------------------
-dnl AC_BAKEFILE([autoconf_inc.m4 inclusion])
-dnl
-dnl To be used in configure.in of any project using Bakefile-generated mks
-dnl
-dnl Behaviour can be modified by setting following variables:
-dnl BAKEFILE_CHECK_BASICS set to "no" if you don't want bakefile to
-dnl to perform check for basic tools like ranlib
-dnl BAKEFILE_HOST set this to override host detection, defaults
-dnl to ${host}
-dnl BAKEFILE_FORCE_PLATFORM set to override platform detection
-dnl
-dnl Example usage:
-dnl
-dnl AC_BAKEFILE([FOO(autoconf_inc.m4)])
-dnl
-dnl (replace FOO with m4_include above, aclocal would die otherwise)
-dnl (yes, it's ugly, but thanks to a bug in aclocal, it's the only thing
-dnl we can do...)
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AC_BAKEFILE],
-[
- AC_PREREQ([2.58])
-
- dnl We need to always run C/C++ compiler tests, but it's also possible
- dnl for the user to call these macros manually, hence this instead of
- dnl simply calling these macros. See http://www.bakefile.org/ticket/64
- AC_REQUIRE([AC_BAKEFILE_PROG_CC])
- AC_REQUIRE([AC_BAKEFILE_PROG_CXX])
-
- if test "x$BAKEFILE_HOST" = "x"; then
- if test "x${host}" = "x" ; then
- AC_MSG_ERROR([You must call the autoconf "CANONICAL_HOST" macro in your configure.ac (or .in) file.])
- fi
-
- BAKEFILE_HOST="${host}"
- fi
-
- if test "x$BAKEFILE_CHECK_BASICS" != "xno"; then
- AC_BAKEFILE_CHECK_BASIC_STUFF
- fi
- AC_BAKEFILE_GNUMAKE
- AC_BAKEFILE_PLATFORM
- AC_BAKEFILE_PLATFORM_SPECIFICS
- AC_BAKEFILE_SUFFIXES
- AC_BAKEFILE_SHARED_LD
- AC_BAKEFILE_SHARED_VERSIONS
- AC_BAKEFILE_DEPS
- AC_BAKEFILE_RES_COMPILERS
-
- dnl OBJCFLAGS is set by Autoconf, but OBJCXXFLAGS is not:
- AC_SUBST(OBJCXXFLAGS)
-
-
- BAKEFILE_BAKEFILE_M4_VERSION="0.2.8"
-
- dnl includes autoconf_inc.m4:
- $1
-
- if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then
- AC_MSG_ERROR([No version found in autoconf_inc.m4 - bakefile macro was changed to take additional argument, perhaps configure.in wasn't updated (see the documentation)?])
- fi
-
- if test "$BAKEFILE_BAKEFILE_M4_VERSION" != "$BAKEFILE_AUTOCONF_INC_M4_VERSION" ; then
- AC_MSG_ERROR([Versions of Bakefile used to generate makefiles ($BAKEFILE_AUTOCONF_INC_M4_VERSION) and configure ($BAKEFILE_BAKEFILE_M4_VERSION) do not match.])
- fi
-])
-
-
-dnl ---------------------------------------------------------------------------
-dnl Embedded copies of helper scripts follow:
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AC_BAKEFILE_CREATE_FILE_BK_DEPS],
-[
-dnl ===================== bk-deps begins here =====================
-dnl (Created by merge-scripts.py from bk-deps
-dnl file do not edit here!)
-D='$'
-cat <<EOF >bk-deps
-#!/bin/sh
-
-# This script is part of Bakefile (http://www.bakefile.org) autoconf
-# script. It is used to track C/C++ files dependencies in portable way.
-#
-# Permission is given to use this file in any way.
-
-DEPSMODE=${DEPSMODE}
-DEPSFLAG="${DEPSFLAG}"
-DEPSDIRBASE=.deps
-
-if test ${D}DEPSMODE = gcc ; then
- ${D}* ${D}{DEPSFLAG}
- status=${D}?
-
- # determine location of created files:
- while test ${D}# -gt 0; do
- case "${D}1" in
- -o )
- shift
- objfile=${D}1
- ;;
- -* )
- ;;
- * )
- srcfile=${D}1
- ;;
- esac
- shift
- done
- objfilebase=\`basename ${D}objfile\`
- builddir=\`dirname ${D}objfile\`
- depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
- depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
- depsdir=${D}builddir/${D}DEPSDIRBASE
- mkdir -p ${D}depsdir
-
- # if the compiler failed, we're done:
- if test ${D}{status} != 0 ; then
- rm -f ${D}depfile
- exit ${D}{status}
- fi
-
- # move created file to the location we want it in:
- if test -f ${D}depfile ; then
- sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
- rm -f ${D}depfile
- else
- # "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d
- depfile=\`echo "${D}objfile" | sed -e 's/\\..*${D}/.d/g'\`
- if test ! -f ${D}depfile ; then
- # "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++)
- depfile="${D}objfile.d"
- fi
- if test -f ${D}depfile ; then
- sed -e "\\,^${D}objfile,!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
- rm -f ${D}depfile
- fi
- fi
- exit 0
-
-elif test ${D}DEPSMODE = mwcc ; then
- ${D}* || exit ${D}?
- # Run mwcc again with -MM and redirect into the dep file we want
- # NOTE: We can't use shift here because we need ${D}* to be valid
- prevarg=
- for arg in ${D}* ; do
- if test "${D}prevarg" = "-o"; then
- objfile=${D}arg
- else
- case "${D}arg" in
- -* )
- ;;
- * )
- srcfile=${D}arg
- ;;
- esac
- fi
- prevarg="${D}arg"
- done
-
- objfilebase=\`basename ${D}objfile\`
- builddir=\`dirname ${D}objfile\`
- depsdir=${D}builddir/${D}DEPSDIRBASE
- mkdir -p ${D}depsdir
-
- ${D}* ${D}DEPSFLAG >${D}{depsdir}/${D}{objfilebase}.d
- exit 0
-
-elif test ${D}DEPSMODE = unixcc; then
- ${D}* || exit ${D}?
- # Run compiler again with deps flag and redirect into the dep file.
- # It doesn't work if the '-o FILE' option is used, but without it the
- # dependency file will contain the wrong name for the object. So it is
- # removed from the command line, and the dep file is fixed with sed.
- cmd=""
- while test ${D}# -gt 0; do
- case "${D}1" in
- -o )
- shift
- objfile=${D}1
- ;;
- * )
- eval arg${D}#=\\${D}1
- cmd="${D}cmd \\${D}arg${D}#"
- ;;
- esac
- shift
- done
-
- objfilebase=\`basename ${D}objfile\`
- builddir=\`dirname ${D}objfile\`
- depsdir=${D}builddir/${D}DEPSDIRBASE
- mkdir -p ${D}depsdir
-
- eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{depsdir}/${D}{objfilebase}.d
- exit 0
-
-else
- ${D}*
- exit ${D}?
-fi
-EOF
-dnl ===================== bk-deps ends here =====================
-])
-
-AC_DEFUN([AC_BAKEFILE_CREATE_FILE_SHARED_LD_SH],
-[
-dnl ===================== shared-ld-sh begins here =====================
-dnl (Created by merge-scripts.py from shared-ld-sh
-dnl file do not edit here!)
-D='$'
-cat <<EOF >shared-ld-sh
-#!/bin/sh
-#-----------------------------------------------------------------------------
-#-- Name: distrib/mac/shared-ld-sh
-#-- Purpose: Link a mach-o dynamic shared library for Darwin / Mac OS X
-#-- Author: Gilles Depeyrot
-#-- Copyright: (c) 2002 Gilles Depeyrot
-#-- Licence: any use permitted
-#-----------------------------------------------------------------------------
-
-verbose=0
-args=""
-objects=""
-linking_flag="-dynamiclib"
-ldargs="-r -keep_private_externs -nostdlib"
-
-if test "x${D}CXX" = "x"; then
- CXX="c++"
-fi
-
-while test ${D}# -gt 0; do
- case ${D}1 in
-
- -v)
- verbose=1
- ;;
-
- -o|-compatibility_version|-current_version|-framework|-undefined|-install_name)
- # collect these options and values
- args="${D}{args} ${D}1 ${D}2"
- shift
- ;;
-
- -arch|-isysroot)
- # collect these options and values
- ldargs="${D}{ldargs} ${D}1 ${D}2"
- shift
- ;;
-
- -s|-Wl,*)
- # collect these load args
- ldargs="${D}{ldargs} ${D}1"
- ;;
-
- -l*|-L*|-flat_namespace|-headerpad_max_install_names)
- # collect these options
- args="${D}{args} ${D}1"
- ;;
-
- -dynamiclib|-bundle)
- linking_flag="${D}1"
- ;;
-
- -*)
- echo "shared-ld: unhandled option '${D}1'"
- exit 1
- ;;
-
- *.o | *.a | *.dylib)
- # collect object files
- objects="${D}{objects} ${D}1"
- ;;
-
- *)
- echo "shared-ld: unhandled argument '${D}1'"
- exit 1
- ;;
-
- esac
- shift
-done
-
-status=0
-
-#
-# Link one module containing all the others
-#
-if test ${D}{verbose} = 1; then
- echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
-fi
-${D}CXX ${D}{ldargs} ${D}{objects} -...
[truncated message content] |
|
From: <cur...@us...> - 2011-01-04 19:00:14
|
Revision: 71
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=71&view=rev
Author: cursorstar
Date: 2011-01-04 19:00:00 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
Big big commit with :
- better bakefilization
- add execute plugin
Modified Paths:
--------------
trunk/wxdevcenter/Makefile.in
trunk/wxdevcenter/autogen.sh
trunk/wxdevcenter/build/bakefiles/Bakefiles.bkgen
trunk/wxdevcenter/build/bakefiles/plugins.bkl
trunk/wxdevcenter/build/bakefiles/wxdevcenter.bkl
trunk/wxdevcenter/configure.ac
trunk/wxdevcenter/po/Makefile.in.in
trunk/wxdevcenter/src/sys/config.cpp
trunk/wxdevcenter/src/sys/plugin.cpp
trunk/wxdevcenter/src/sys/plugin.hpp
trunk/wxdevcenter/src/sys/search.hpp
trunk/wxdevcenter/src/ui/art.cpp
Added Paths:
-----------
trunk/wxdevcenter/build/m4/autoconf_inc.m4
trunk/wxdevcenter/plugins/execute/
trunk/wxdevcenter/plugins/execute/execprocess.cpp
trunk/wxdevcenter/plugins/execute/execprocess.hpp
trunk/wxdevcenter/plugins/execute/execute.cpp
trunk/wxdevcenter/plugins/execute/execute.hpp
trunk/wxdevcenter/share/xrc/TextPlugin.xrc
trunk/wxdevcenter/src/config.h.in
trunk/wxdevcenter/src/sys/log.cpp
trunk/wxdevcenter/src/sys/log.hpp
trunk/wxdevcenter/src/sys/process.cpp
trunk/wxdevcenter/src/sys/process.hpp
Removed Paths:
-------------
trunk/wxdevcenter/build/bakefiles/.bakefile_gen.state
trunk/wxdevcenter/configure
Modified: trunk/wxdevcenter/Makefile.in
===================================================================
--- trunk/wxdevcenter/Makefile.in 2010-05-13 20:00:42 UTC (rev 70)
+++ trunk/wxdevcenter/Makefile.in 2011-01-04 19:00:00 UTC (rev 71)
@@ -49,6 +49,8 @@
libwxdevcenter_task.o \
libwxdevcenter_bookmark.o \
libwxdevcenter_search.o \
+ libwxdevcenter_process.o \
+ libwxdevcenter_log.o \
libwxdevcenter_bitvector.o \
libwxdevcenter_document.o \
libwxdevcenter_view.o \
@@ -76,6 +78,10 @@
dctext_bookmark.o \
dctext_markbar.o \
dctext_text_search.o
+DCEXECUTE_CXXFLAGS = -Isrc $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+DCEXECUTE_OBJECTS = \
+ dcexecute_execute.o \
+ dcexecute_execprocess.o
DCBITMAP_CXXFLAGS = -Isrc $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
DCBITMAP_OBJECTS = \
dcbitmap_bitmap.o
@@ -99,7 +105,7 @@
### Targets: ###
-all: $(DLLPREFIX)libwxdevcenter.$(SO_SUFFIX) wxdevcenter$(EXEEXT) plugins/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE) plugins/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE)
+all: $(DLLPREFIX)libwxdevcenter.$(SO_SUFFIX) wxdevcenter$(EXEEXT) plugins/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE) plugins/$(DLLPREFIX_MODULE)dcexecute.$(SO_SUFFIX_MODULE) plugins/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE)
install:
@@ -114,6 +120,7 @@
rm -f $(LIBPREFIX)libwxdevcenter.$(DLLIMP_SUFFIX)
rm -f wxdevcenter$(EXEEXT)
rm -f plugins/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE)
+ rm -f plugins/$(DLLPREFIX_MODULE)dcexecute.$(SO_SUFFIX_MODULE)
rm -f plugins/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE)
distclean: clean
@@ -131,6 +138,9 @@
plugins/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE): $(DCTEXT_OBJECTS)
$(SHARED_LD_MODULE_CXX) $@ $(DCTEXT_OBJECTS) $(LDFLAGS) $(LIBS)
+plugins/$(DLLPREFIX_MODULE)dcexecute.$(SO_SUFFIX_MODULE): $(DCEXECUTE_OBJECTS)
+ $(SHARED_LD_MODULE_CXX) $@ $(DCEXECUTE_OBJECTS) $(LDFLAGS) $(LIBS)
+
plugins/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE): $(DCBITMAP_OBJECTS)
$(SHARED_LD_MODULE_CXX) $@ $(DCBITMAP_OBJECTS) $(LDFLAGS) $(LIBS)
@@ -155,6 +165,12 @@
libwxdevcenter_search.o: $(srcdir)/src/sys/search.cpp
$(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/sys/search.cpp
+libwxdevcenter_process.o: $(srcdir)/src/sys/process.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/sys/process.cpp
+
+libwxdevcenter_log.o: $(srcdir)/src/sys/log.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/sys/log.cpp
+
libwxdevcenter_bitvector.o: $(srcdir)/src/tools/bitvector.cpp
$(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/tools/bitvector.cpp
@@ -224,6 +240,12 @@
dctext_text_search.o: $(srcdir)/plugins/text/text-search.cpp
$(CXXC) -c -o $@ $(DCTEXT_CXXFLAGS) $(srcdir)/plugins/text/text-search.cpp
+dcexecute_execute.o: $(srcdir)/plugins/execute/execute.cpp
+ $(CXXC) -c -o $@ $(DCEXECUTE_CXXFLAGS) $(srcdir)/plugins/execute/execute.cpp
+
+dcexecute_execprocess.o: $(srcdir)/plugins/execute/execprocess.cpp
+ $(CXXC) -c -o $@ $(DCEXECUTE_CXXFLAGS) $(srcdir)/plugins/execute/execprocess.cpp
+
dcbitmap_bitmap.o: $(srcdir)/plugins/bitmap/bitmap.cpp
$(CXXC) -c -o $@ $(DCBITMAP_CXXFLAGS) $(srcdir)/plugins/bitmap/bitmap.cpp
Modified: trunk/wxdevcenter/autogen.sh
===================================================================
--- trunk/wxdevcenter/autogen.sh 2010-05-13 20:00:42 UTC (rev 70)
+++ trunk/wxdevcenter/autogen.sh 2011-01-04 19:00:00 UTC (rev 71)
@@ -6,14 +6,6 @@
DIE=0
-if [ -n "$GNOME2_DIR" ]; then
- ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
- LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
- PATH="$GNOME2_DIR/bin:$PATH"
- export PATH
- export LD_LIBRARY_PATH
-fi
-
(test -f $srcdir/configure.ac) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level package directory"
@@ -28,63 +20,6 @@
DIE=1
}
-(grep "^IT_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
- (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`intltool' installed."
- echo "You can get it from:"
- echo " ftp://ftp.gnome.org/pub/GNOME/"
- DIE=1
- }
-}
-
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.ac >/dev/null) && {
- (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`xml-i18n-toolize' installed."
- echo "You can get it from:"
- echo " ftp://ftp.gnome.org/pub/GNOME/"
- DIE=1
- }
-}
-
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
- (libtool --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`libtool' installed."
- echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
- }
-}
-
-(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.ac >/dev/null) && {
- (grep "sed.*POTFILES" $srcdir/configure.ac) > /dev/null || \
- (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`glib' installed."
- echo "You can get it from: ftp://ftp.gtk.org/pub/gtk"
- DIE=1
- }
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`automake' installed."
- echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
- NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: Missing \`aclocal'. The version of \`automake'"
- echo "installed doesn't appear recent enough."
- echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
-}
-
if test "$DIE" -eq 1; then
exit 1
fi
@@ -112,43 +47,33 @@
aclocalinclude="$ACLOCAL_FLAGS"
- if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
- echo "Creating $dr/aclocal.m4 ..."
- test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
- echo "Running glib-gettextize... Ignore non-fatal messages."
- echo "no" | glib-gettextize --force --copy
- echo "Making $dr/aclocal.m4 writable ..."
- test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
- fi
- if grep "^IT_PROG_INTLTOOL" configure.ac >/dev/null; then
- echo "Running intltoolize..."
- intltoolize --copy --force --automake
- fi
- if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then
- echo "Running xml-i18n-toolize..."
- xml-i18n-toolize --copy --force --automake
- fi
if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
- if test -z "$NO_LIBTOOLIZE" ; then
- echo "Running libtoolize..."
- libtoolize --force --copy
- fi
+ if test -z "$NO_LIBTOOLIZE" ; then
+ echo "Running libtoolize..."
+ libtoolize --force
+ fi
fi
+
echo "Running aclocal $aclocalinclude ..."
aclocal $aclocalinclude
+
if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
- echo "Running autoheader..."
- autoheader
+ echo "Running autoheader..."
+ autoheader
fi
- echo "Running automake --gnu $am_opt ..."
- automake --add-missing --gnu $am_opt
+
+ if grep "^AC_BAKEFILE" configure.ac >/dev/null; then
+ echo "Running bakefilize ..."
+ bakefilize --force
+ fi
+
echo "Running autoconf ..."
autoconf
)
fi
done
-conf_flags="--enable-maintainer-mode"
+conf_flags=""
if test x$NOCONFIGURE = x; then
echo Running $srcdir/configure $conf_flags "$@" ...
Deleted: trunk/wxdevcenter/build/bakefiles/.bakefile_gen.state
===================================================================
--- trunk/wxdevcenter/build/bakefiles/.bakefile_gen.state 2010-05-13 20:00:42 UTC (rev 70)
+++ trunk/wxdevcenter/build/bakefiles/.bakefile_gen.state 2011-01-04 19:00:00 UTC (rev 71)
@@ -1,13 +0,0 @@
-K.}q((UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklU msvs2003prjtq(cdependencies
-DepsRecord
-qoq}q(Uoutputsq]q((UE/home/mimile/Projects/wxdevcenter/build/msw/wx_vc7_wxdevcenter.vcprojUreplaceqtq (U6/home/mimile/Projects/wxdevcenter/build/msw/wx_vc7.slnhtq
-(UH/home/mimile/Projects/wxdevcenter/build/msw/wx_vc7_libwxdevcenter.vcprojhtq eUdepsq ]q
-((cdependencies
-FileDep
-qoq}qUfilenameqU$/usr/share/bakefile/rules/common.bklqsb(hoq}qhU%/usr/share/bakefile/rules/version.bklqsb(hoq}qhU"/usr/share/bakefile/rules/dirs.bklqsb(hoq}qhU-/usr/share/bakefile/rules/format_features.bklqsb(hoq }q hU)/usr/share/bakefile/rules/msvs2003prj.bklq sb(hoq }q hU)/usr/share/bakefile/rules/msvs200xprj.bklq!sb(hoq"}q#hU4/usr/share/bakefile/rules/msvc_prj_vcproj_common.bklq$sb(hoq%}q&hU-/usr/share/bakefile/rules/msvc_prj_common.bklq'sb(hoq(}q)hU#/usr/share/bakefile/rules/win32.bklq*sb(hoq+}q,hU@/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx.bklq-sb(hoq.}q/hUG/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_presets.pyq0sb(hoq1}q2hUF/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_win32.bklq3sb(hoq4}q5hUD/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_xrc.bklq6sb(hoq7}q8hU</home/mimile/Projects/wxdevcenter/build/bakefiles/config.bklq9sb(hoq:}q;hU)/usr/share/bakefile/output/msvs200xprj.pyq<sbeub(UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklU msvs2005prjtq=(hoq>}q?(Uoutputsq@]qA((U6/home/mimile/Projects/wxdevcenter/build/msw/wx_vc8.slnUreplaceqBtqC(UH/home/mimile/Projects/wxdevcenter/build/msw/wx_vc8_libwxdevcenter.vcprojhBtqD(UE/home/mimile/Projects/wxdevcenter/build/msw/wx_vc8_wxdevcenter.vcprojhBtqEeUdepsqF]qG((hoqH}qIUfilenameqJU$/usr/share/bakefile/rules/common.bklqKsb(hoqL}qMhJU%/usr/share/bakefile/rules/version.bklqNsb(hoqO}qPhJU"/usr/share/bakefile/rules/dirs.bklqQsb(hoqR}qShJU-/usr/share/bakefile/rules/format_features.bklqTsb(hoqU}qVhJU)/usr/share/bakefile/rules/msvs2005prj.bklqWsb(hoqX}qYhJU)/usr/share/bakefile/rules/msvs200xprj.bklqZsb(hoq[}q\hJU4/usr/share/bakefile/rules/msvc_prj_vcproj_common.bklq]sb(hoq^}q_hJU-/usr/share/bakefile/rules/msvc_prj_common.bklq`sb(hoqa}qbhJU#/usr/share/bakefile/rules/win32.bklqcsb(hoqd}qehJU@/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx.bklqfsb(hoqg}qhhJUG/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_presets.pyqisb(hoqj}qkhJUF/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_win32.bklqlsb(hoqm}qnhJUD/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_xrc.bklqosb(hoqp}qqhJU</home/mimile/Projects/wxdevcenter/build/bakefiles/config.bklqrsb(hoqs}qthJU)/usr/share/bakefile/output/msvs200xprj.pyqusbeub(UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklUmingwtqv(hoqw}qx(Uoutputsqy]qz(U8/home/mimile/Projects/wxdevcenter/build/msw/makefile.gccUreplacetq{aUdepsq|]q}((hoq~}qUfilenameq\x80U$/usr/share/bakefile/rules/common.bklq\x81sb(hoq\x82}q\x83h\x80U%/usr/share/bakefile/rules/version.bklq\x84sb(hoq\x85}q\x86h\x80U"/usr/share/bakefile/rules/dirs.bklq\x87sb(hoq\x88}q\x89h\x80U-/usr/share/bakefile/rules/format_features.bklq\x8Asb(hoq\x8B}q\x8Ch\x80U#/usr/share/bakefile/rules/mingw.bklq\x8Dsb(hoq\x8E}q\x8Fh\x80U&/usr/share/bakefile/rules/makefile.bklq\x90sb(hoq\x91}q\x92h\x80U1/usr/share/bakefile/rules/makefile_defs_mingw.bklq\x93sb(hoq\x94}q\x95h\x80U#/usr/share/bakefile/rules/win32.bklq\x96sb(hoq\x97}q\x98h\x80U//usr/share/bakefile/rules/makefile_defs_gnu.bklq\x99sb(hoq\x9A}q\x9Bh\x80U,/usr/share/bakefile/rules/makefile_mingw.bklq\x9Csb(hoq\x9D}q\x9Eh\x80U@/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx.bklq\x9Fsb(hoq\xA0}q\xA1h\x80UG/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_presets.pyq\xA2sb(hoq\xA3}q\xA4h\x80UF/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_win32.bklq\xA5sb(hoq\xA6}q\xA7h\x80UD/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_xrc.bklq\xA8sb(hoq\xA9}q\xAAh\x80U</home/mimile/Projects/wxdevcenter/build/bakefiles/config.bklq\xABsb(hoq\xAC}q\xADh\x80U'/usr/share/bakefile/output/gnumake.empyq\xAEsbeub(UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklUmsvctq\xAF(hoq\xB0}q\xB1(Uoutputsq\xB2]q\xB3(U7/home/mimile/Projects/wxdevcenter/build/msw/makefile.vcUreplacetq\xB4aUdepsq\xB5]q\xB6((hoq\xB7}q\xB8Ufilenameq\xB9U$/usr/share/bakefile/rules/common.bklq\xBAsb(hoq\xBB}q\xBCh\xB9U%/usr/share/bakefile/rules/version.bklq\xBDsb(hoq\xBE}q\xBFh\xB9U"/usr/share/bakefile/rules/dirs.bklq\xC0sb(hoq\xC1}q\xC2h\xB9U-/usr/share/bakefile/rules/format_features.bklq\xC3sb(hoq\xC4}q\xC5h\xB9U"/usr/share/bakefile/rules/msvc.bklq\xC6sb(hoq\xC7}q\xC8h\xB9U&/usr/share/bakefile/rules/makefile.bklq\xC9sb(hoq\xCA}q\xCBh\xB9U0/usr/share/bakefile/rules/makefile_defs_msvc.bklq\xCCsb(hoq\xCD}q\xCEh\xB9U#/usr/share/bakefile/rules/win32.bklq\xCFsb(hoq\xD0}q\xD1h\xB9U)/usr/share/bakefile/rules/msvc_common.bklq\xD2sb(hoq\xD3}q\xD4h\xB9U@/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx.bklq\xD5sb(hoq\xD6}q\xD7h\xB9UG/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_presets.pyq\xD8sb(hoq\xD9}q\xDAh\xB9UF/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_win32.bklq\xDBsb(hoq\xDC}q\xDDh\xB9UD/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_xrc.bklq\xDEsb(hoq\xDF}q\xE0h\xB9U</home/mimile/Projects/wxdevcenter/build/bakefiles/config.bklq\xE1sb(hoq\xE2}q\xE3h\xB9U$/usr/share/bakefile/output/msvc.empyq\xE4sbeub(UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklUautoconftq\xE5(hoq\xE6}q\xE7(Uoutputsq\xE8]q\xE9((U1/home/mimile/Projects/wxdevcenter/autoconf_inc.m4UmergeBlocksWithFilelisttq\xEA(U-/home/mimile/Projects/wxdevcenter/Makefile.inUreplacetq\xEBeUdepsq\xEC]q\xED((hoq\xEE}q\xEFUfilenameq\xF0U$/usr/share/bakefile/rules/common.bklq\xF1sb(hoq\xF2}q\xF3h\xF0U%/usr/share/bakefile/rules/version.bklq\xF4sb(hoq\xF5}q\xF6h\xF0U"/usr/share/bakefile/rules/dirs.bklq\xF7sb(hoq\xF8}q\xF9h\xF0U-/usr/share/bakefile/rules/format_features.bklq\xFAsb(hoq\xFB}q\xFCh\xF0U&/usr/share/bakefile/rules/autoconf.bklq\xFDsb(hoq\xFE}q\xFFh\xF0U-/usr/share/bakefile/rules/makefile_macres.bklr |
|
From: <cur...@us...> - 2010-05-13 20:00:49
|
Revision: 70
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=70&view=rev
Author: cursorstar
Date: 2010-05-13 20:00:42 +0000 (Thu, 13 May 2010)
Log Message:
-----------
Fix configure with using new wx291 m4 macros
Modified Paths:
--------------
trunk/wxdevcenter/aclocal.m4
trunk/wxdevcenter/configure
trunk/wxdevcenter/configure.ac
Added Paths:
-----------
trunk/wxdevcenter/build/m4/
trunk/wxdevcenter/build/m4/wxwin.m4
Modified: trunk/wxdevcenter/aclocal.m4
===================================================================
--- trunk/wxdevcenter/aclocal.m4 2010-05-13 17:29:05 UTC (rev 69)
+++ trunk/wxdevcenter/aclocal.m4 2010-05-13 20:00:42 UTC (rev 70)
@@ -10763,374 +10763,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
-dnl ---------------------------------------------------------------------------
-dnl Macros for wxWidgets detection. Typically used in configure.in as:
-dnl
-dnl AC_ARG_ENABLE(...)
-dnl AC_ARG_WITH(...)
-dnl ...
-dnl AM_OPTIONS_WXCONFIG
-dnl ...
-dnl ...
-dnl AM_PATH_WXCONFIG(2.6.0, wxWin=1)
-dnl if test "$wxWin" != 1; then
-dnl AC_MSG_ERROR([
-dnl wxWidgets must be installed on your system
-dnl but wx-config script couldn't be found.
-dnl
-dnl Please check that wx-config is in path, the directory
-dnl where wxWidgets libraries are installed (returned by
-dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or
-dnl equivalent variable and wxWidgets version is 2.3.4 or above.
-dnl ])
-dnl fi
-dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
-dnl
-dnl LIBS="$LIBS $WX_LIBS"
-dnl ---------------------------------------------------------------------------
-dnl ---------------------------------------------------------------------------
-dnl AM_OPTIONS_WXCONFIG
-dnl
-dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and
-dnl --wx-config command line options
-dnl ---------------------------------------------------------------------------
-
-AC_DEFUN([AM_OPTIONS_WXCONFIG],
-[
- AC_ARG_WITH(wxdir,
- [ --with-wxdir=PATH Use uninstalled version of wxWidgets in PATH],
- [ wx_config_name="$withval/wx-config"
- wx_config_args="--inplace"])
- AC_ARG_WITH(wx-config,
- [ --with-wx-config=CONFIG wx-config script to use (optional)],
- wx_config_name="$withval" )
- AC_ARG_WITH(wx-prefix,
- [ --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)],
- wx_config_prefix="$withval", wx_config_prefix="")
- AC_ARG_WITH(wx-exec-prefix,
- [ --with-wx-exec-prefix=PREFIX
- Exec prefix where wxWidgets is installed (optional)],
- wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
-])
-
-dnl Helper macro for checking if wx version is at least $1.$2.$3, set's
-dnl wx_ver_ok=yes if it is:
-AC_DEFUN([_WX_PRIVATE_CHECK_VERSION],
-[
- wx_ver_ok=""
- if test "x$WX_VERSION" != x ; then
- if test $wx_config_major_version -gt $1; then
- wx_ver_ok=yes
- else
- if test $wx_config_major_version -eq $1; then
- if test $wx_config_minor_version -gt $2; then
- wx_ver_ok=yes
- else
- if test $wx_config_minor_version -eq $2; then
- if test $wx_config_micro_version -ge $3; then
- wx_ver_ok=yes
- fi
- fi
- fi
- fi
- fi
- fi
-])
-
-dnl ---------------------------------------------------------------------------
-dnl AM_PATH_WXCONFIG(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
-dnl [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]])
-dnl
-dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
-dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME
-dnl environment variable to override the default name of the wx-config script
-dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
-dnl case the macro won't even waste time on tests for its existence.
-dnl
-dnl Optional WX-LIBS argument contains comma- or space-separated list of
-dnl wxWidgets libraries to link against (it may include contrib libraries). If
-dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to
-dnl link with all of the core wxWidgets libraries.
-dnl
-dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
-dnl invocation command in present. It can be used to fine-tune lookup of
-dnl best wxWidgets build available.
-dnl
-dnl Example use:
-dnl AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], [html,core,net]
-dnl [--unicode --debug])
-dnl ---------------------------------------------------------------------------
-
-dnl
-dnl Get the cflags and libraries from the wx-config script
-dnl
-AC_DEFUN([AM_PATH_WXCONFIG],
-[
- dnl do we have wx-config name: it can be wx-config or wxd-config or ...
- if test x${WX_CONFIG_NAME+set} != xset ; then
- WX_CONFIG_NAME=wx-config
- fi
-
- if test "x$wx_config_name" != x ; then
- WX_CONFIG_NAME="$wx_config_name"
- fi
-
- dnl deal with optional prefixes
- if test x$wx_config_exec_prefix != x ; then
- wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
- WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
- fi
- if test x$wx_config_prefix != x ; then
- wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
- WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
- fi
- if test "$cross_compiling" = "yes"; then
- wx_config_args="$wx_config_args --host=$host_alias"
- fi
-
- dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
- if test -x "$WX_CONFIG_NAME" ; then
- AC_MSG_CHECKING(for wx-config)
- WX_CONFIG_PATH="$WX_CONFIG_NAME"
- AC_MSG_RESULT($WX_CONFIG_PATH)
- else
- AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH")
- fi
-
- if test "$WX_CONFIG_PATH" != "no" ; then
- WX_VERSION=""
-
- min_wx_version=ifelse([$1], ,2.2.1,$1)
- if test -z "$5" ; then
- AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version])
- else
- AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)])
- fi
-
- WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4"
-
- WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
- wx_config_major_version=`echo $WX_VERSION | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- wx_config_minor_version=`echo $WX_VERSION | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- wx_config_micro_version=`echo $WX_VERSION | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
- wx_requested_major_version=`echo $min_wx_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- wx_requested_minor_version=`echo $min_wx_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- wx_requested_micro_version=`echo $min_wx_version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-
- _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
- [$wx_requested_minor_version],
- [$wx_requested_micro_version])
-
- if test -n "$wx_ver_ok"; then
-
- AC_MSG_RESULT(yes (version $WX_VERSION))
- WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
-
- dnl is this even still appropriate? --static is a real option now
- dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
- dnl what the user actually wants, making this redundant at best.
- dnl For now keep it in case anyone actually used it in the past.
- AC_MSG_CHECKING([for wxWidgets static library])
- WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
- if test "x$WX_LIBS_STATIC" = "x"; then
- AC_MSG_RESULT(no)
- else
- AC_MSG_RESULT(yes)
- fi
-
- dnl starting with version 2.2.6 wx-config has --cppflags argument
- wx_has_cppflags=""
- if test $wx_config_major_version -gt 2; then
- wx_has_cppflags=yes
- else
- if test $wx_config_major_version -eq 2; then
- if test $wx_config_minor_version -gt 2; then
- wx_has_cppflags=yes
- else
- if test $wx_config_minor_version -eq 2; then
- if test $wx_config_micro_version -ge 6; then
- wx_has_cppflags=yes
- fi
- fi
- fi
- fi
- fi
-
- dnl starting with version 2.7.0 wx-config has --rescomp option
- wx_has_rescomp=""
- if test $wx_config_major_version -gt 2; then
- wx_has_rescomp=yes
- else
- if test $wx_config_major_version -eq 2; then
- if test $wx_config_minor_version -ge 7; then
- wx_has_rescomp=yes
- fi
- fi
- fi
- if test "x$wx_has_rescomp" = x ; then
- dnl cannot give any useful info for resource compiler
- WX_RESCOMP=
- else
- WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
- fi
-
- if test "x$wx_has_cppflags" = x ; then
- dnl no choice but to define all flags like CFLAGS
- WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
- WX_CPPFLAGS=$WX_CFLAGS
- WX_CXXFLAGS=$WX_CFLAGS
-
- WX_CFLAGS_ONLY=$WX_CFLAGS
- WX_CXXFLAGS_ONLY=$WX_CFLAGS
- else
- dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
- WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
- WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
- WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
-
- WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
- WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
- fi
-
- ifelse([$2], , :, [$2])
-
- else
-
- if test "x$WX_VERSION" = x; then
- dnl no wx-config at all
- AC_MSG_RESULT(no)
- else
- AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
- fi
-
- WX_CFLAGS=""
- WX_CPPFLAGS=""
- WX_CXXFLAGS=""
- WX_LIBS=""
- WX_LIBS_STATIC=""
- WX_RESCOMP=""
- ifelse([$3], , :, [$3])
-
- fi
- else
-
- WX_CFLAGS=""
- WX_CPPFLAGS=""
- WX_CXXFLAGS=""
- WX_LIBS=""
- WX_LIBS_STATIC=""
- WX_RESCOMP=""
-
- ifelse([$3], , :, [$3])
-
- fi
-
- AC_SUBST(WX_CPPFLAGS)
- AC_SUBST(WX_CFLAGS)
- AC_SUBST(WX_CXXFLAGS)
- AC_SUBST(WX_CFLAGS_ONLY)
- AC_SUBST(WX_CXXFLAGS_ONLY)
- AC_SUBST(WX_LIBS)
- AC_SUBST(WX_LIBS_STATIC)
- AC_SUBST(WX_VERSION)
- AC_SUBST(WX_RESCOMP)
-])
-
-dnl ---------------------------------------------------------------------------
-dnl Get information on the wxrc program for making C++, Python and xrs
-dnl resource files.
-dnl
-dnl AC_ARG_ENABLE(...)
-dnl AC_ARG_WITH(...)
-dnl ...
-dnl AM_OPTIONS_WXCONFIG
-dnl ...
-dnl AM_PATH_WXCONFIG(2.6.0, wxWin=1)
-dnl if test "$wxWin" != 1; then
-dnl AC_MSG_ERROR([
-dnl wxWidgets must be installed on your system
-dnl but wx-config script couldn't be found.
-dnl
-dnl Please check that wx-config is in path, the directory
-dnl where wxWidgets libraries are installed (returned by
-dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or
-dnl equivalent variable and wxWidgets version is 2.6.0 or above.
-dnl ])
-dnl fi
-dnl
-dnl AM_PATH_WXRC([HAVE_WXRC=1], [HAVE_WXRC=0])
-dnl if test "x$HAVE_WXRC" != x1; then
-dnl AC_MSG_ERROR([
-dnl The wxrc program was not installed or not found.
-dnl
-dnl Please check the wxWidgets installation.
-dnl ])
-dnl fi
-dnl
-dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
-dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
-dnl
-dnl LDFLAGS="$LDFLAGS $WX_LIBS"
-dnl ---------------------------------------------------------------------------
-
-
-
-dnl ---------------------------------------------------------------------------
-dnl AM_PATH_WXRC([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl
-dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS
-dnl resources. The variable WXRC will be set and substituted in the configure
-dnl script and Makefiles.
-dnl
-dnl Example use:
-dnl AM_PATH_WXRC([wxrc=1], [wxrc=0])
-dnl ---------------------------------------------------------------------------
-
-dnl
-dnl wxrc program from the wx-config script
-dnl
-AC_DEFUN([AM_PATH_WXRC],
-[
- AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
-
- if test "x$WX_CONFIG_NAME" = x; then
- AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
- else
-
- AC_MSG_CHECKING([for wxrc])
-
- if test "x$WXRC" = x ; then
- dnl wx-config --utility is a new addition to wxWidgets:
- _WX_PRIVATE_CHECK_VERSION(2,5,3)
- if test -n "$wx_ver_ok"; then
- WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc`
- fi
- fi
-
- if test "x$WXRC" = x ; then
- AC_MSG_RESULT([not found])
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT([$WXRC])
- ifelse([$1], , :, [$1])
- fi
-
- AC_SUBST(WXRC)
- fi
-])
-
-
# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
# Free Software Foundation, Inc.
#
Added: trunk/wxdevcenter/build/m4/wxwin.m4
===================================================================
--- trunk/wxdevcenter/build/m4/wxwin.m4 (rev 0)
+++ trunk/wxdevcenter/build/m4/wxwin.m4 2010-05-13 20:00:42 UTC (rev 70)
@@ -0,0 +1,1063 @@
+dnl ---------------------------------------------------------------------------
+dnl Author: wxWidgets development team,
+dnl Francesco Montorsi,
+dnl Bob McCown (Mac-testing)
+dnl Creation date: 24/11/2001
+dnl RCS-ID: $Id: wxwin.m4 62477 2009-10-22 15:44:30Z FM $
+dnl ---------------------------------------------------------------------------
+
+dnl ===========================================================================
+dnl Table of Contents of this macro file:
+dnl -------------------------------------
+dnl
+dnl SECTION A: wxWidgets main macros
+dnl - WX_CONFIG_OPTIONS
+dnl - WX_CONFIG_CHECK
+dnl - WXRC_CHECK
+dnl - WX_STANDARD_OPTIONS
+dnl - WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
+dnl - WX_DETECT_STANDARD_OPTION_VALUES
+dnl
+dnl SECTION B: wxWidgets-related utilities
+dnl - WX_LIKE_LIBNAME
+dnl - WX_ARG_ENABLE_YESNOAUTO
+dnl - WX_ARG_WITH_YESNOAUTO
+dnl
+dnl SECTION C: messages to the user
+dnl - WX_STANDARD_OPTIONS_SUMMARY_MSG
+dnl - WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN
+dnl - WX_STANDARD_OPTIONS_SUMMARY_MSG_END
+dnl - WX_BOOLOPT_SUMMARY
+dnl
+dnl The special "WX_DEBUG_CONFIGURE" variable can be set to 1 to enable extra
+dnl debug output on stdout from these macros.
+dnl ===========================================================================
+
+
+dnl ---------------------------------------------------------------------------
+dnl Macros for wxWidgets detection. Typically used in configure.in as:
+dnl
+dnl AC_ARG_ENABLE(...)
+dnl AC_ARG_WITH(...)
+dnl ...
+dnl WX_CONFIG_OPTIONS
+dnl ...
+dnl ...
+dnl WX_CONFIG_CHECK([2.6.0], [wxWin=1])
+dnl if test "$wxWin" != 1; then
+dnl AC_MSG_ERROR([
+dnl wxWidgets must be installed on your system
+dnl but wx-config script couldn't be found.
+dnl
+dnl Please check that wx-config is in path, the directory
+dnl where wxWidgets libraries are installed (returned by
+dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or
+dnl equivalent variable and wxWidgets version is 2.3.4 or above.
+dnl ])
+dnl fi
+dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+dnl
+dnl LIBS="$LIBS $WX_LIBS"
+dnl
+dnl If you want to support standard --enable-debug/unicode/shared options, you
+dnl may do the following:
+dnl
+dnl ...
+dnl AC_CANONICAL_SYSTEM
+dnl
+dnl # define configure options
+dnl WX_CONFIG_OPTIONS
+dnl WX_STANDARD_OPTIONS([debug,unicode,shared,toolkit,wxshared])
+dnl
+dnl # basic configure checks
+dnl ...
+dnl
+dnl # we want to always have DEBUG==WX_DEBUG and UNICODE==WX_UNICODE
+dnl WX_DEBUG=$DEBUG
+dnl WX_UNICODE=$UNICODE
+dnl
+dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
+dnl WX_CONFIG_CHECK([2.8.0], [wxWin=1],,[html,core,net,base],[$WXCONFIG_FLAGS])
+dnl WX_DETECT_STANDARD_OPTION_VALUES
+dnl
+dnl # write the output files
+dnl AC_CONFIG_FILES([Makefile ...])
+dnl AC_OUTPUT
+dnl
+dnl # optional: just to show a message to the user
+dnl WX_STANDARD_OPTIONS_SUMMARY_MSG
+dnl
+dnl ---------------------------------------------------------------------------
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_CONFIG_OPTIONS
+dnl
+dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and
+dnl --wx-config command line options
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN([WX_CONFIG_OPTIONS],
+[
+ AC_ARG_WITH(wxdir,
+ [ --with-wxdir=PATH Use uninstalled version of wxWidgets in PATH],
+ [ wx_config_name="$withval/wx-config"
+ wx_config_args="--inplace"])
+ AC_ARG_WITH(wx-config,
+ [ --with-wx-config=CONFIG wx-config script to use (optional)],
+ wx_config_name="$withval" )
+ AC_ARG_WITH(wx-prefix,
+ [ --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)],
+ wx_config_prefix="$withval", wx_config_prefix="")
+ AC_ARG_WITH(wx-exec-prefix,
+ [ --with-wx-exec-prefix=PREFIX
+ Exec prefix where wxWidgets is installed (optional)],
+ wx_config_exec_prefix="$withval", wx_config_exec_prefix="")
+])
+
+dnl Helper macro for checking if wx version is at least $1.$2.$3, set's
+dnl wx_ver_ok=yes if it is:
+AC_DEFUN([_WX_PRIVATE_CHECK_VERSION],
+[
+ wx_ver_ok=""
+ if test "x$WX_VERSION" != x ; then
+ if test $wx_config_major_version -gt $1; then
+ wx_ver_ok=yes
+ else
+ if test $wx_config_major_version -eq $1; then
+ if test $wx_config_minor_version -gt $2; then
+ wx_ver_ok=yes
+ else
+ if test $wx_config_minor_version -eq $2; then
+ if test $wx_config_micro_version -ge $3; then
+ wx_ver_ok=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+ fi
+])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_CONFIG_CHECK(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND
+dnl [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]])
+dnl
+dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
+dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME
+dnl environment variable to override the default name of the wx-config script
+dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this
+dnl case the macro won't even waste time on tests for its existence.
+dnl
+dnl Optional WX-LIBS argument contains comma- or space-separated list of
+dnl wxWidgets libraries to link against. If it is not specified then WX_LIBS
+dnl and WX_LIBS_STATIC will contain flags to link with all of the core
+dnl wxWidgets libraries.
+dnl
+dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
+dnl invocation command in present. It can be used to fine-tune lookup of
+dnl best wxWidgets build available.
+dnl
+dnl Example use:
+dnl WX_CONFIG_CHECK([2.6.0], [wxWin=1], [wxWin=0], [html,core,net]
+dnl [--unicode --debug])
+dnl ---------------------------------------------------------------------------
+
+dnl
+dnl Get the cflags and libraries from the wx-config script
+dnl
+AC_DEFUN([WX_CONFIG_CHECK],
+[
+ dnl do we have wx-config name: it can be wx-config or wxd-config or ...
+ if test x${WX_CONFIG_NAME+set} != xset ; then
+ WX_CONFIG_NAME=wx-config
+ fi
+
+ if test "x$wx_config_name" != x ; then
+ WX_CONFIG_NAME="$wx_config_name"
+ fi
+
+ dnl deal with optional prefixes
+ if test x$wx_config_exec_prefix != x ; then
+ wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix"
+ WX_LOOKUP_PATH="$wx_config_exec_prefix/bin"
+ fi
+ if test x$wx_config_prefix != x ; then
+ wx_config_args="$wx_config_args --prefix=$wx_config_prefix"
+ WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin"
+ fi
+ if test "$cross_compiling" = "yes"; then
+ wx_config_args="$wx_config_args --host=$host_alias"
+ fi
+
+ dnl don't search the PATH if WX_CONFIG_NAME is absolute filename
+ if test -x "$WX_CONFIG_NAME" ; then
+ AC_MSG_CHECKING(for wx-config)
+ WX_CONFIG_PATH="$WX_CONFIG_NAME"
+ AC_MSG_RESULT($WX_CONFIG_PATH)
+ else
+ AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH")
+ fi
+
+ if test "$WX_CONFIG_PATH" != "no" ; then
+ WX_VERSION=""
+
+ min_wx_version=ifelse([$1], ,2.2.1,$1)
+ if test -z "$5" ; then
+ AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version])
+ else
+ AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)])
+ fi
+
+ dnl don't add the libraries ($4) to this variable as this would result in
+ dnl an error when it's used with --version below
+ WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5"
+
+ WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
+ wx_config_major_version=`echo $WX_VERSION | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ wx_config_minor_version=`echo $WX_VERSION | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ wx_config_micro_version=`echo $WX_VERSION | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+ wx_requested_major_version=`echo $min_wx_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ wx_requested_minor_version=`echo $min_wx_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ wx_requested_micro_version=`echo $min_wx_version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+ _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version],
+ [$wx_requested_minor_version],
+ [$wx_requested_micro_version])
+
+ if test -n "$wx_ver_ok"; then
+ AC_MSG_RESULT(yes (version $WX_VERSION))
+ WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $4`
+
+ dnl is this even still appropriate? --static is a real option now
+ dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
+ dnl what the user actually wants, making this redundant at best.
+ dnl For now keep it in case anyone actually used it in the past.
+ AC_MSG_CHECKING([for wxWidgets static library])
+ WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $4 2>/dev/null`
+ if test "x$WX_LIBS_STATIC" = "x"; then
+ AC_MSG_RESULT(no)
+ else
+ AC_MSG_RESULT(yes)
+ fi
+
+ dnl starting with version 2.2.6 wx-config has --cppflags argument
+ wx_has_cppflags=""
+ if test $wx_config_major_version -gt 2; then
+ wx_has_cppflags=yes
+ else
+ if test $wx_config_major_version -eq 2; then
+ if test $wx_config_minor_version -gt 2; then
+ wx_has_cppflags=yes
+ else
+ if test $wx_config_minor_version -eq 2; then
+ if test $wx_config_micro_version -ge 6; then
+ wx_has_cppflags=yes
+ fi
+ fi
+ fi
+ fi
+ fi
+
+ dnl starting with version 2.7.0 wx-config has --rescomp option
+ wx_has_rescomp=""
+ if test $wx_config_major_version -gt 2; then
+ wx_has_rescomp=yes
+ else
+ if test $wx_config_major_version -eq 2; then
+ if test $wx_config_minor_version -ge 7; then
+ wx_has_rescomp=yes
+ fi
+ fi
+ fi
+ if test "x$wx_has_rescomp" = x ; then
+ dnl cannot give any useful info for resource compiler
+ WX_RESCOMP=
+ else
+ WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
+ fi
+
+ if test "x$wx_has_cppflags" = x ; then
+ dnl no choice but to define all flags like CFLAGS
+ WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
+ WX_CPPFLAGS=$WX_CFLAGS
+ WX_CXXFLAGS=$WX_CFLAGS
+
+ WX_CFLAGS_ONLY=$WX_CFLAGS
+ WX_CXXFLAGS_ONLY=$WX_CFLAGS
+ else
+ dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
+ WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags $4`
+ WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags $4`
+ WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
+
+ WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
+ WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
+ fi
+
+ ifelse([$2], , :, [$2])
+
+ else
+
+ if test "x$WX_VERSION" = x; then
+ dnl no wx-config at all
+ AC_MSG_RESULT(no)
+ else
+ AC_MSG_RESULT(no (version $WX_VERSION is not new enough))
+ fi
+
+ WX_CFLAGS=""
+ WX_CPPFLAGS=""
+ WX_CXXFLAGS=""
+ WX_LIBS=""
+ WX_LIBS_STATIC=""
+ WX_RESCOMP=""
+
+ if test ! -z "$5"; then
+
+ wx_error_message="
+ The configuration you asked for $PACKAGE_NAME requires a wxWidgets
+ build with the following settings:
+ $5
+ but such build is not available.
+
+ To see the wxWidgets builds available on this system, please use
+ 'wx-config --list' command. To use the default build, returned by
+ 'wx-config --selected-config', use the options with their 'auto'
+ default values."
+
+ fi
+
+ wx_error_message="
+ The requested wxWidgets build couldn't be found.
+ $wx_error_message
+
+ If you still get this error, then check that 'wx-config' is
+ in path, the directory where wxWidgets libraries are installed
+ (returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH
+ or equivalent variable and wxWidgets version is $1 or above."
+
+ ifelse([$3], , AC_MSG_ERROR([$wx_error_message]), [$3])
+
+ fi
+ else
+
+ WX_CFLAGS=""
+ WX_CPPFLAGS=""
+ WX_CXXFLAGS=""
+ WX_LIBS=""
+ WX_LIBS_STATIC=""
+ WX_RESCOMP=""
+
+ ifelse([$3], , :, [$3])
+
+ fi
+
+ AC_SUBST(WX_CPPFLAGS)
+ AC_SUBST(WX_CFLAGS)
+ AC_SUBST(WX_CXXFLAGS)
+ AC_SUBST(WX_CFLAGS_ONLY)
+ AC_SUBST(WX_CXXFLAGS_ONLY)
+ AC_SUBST(WX_LIBS)
+ AC_SUBST(WX_LIBS_STATIC)
+ AC_SUBST(WX_VERSION)
+ AC_SUBST(WX_RESCOMP)
+
+ dnl need to export also WX_VERSION_MINOR and WX_VERSION_MAJOR symbols
+ dnl to support wxpresets bakefiles (we export also WX_VERSION_MICRO for completeness):
+ WX_VERSION_MAJOR="$wx_config_major_version"
+ WX_VERSION_MINOR="$wx_config_minor_version"
+ WX_VERSION_MICRO="$wx_config_micro_version"
+ AC_SUBST(WX_VERSION_MAJOR)
+ AC_SUBST(WX_VERSION_MINOR)
+ AC_SUBST(WX_VERSION_MICRO)
+])
+
+dnl ---------------------------------------------------------------------------
+dnl Get information on the wxrc program for making C++, Python and xrs
+dnl resource files.
+dnl
+dnl AC_ARG_ENABLE(...)
+dnl AC_ARG_WITH(...)
+dnl ...
+dnl WX_CONFIG_OPTIONS
+dnl ...
+dnl WX_CONFIG_CHECK(2.6.0, wxWin=1)
+dnl if test "$wxWin" != 1; then
+dnl AC_MSG_ERROR([
+dnl wxWidgets must be installed on your system
+dnl but wx-config script couldn't be found.
+dnl
+dnl Please check that wx-config is in path, the directory
+dnl where wxWidgets libraries are installed (returned by
+dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or
+dnl equivalent variable and wxWidgets version is 2.6.0 or above.
+dnl ])
+dnl fi
+dnl
+dnl WXRC_CHECK([HAVE_WXRC=1], [HAVE_WXRC=0])
+dnl if test "x$HAVE_WXRC" != x1; then
+dnl AC_MSG_ERROR([
+dnl The wxrc program was not installed or not found.
+dnl
+dnl Please check the wxWidgets installation.
+dnl ])
+dnl fi
+dnl
+dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY"
+dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+dnl
+dnl LDFLAGS="$LDFLAGS $WX_LIBS"
+dnl ---------------------------------------------------------------------------
+
+dnl ---------------------------------------------------------------------------
+dnl WXRC_CHECK([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS
+dnl resources. The variable WXRC will be set and substituted in the configure
+dnl script and Makefiles.
+dnl
+dnl Example use:
+dnl WXRC_CHECK([wxrc=1], [wxrc=0])
+dnl ---------------------------------------------------------------------------
+
+dnl
+dnl wxrc program from the wx-config script
+dnl
+AC_DEFUN([WXRC_CHECK],
+[
+ AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
+
+ if test "x$WX_CONFIG_NAME" = x; then
+ AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
+ else
+
+ AC_MSG_CHECKING([for wxrc])
+
+ if test "x$WXRC" = x ; then
+ dnl wx-config --utility is a new addition to wxWidgets:
+ _WX_PRIVATE_CHECK_VERSION(2,5,3)
+ if test -n "$wx_ver_ok"; then
+ WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc`
+ fi
+ fi
+
+ if test "x$WXRC" = x ; then
+ AC_MSG_RESULT([not found])
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT([$WXRC])
+ ifelse([$1], , :, [$1])
+ fi
+
+ AC_SUBST(WXRC)
+ fi
+])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_LIKE_LIBNAME([output-var] [prefix], [name])
+dnl
+dnl Sets the "output-var" variable to the name of a library named with same
+dnl wxWidgets rule.
+dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets
+dnl the $lib variable to:
+dnl 'mine_gtk2ud_test-2.8'
+dnl if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_RELEASE=28
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_LIKE_LIBNAME],
+ [
+ wx_temp="$2""_""$WX_PORT"
+
+ dnl add the [u][d] string
+ if test "$WX_UNICODE" = "1"; then
+ wx_temp="$wx_temp""u"
+ fi
+ if test "$WX_DEBUG" = "1"; then
+ wx_temp="$wx_temp""d"
+ fi
+
+ dnl complete the name of the lib
+ wx_temp="$wx_temp""_""$3""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR"
+
+ dnl save it in the user's variable
+ $1=$wx_temp
+ ])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_ARG_ENABLE_YESNOAUTO/WX_ARG_WITH_YESNOAUTO
+dnl
+dnl Two little custom macros which define the ENABLE/WITH configure arguments.
+dnl Macro arguments:
+dnl $1 = the name of the --enable / --with feature
+dnl $2 = the name of the variable associated
+dnl $3 = the description of that feature
+dnl $4 = the default value for that feature
+dnl $5 = additional action to do in case option is given with "yes" value
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_ARG_ENABLE_YESNOAUTO],
+ [AC_ARG_ENABLE($1,
+ AC_HELP_STRING([--enable-$1], [$3 (default is $4)]),
+ [], [enableval="$4"])
+
+ dnl Show a message to the user about this option
+ AC_MSG_CHECKING([for the --enable-$1 option])
+ if test "$enableval" = "yes" ; then
+ AC_MSG_RESULT([yes])
+ $2=1
+ $5
+ elif test "$enableval" = "no" ; then
+ AC_MSG_RESULT([no])
+ $2=0
+ elif test "$enableval" = "auto" ; then
+ AC_MSG_RESULT([will be automatically detected])
+ $2="auto"
+ else
+ AC_MSG_ERROR([
+ Unrecognized option value (allowed values: yes, no, auto)
+ ])
+ fi
+ ])
+
+AC_DEFUN([WX_ARG_WITH_YESNOAUTO],
+ [AC_ARG_WITH($1,
+ AC_HELP_STRING([--with-$1], [$3 (default is $4)]),
+ [], [withval="$4"])
+
+ dnl Show a message to the user about this option
+ AC_MSG_CHECKING([for the --with-$1 option])
+ if test "$withval" = "yes" ; then
+ AC_MSG_RESULT([yes])
+ $2=1
+ $5
+ dnl NB: by default we don't allow --with-$1=no option
+ dnl since it does not make much sense !
+ elif test "$6" = "1" -a "$withval" = "no" ; then
+ AC_MSG_RESULT([no])
+ $2=0
+ elif test "$withval" = "auto" ; then
+ AC_MSG_RESULT([will be automatically detected])
+ $2="auto"
+ else
+ AC_MSG_ERROR([
+ Unrecognized option value (allowed values: yes, auto)
+ ])
+ fi
+ ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_STANDARD_OPTIONS([options-to-add])
+dnl
+dnl Adds to the configure script one or more of the following options:
+dnl --enable-[debug|unicode|shared|wxshared|wxdebug]
+dnl --with-[gtk|msw|motif|x11|mac|mgl|dfb]
+dnl --with-wxversion
+dnl Then checks for their presence and eventually set the DEBUG, UNICODE, SHARED,
+dnl PORT, WX_SHARED, WX_DEBUG, variables to one of the "yes", "no", "auto" values.
+dnl
+dnl Note that e.g. UNICODE != WX_UNICODE; the first is the value of the
+dnl --enable-unicode option (in boolean format) while the second indicates
+dnl if wxWidgets was built in Unicode mode (and still is in boolean format).
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_STANDARD_OPTIONS],
+ [
+
+ dnl the following lines will expand to WX_ARG_ENABLE_YESNOAUTO calls if and only if
+ dnl the $1 argument contains respectively the debug,unicode or shared options.
+
+ dnl be careful here not to set debug flag if only "wxdebug" was specified
+ ifelse(regexp([$1], [\bdebug]), [-1],,
+ [WX_ARG_ENABLE_YESNOAUTO([debug], [DEBUG], [Build in debug mode], [auto])])
+
+ ifelse(index([$1], [unicode]), [-1],,
+ [WX_ARG_ENABLE_YESNOAUTO([unicode], [UNICODE], [Build in Unicode mode], [auto])])
+
+ ifelse(regexp([$1], [\bshared]), [-1],,
+ [WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])])
+
+ dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-toolkit since it's an option
+ dnl which must be able to accept the auto|gtk1|gtk2|msw|... values
+ ifelse(index([$1], [toolkit]), [-1],,
+ [
+ AC_ARG_WITH([toolkit],
+ AC_HELP_STRING([--with-toolkit],
+ [Build against a specific wxWidgets toolkit (default is auto)]),
+ [], [withval="auto"])
+
+ dnl Show a message to the user about this option
+ AC_MSG_CHECKING([for the --with-toolkit option])
+ if test "$withval" = "auto" ; then
+ AC_MSG_RESULT([will be automatically detected])
+ TOOLKIT="auto"
+ else
+ TOOLKIT="$withval"
+
+ dnl PORT must be one of the allowed values
+ if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \
+ "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
+ "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
+ "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then
+ AC_MSG_ERROR([
+ Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb)
+ ])
+ fi
+
+ AC_MSG_RESULT([$TOOLKIT])
+ fi
+ ])
+
+ dnl ****** IMPORTANT *******
+ dnl Unlike for the UNICODE setting, you can build your program in
+ dnl shared mode against a static build of wxWidgets. Thus we have the
+ dnl following option which allows these mixtures. E.g.
+ dnl
+ dnl ./configure --disable-shared --with-wxshared
+ dnl
+ dnl will build your library in static mode against the first available
+ dnl shared build of wxWidgets.
+ dnl
+ dnl Note that's not possible to do the viceversa:
+ dnl
+ dnl ./configure --enable-shared --without-wxshared
+ dnl
+ dnl Doing so you would try to build your library in shared mode against a static
+ dnl build of wxWidgets. This is not possible (you would mix PIC and non PIC code) !
+ dnl A check for this combination of options is in WX_DETECT_STANDARD_OPTION_VALUES
+ dnl (where we know what 'auto' should be expanded to).
+ dnl
+ dnl If you try to build something in ANSI mode against a UNICODE build
+ dnl of wxWidgets or in RELEASE mode against a DEBUG build of wxWidgets,
+ dnl then at best you'll get ton of linking errors !
+ dnl ************************
+
+ ifelse(index([$1], [wxshared]), [-1],,
+ [
+ WX_ARG_WITH_YESNOAUTO(
+ [wxshared], [WX_SHARED],
+ [Force building against a shared build of wxWidgets, even if --disable-shared is given],
+ [auto], [], [1])
+ ])
+
+ dnl Just like for SHARED and WX_SHARED it may happen that some adventurous
+ dnl peoples will want to mix a wxWidgets release build with a debug build of
+ dnl his app/lib. So, we have both DEBUG and WX_DEBUG variables.
+ ifelse(index([$1], [wxdebug]), [-1],,
+ [
+ WX_ARG_WITH_YESNOAUTO(
+ [wxdebug], [WX_DEBUG],
+ [Force building against a debug build of wxWidgets, even if --disable-debug is given],
+ [auto], [], [1])
+ ])
+
+ dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-wxversion since it's an option
+ dnl which accepts the "auto|2.6|2.7|2.8|2.9|3.0" etc etc values
+ ifelse(index([$1], [wxversion]), [-1],,
+ [
+ AC_ARG_WITH([wxversion],
+ AC_HELP_STRING([--with-wxversion],
+ [Build against a specific version of wxWidgets (default is auto)]),
+ [], [withval="auto"])
+
+ dnl Show a message to the user about this option
+ AC_MSG_CHECKING([for the --with-wxversion option])
+ if test "$withval" = "auto" ; then
+ AC_MSG_RESULT([will be automatically detected])
+ WX_RELEASE="auto"
+ else
+
+ wx_requested_major_version=`echo $withval | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).*/\1/'`
+ wx_requested_minor_version=`echo $withval | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).*/\2/'`
+
+ dnl both vars above must be exactly 1 digit
+ if test "${#wx_requested_major_version}" != "1" -o \
+ "${#wx_requested_minor_version}" != "1" ; then
+ AC_MSG_ERROR([
+ Unrecognized option value (allowed values: auto, 2.6, 2.7, 2.8, 2.9, 3.0)
+ ])
+ fi
+
+ WX_RELEASE="$wx_requested_major_version"".""$wx_requested_minor_version"
+ AC_MSG_RESULT([$WX_RELEASE])
+ fi
+ ])
+
+ if test "$WX_DEBUG_CONFIGURE" = "1"; then
+ echo "[[dbg]] DEBUG: $DEBUG, WX_DEBUG: $WX_DEBUG"
+ echo "[[dbg]] UNICODE: $UNICODE, WX_UNICODE: $WX_UNICODE"
+ echo "[[dbg]] SHARED: $SHARED, WX_SHARED: $WX_SHARED"
+ echo "[[dbg]] TOOLKIT: $TOOLKIT, WX_TOOLKIT: $WX_TOOLKIT"
+ echo "[[dbg]] VERSION: $VERSION, WX_RELEASE: $WX_RELEASE"
+ fi
+ ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
+dnl
+dnl Sets the WXCONFIG_FLAGS string using the SHARED,DEBUG,UNICODE variable values
+dnl which are different from "auto".
+dnl Thus this macro needs to be called only once all options have been set.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS],
+ [
+ if test "$WX_SHARED" = "1" ; then
+ WXCONFIG_FLAGS="--static=no "
+ elif test "$WX_SHARED" = "0" ; then
+ WXCONFIG_FLAGS="--static=yes "
+ fi
+
+ if test "$WX_DEBUG" = "1" ; then
+ WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=yes "
+ elif test "$WX_DEBUG" = "0" ; then
+ WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=no "
+ fi
+
+ dnl The user should have set WX_UNICODE=UNICODE
+ if test "$WX_UNICODE" = "1" ; then
+ WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=yes "
+ elif test "$WX_UNICODE" = "0" ; then
+ WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=no "
+ fi
+
+ if test "$TOOLKIT" != "auto" ; then
+ WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--toolkit=$TOOLKIT "
+ fi
+
+ if test "$WX_RELEASE" != "auto" ; then
+ WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--version=$WX_RELEASE "
+ fi
+
+ dnl strip out the last space of the string
+ WXCONFIG_FLAGS=${WXCONFIG_FLAGS% }
+
+ if test "$WX_DEBUG_CONFIGURE" = "1"; then
+ echo "[[dbg]] WXCONFIG_FLAGS: $WXCONFIG_FLAGS"
+ fi
+ ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl _WX_SELECTEDCONFIG_CHECKFOR([RESULTVAR], [STRING], [MSG]
+dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+dnl Outputs the given MSG. Then searches the given STRING in the wxWidgets
+dnl additional CPP flags and put the result of the search in WX_$RESULTVAR
+dnl also adding the "yes" or "no" message result to MSG.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([_WX_SELECTEDCONFIG_CHECKFOR],
+ [
+ if test "$$1" = "auto" ; then
+
+ dnl The user does not have particular preferences for this option;
+ dnl so we will detect the wxWidgets relative build setting and use it
+ AC_MSG_CHECKING([$3])
+
+ dnl set WX_$1 variable to 1 if the $WX_SELECTEDCONFIG contains the $2
+ dnl string or to 0 otherwise.
+ dnl NOTE: 'expr match STRING REGEXP' cannot be used since on Mac it
+ dnl doesn't work; we use 'expr STRING : REGEXP' instead
+ WX_$1=$(expr "$WX_SELECTEDCONFIG" : ".*$2.*")
+
+ if test "$WX_$1" != "0"; then
+ WX_$1=1
+ AC_MSG_RESULT([yes])
+ ifelse([$4], , :, [$4])
+ else
+ WX_$1=0
+ AC_MSG_RESULT([no])
+ ifelse([$5], , :, [$5])
+ fi
+ else
+
+ dnl Use the setting given by the user
+ WX_$1=$$1
+ fi
+ ])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_DETECT_STANDARD_OPTION_VALUES
+dnl
+dnl Detects the values of the following variables:
+dnl 1) WX_RELEASE
+dnl 2) WX_UNICODE
+dnl 3) WX_DEBUG
+dnl 4) WX_SHARED (and also WX_STATIC)
+dnl 5) WX_PORT
+dnl from the previously selected wxWidgets build; this macro in fact must be
+dnl called *after* calling the WX_CONFIG_CHECK macro.
+dnl
+dnl Note that the WX_VERSION_MAJOR, WX_VERSION_MINOR symbols are already set
+dnl by WX_CONFIG_CHECK macro
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
+ [
+ dnl IMPORTANT: WX_VERSION contains all three major.minor.micro digits,
+ dnl while WX_RELEASE only the major.minor ones.
+ WX_RELEASE="$WX_VERSION_MAJOR""$WX_VERSION_MINOR"
+ if test $WX_RELEASE -lt 26 ; then
+
+ AC_MSG_ERROR([
+ Cannot detect the wxWidgets configuration for the selected wxWidgets build
+ since its version is $WX_VERSION < 2.6.0; please install a newer
+ version of wxWidgets.
+ ])
+ fi
+
+ dnl The wx-config we are using understands the "--selected_config"
+ dnl option which returns an easy-parseable string !
+ WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config)
+
+ if test "$WX_DEBUG_CONFIGURE" = "1"; then
+ echo "[[dbg]] Using wx-config --selected-config"
+ echo "[[dbg]] WX_SELECTEDCONFIG: $WX_SELECTEDCONFIG"
+ fi
+
+
+ dnl we could test directly for WX_SHARED with a line like:
+ dnl _WX_SELECTEDCONFIG_CHECKFOR([SHARED], [shared],
+ dnl [if wxWidgets was built in SHARED mode])
+ dnl but wx-config --selected-config DOES NOT outputs the 'shared'
+ dnl word when wx was built in shared mode; it rather outputs the
+ dnl 'static' word when built in static mode.
+ if test $WX_SHARED = "1"; then
+ STATIC=0
+ elif test $WX_SHARED = "0"; then
+ STATIC=1
+ elif test $WX_SHARED = "auto"; then
+ STATIC="auto"
+ fi
+
+ dnl Now set the WX_UNICODE, WX_DEBUG, WX_STATIC variables
+ _WX_SELECTEDCONFIG_CHECKFOR([UNICODE], [unicode],
+ [if wxWidgets was built with UNICODE enabled])
+ _WX_SELECTEDCONFIG_CHECKFOR([DEBUG], [debug],
+ [if wxWidgets was built in DEBUG mode])
+ _WX_SELECTEDCONFIG_CHECKFOR([STATIC], [static],
+ [if wxWidgets was built in STATIC mode])
+
+ dnl init WX_SHARED from WX_STATIC
+ if test "$WX_STATIC" != "0"; then
+ WX_SHARED=0
+ else
+ WX_SHARED=1
+ fi
+
+ AC_SUBST(WX_UNICODE)
+ AC_SUBST(WX_DEBUG)
+ AC_SUBST(WX_SHARED)
+
+ dnl detect the WX_PORT to use
+ if test "$TOOLKIT" = "auto" ; then
+
+ dnl The user does not have particular preferences for this option;
+ dnl so we will detect the wxWidgets relative build setting and use it
+ AC_MSG_CHECKING([which wxWidgets toolkit was selected])
+
+ WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
+ WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
+ WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
+ WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
+ WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
+ WX_OSXCARBONPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_carbon.*")
+ WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*")
+ WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*")
+ WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*")
+
+ WX_PORT="unknown"
+ if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
+ if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
+ if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
+ if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
+ if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
+ if test "$WX_OSXCARBONPORT" != "0"; then WX_PORT="osx_carbon"; fi
+ if test "$WX_X11PORT" != "0"; then WX_PORT="x11"; fi
+ if test "$WX_MGLPORT" != "0"; then WX_PORT="mgl"; fi
+ if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi
+
+ dnl NOTE: backward-compatible check for wx2.8; in wx2.9 the mac
+ dnl ports are called 'osx_cocoa' and 'osx_carbon' (see above)
+ WX_MACPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mac.*")
+ if test "$WX_MACPORT" != "0"; then WX_PORT="mac"; fi
+
+ dnl check at least one of the WX_*PORT has been set !
+
+ if test "$WX_PORT" = "unknown" ; then
+ AC_MSG_ERROR([
+ Cannot detect the currently installed wxWidgets port !
+ Please check your 'wx-config --cxxflags'...
+ ])
+ fi
+
+ AC_MSG_RESULT([$WX_PORT])
+ else
+
+ dnl Use the setting given by the user
+ if test -z "$TOOLKIT" ; then
+ WX_PORT=$TOOLKIT
+ else
+ dnl try with PORT
+ WX_PORT=$PORT
+ fi
+ fi
+
+ AC_SUBST(WX_PORT)
+
+ if test "$WX_DEBUG_CONFIGURE" = "1"; then
+ echo "[[dbg]] Values of all WX_* options after final detection:"
+ echo "[[dbg]] WX_DEBUG: $WX_DEBUG"
+ echo "[[dbg]] WX_UNICODE: $WX_UNICODE"
+ echo "[[dbg]] WX_SHARED: $WX_SHARED"
+ echo "[[dbg]] WX_RELEASE: $WX_RELEASE"
+ echo "[[dbg]] WX_PORT: $WX_PORT"
+ fi
+
+ dnl Avoid problem described in the WX_STANDARD_OPTIONS which happens when
+ dnl the user gives the options:
+ dnl ./configure --enable-shared --without-wxshared
+ dnl or just do
+ dnl ./configure --enable-shared
+ dnl but there is only a static build of wxWidgets available.
+ if test "$WX_SHARED" = "0" -a "$SHARED" = "1"; then
+ AC_MSG_ERROR([
+ Cannot build shared library against a static build of wxWidgets !
+ This error happens because the wxWidgets build which was selected
+ has been detected as static while you asked to build $PACKAGE_NAME
+ as shared library and this is not possible.
+ Use the '--disable-shared' option to build $PACKAGE_NAME
+ as static library or '--with-wxshared' to use wxWidgets as shared library.
+ ])
+ fi
+
+ dnl now we can finally update the DEBUG,UNICODE,SHARED options
+ dnl to their final values if they were set to 'auto'
+ if test "$DEBUG" = "auto"; then
+ DEBUG=$WX_DEBUG
+ fi
+ if test "$UNICODE" = "auto"; then
+ UNICODE=$WX_UNICODE
+ fi
+ if test "$SHARED" = "auto"; then
+ SHARED=$WX_SHARED
+ fi
+ if test "$TOOLKIT" = "auto"; then
+ TOOLKIT=$WX_PORT
+ fi
+
+ dnl in case the user needs a BUILD=debug/release var...
+ if test "$DEBUG" = "1"; then
+ BUILD="debug"
+ elif test "$DEBUG" = "0" -o "$DEBUG" = ""; then
+ BUILD="release"
+ fi
+
+ dnl respect the DEBUG variable adding the optimize/debug flags
+ dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we
+ dnl don't need to set them, too
+ if test "$DEBUG" = "1"; then
+ CXXFLAGS="$CXXFLAGS -g -O0"
+ CFLAGS="$CFLAGS -g -O0"
+ else
+ CXXFLAGS="$CXXFLAGS -O2"
+ CFLAGS="$CFLAGS -O2"
+ fi
+ ])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_BOOLOPT_SUMMARY([name of the boolean variable to show summary for],
+dnl [what to print when var is 1],
+dnl [what to print when var is 0])
+dnl
+dnl Prints $2 when variable $1 == 1 and prints $3 when variable $1 == 0.
+dnl This macro mainly exists just to make configure.ac scripts more readable.
+dnl
+dnl NOTE: you need to use the [" my message"] syntax for 2nd and 3rd arguments
+dnl if you want that m4 avoid to throw away the spaces prefixed to the
+dnl argument value.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_BOOLOPT_SUMMARY],
+ [
+ if test "x$$1" = "x1" ; then
+ echo $2
+ elif test "x$$1" = "x0" ; then
+ echo $3
+ else
+ echo "$1 is $$1"
+ fi
+ ])
+
+dnl ---------------------------------------------------------------------------
+dnl WX_STANDARD_OPTIONS_SUMMARY_MSG
+dnl
+dnl Shows a summary message to the user about the WX_* variable contents.
+dnl This macro is used typically at the end of the configure script.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG],
+ [
+ echo
+ echo " The wxWidgets build which will be used by $PACKAGE_NAME $PACKAGE_VERSION"
+ echo " has the following settings:"
+ WX_BOOLOPT_SUMMARY([WX_DEBUG], [" - DEBUG build"], [" - RELEASE build"])
+ WX_BOOLOPT_SUMMARY([WX_UNICODE], [" - UNICODE mode"], [" - ANSI mode"])
+ WX_BOOLOPT_SUMMARY([WX_SHARED], [" - SHARED mode"], [" - STATIC mode"])
+ echo " - VERSION: $WX_VERSION"
+ echo " - PORT: $WX_PORT"
+ ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN, WX_STANDARD_OPTIONS_SUMMARY_MSG_END
+dnl
+dnl Like WX_STANDARD_OPTIONS_SUMMARY_MSG macro but these two macros also gives info
+dnl about the configuration of the package which used the wxpresets.
+dnl
+dnl Typical usage:
+dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN
+dnl echo " - Package setting 1: $SETTING1"
+dnl echo " - Package setting 2: $SETTING1"
+dnl ...
+dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_END
+dnl
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN],
+ [
+ echo
+ echo " ----------------------------------------------------------------"
+ echo " Configuration for $PACKAGE_NAME $PACKAGE_VERSION successfully completed."
+ echo " Summary of main configuration settings for $PACKAGE_NAME:"
+ WX_BOOLOPT_SUMMARY([DEBUG], [" - DEBUG build"], [" - RELEASE build"])
+ WX_BOOLOPT_SUMMARY([UNICODE], [" - UNICODE mode"], [" - ANSI mode"])
+ WX_BOOLOPT_SUMMARY([SHARED], [" - SHARED mode"], [" - STATIC mode"])
+ ])
+
+AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG_END],
+ [
+ WX_STANDARD_OPTIONS_SUMMARY_MSG
+ echo
+ echo " Now, just run make."
+ echo " ----------------------------------------------------------------"
+ echo
+ ])
+
+
+dnl ---------------------------------------------------------------------------
+dnl Deprecated macro wrappers
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN([AM_OPTIONS_WXCONFIG], [WX_CONFIG_OPTIONS])
+AC_DEFUN([AM_PATH_WXCONFIG], [
+ WX_CONFIG_CHECK([$1],[$2],[$3],[$4],[$5])
+])
+
+
Modified: trunk/wxdevcenter/configure
===================================================================
--- trunk/wxdevcenter/configure 2010-05-13 17:29:05 UTC (rev 69)
+++ trunk/wxdevcenter/configure 2010-05-13 20:00:42 UTC (rev 70)
@@ -750,6 +750,9 @@
LIBWXDEVCENTER_DEP_LIBS
LIBWXDEVCENTER_DEP_CFLAGS
PKG_CONFIG
+WX_VERSION_MICRO
+WX_VERSION_MINOR
+WX_VERSION_MAJOR
WX_RESCOMP
WX_VERSION
WX_LIBS_STATIC
@@ -5840,13 +5843,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5843: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5846: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5846: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5849: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5849: output\"" >&5)
+ (eval echo "\"\$as_me:5852: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -7051,7 +7054,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7054 "configure"' > conftest.$ac_ext
+ echo '#line 7057 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8727,11 +8730,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8730: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8733: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8734: \$? = $ac_status" >&5
+ echo "$as_me:8737: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9066,11 +9069,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9069: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9072: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9073: \$? = $ac_status" >&5
+ echo "$as_me:9076: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9171,11 +9174,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9174: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9177: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9178: \$? = $ac_status" >&5
+ echo "$as_me:9181: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9226,11 +9229,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9229: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9232: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9233: \$? = $ac_status" >&5
+ echo "$as_me:9236: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11606,7 +11609,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11609 "configure"
+#line 11612 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11702,7 +11705,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11705 "configure"
+#line 11708 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13658,11 +13661,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13661: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13664: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13665: \$? = $ac_status" >&5
+ echo "$as_me:13668: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings ...
[truncated message content] |
|
From: <cur...@us...> - 2010-05-13 18:10:43
|
Revision: 69
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=69&view=rev
Author: cursorstar
Date: 2010-05-13 17:29:05 +0000 (Thu, 13 May 2010)
Log Message:
-----------
Move plugin generation to plugin subdir.
Modified Paths:
--------------
trunk/wxdevcenter/Makefile.in
trunk/wxdevcenter/build/bakefiles/.bakefile_gen.state
trunk/wxdevcenter/build/bakefiles/plugins.bkl
trunk/wxdevcenter/config.sub
trunk/wxdevcenter/configure
trunk/wxdevcenter/src/sys/config.cpp
Modified: trunk/wxdevcenter/Makefile.in
===================================================================
--- trunk/wxdevcenter/Makefile.in 2010-05-13 16:34:21 UTC (rev 68)
+++ trunk/wxdevcenter/Makefile.in 2010-05-13 17:29:05 UTC (rev 69)
@@ -99,7 +99,7 @@
### Targets: ###
-all: $(DLLPREFIX)libwxdevcenter.$(SO_SUFFIX) wxdevcenter$(EXEEXT) plugins/text/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE) plugins/bitmap/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE)
+all: $(DLLPREFIX)libwxdevcenter.$(SO_SUFFIX) wxdevcenter$(EXEEXT) plugins/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE) plugins/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE)
install:
@@ -113,8 +113,8 @@
rm -f $(DLLPREFIX)libwxdevcenter.$(SO_SUFFIX)
rm -f $(LIBPREFIX)libwxdevcenter.$(DLLIMP_SUFFIX)
rm -f wxdevcenter$(EXEEXT)
- rm -f plugins/text/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE)
- rm -f plugins/bitmap/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE)
+ rm -f plugins/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE)
+ rm -f plugins/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE)
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@@ -128,10 +128,10 @@
$(__wxdevcenter___mac_setfilecmd)
$(__wxdevcenter___os2_emxbindcmd)
-plugins/text/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE): $(DCTEXT_OBJECTS)
+plugins/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE): $(DCTEXT_OBJECTS)
$(SHARED_LD_MODULE_CXX) $@ $(DCTEXT_OBJECTS) $(LDFLAGS) $(LIBS)
-plugins/bitmap/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE): $(DCBITMAP_OBJECTS)
+plugins/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE): $(DCBITMAP_OBJECTS)
$(SHARED_LD_MODULE_CXX) $@ $(DCBITMAP_OBJECTS) $(LDFLAGS) $(LIBS)
libwxdevcenter_action.o: $(srcdir)/src/sys/action.cpp
Modified: trunk/wxdevcenter/build/bakefiles/.bakefile_gen.state
===================================================================
--- trunk/wxdevcenter/build/bakefiles/.bakefile_gen.state 2010-05-13 16:34:21 UTC (rev 68)
+++ trunk/wxdevcenter/build/bakefiles/.bakefile_gen.state 2010-05-13 17:29:05 UTC (rev 69)
@@ -1,13 +1,13 @@
-K.}q((UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklUmingwtq(cdependencies
+K.}q((UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklU msvs2003prjtq(cdependencies
DepsRecord
-qoq}q(Uoutputsq]q(U8/home/mimile/Projects/wxdevcenter/build/msw/makefile.gccUreplacetqaUdepsq ]q
+qoq}q(Uoutputsq]q((UE/home/mimile/Projects/wxdevcenter/build/msw/wx_vc7_wxdevcenter.vcprojUreplaceqtq (U6/home/mimile/Projects/wxdevcenter/build/msw/wx_vc7.slnhtq
+(UH/home/mimile/Projects/wxdevcenter/build/msw/wx_vc7_libwxdevcenter.vcprojhtq eUdepsq ]q
((cdependencies
FileDep
-q oq }q
-UfilenameqU$/usr/share/bakefile/rules/common.bklqsb(h oq}qhU%/usr/share/bakefile/rules/version.bklqsb(h oq}qhU"/usr/share/bakefile/rules/dirs.bklqsb(h oq}qhU-/usr/share/bakefile/rules/format_features.bklqsb(h oq}qhU#/usr/share/bakefile/rules/mingw.bklqsb(h oq }q hU&/usr/share/bakefile/rules/makefile.bklq sb(h oq }q hU1/usr/share/bakefile/rules/makefile_defs_mingw.bklq!sb(h oq"}q#hU#/usr/share/bakefile/rules/win32.bklq$sb(h oq%}q&hU//usr/share/bakefile/rules/makefile_defs_gnu.bklq'sb(h oq(}q)hU,/usr/share/bakefile/rules/makefile_mingw.bklq*sb(h oq+}q,hU@/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx.bklq-sb(h oq.}q/hUG/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_presets.pyq0sb(h oq1}q2hUF/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_win32.bklq3sb(h oq4}q5hUD/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_xrc.bklq6sb(h oq7}q8hU</home/mimile/Projects/wxdevcenter/build/bakefiles/config.bklq9sb(h oq:}q;hU'/usr/share/bakefile/output/gnumake.empyq<sbeub(UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklU msvs2005prjtq=(hoq>}q?(Uoutputsq@]qA((U6/home/mimile/Projects/wxdevcenter/build/msw/wx_vc8.slnUreplaceqBtqC(UH/home/mimile/Projects/wxdevcenter/build/msw/wx_vc8_libwxdevcenter.vcprojhBtqD(UE/home/mimile/Projects/wxdevcenter/build/msw/wx_vc8_wxdevcenter.vcprojhBtqEeUdepsqF]qG((h oqH}qIUfilenameqJU$/usr/share/bakefile/rules/common.bklqKsb(h oqL}qMhJU%/usr/share/bakefile/rules/version.bklqNsb(h oqO}qPhJU"/usr/share/bakefile/rules/dirs.bklqQsb(h oqR}qShJU-/usr/share/bakefile/rules/format_features.bklqTsb(h oqU}qVhJU)/usr/share/bakefile/rules/msvs2005prj.bklqWsb(h oqX}qYhJU)/usr/share/bakefile/rules/msvs200xprj.bklqZsb(h oq[}q\hJU4/usr/share/bakefile/rules/msvc_prj_vcproj_common.bklq]sb(h oq^}q_hJU-/usr/share/bakefile/rules/msvc_prj_common.bklq`sb(h oqa}qbhJU#/usr/share/bakefile/rules/win32.bklqcsb(h oqd}qehJU@/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx.bklqfsb(h oqg}qhhJUG/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_presets.pyqisb(h oqj}qkhJUF/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_win32.bklqlsb(h oqm}qnhJUD/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_xrc.bklqosb(h oqp}qqhJU</home/mimile/Projects/wxdevcenter/build/bakefiles/config.bklqrsb(h oqs}qthJU)/usr/share/bakefile/output/msvs200xprj.pyqusbeub(UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklU msvs2003prjtqv(hoqw}qx(Uoutputsqy]qz((UE/home/mimile/Projects/wxdevcenter/build/msw/wx_vc7_wxdevcenter.vcprojUreplaceq{tq|(U6/home/mimile/Projects/wxdevcenter/build/msw/wx_vc7.slnh{tq}(UH/home/mimile/Projects/wxdevcenter/build/msw/wx_vc7_libwxdevcenter.vcprojh{tq~eUdepsq]q\x80((h oq\x81}q\x82Ufilenameq\x83U$/usr/share/bakefile/rules/common.bklq\x84sb(h oq\x85}q\x86h\x83U%/usr/share/bakefile/rules/version.bklq\x87sb(h oq\x88}q\x89h\x83U"/usr/share/bakefile/rules/dirs.bklq\x8Asb(h oq\x8B}q\x8Ch\x83U-/usr/share/bakefile/rules/format_features.bklq\x8Dsb(h oq\x8E}q\x8Fh\x83U)/usr/share/bakefile/rules/msvs2003prj.bklq\x90sb(h oq\x91}q\x92h\x83U)/usr/share/bakefile/rules/msvs200xprj.bklq\x93sb(h oq\x94}q\x95h\x83U4/usr/share/bakefile/rules/msvc_prj_vcproj_common.bklq\x96sb(h oq\x97}q\x98h\x83U-/usr/share/bakefile/rules/msvc_prj_common.bklq\x99sb(h oq\x9A}q\x9Bh\x83U#/usr/share/bakefile/rules/win32.bklq\x9Csb(h oq\x9D}q\x9Eh\x83U@/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx.bklq\x9Fsb(h oq\xA0}q\xA1h\x83UG/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_presets.pyq\xA2sb(h oq\xA3}q\xA4h\x83UF/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_win32.bklq\xA5sb(h oq\xA6}q\xA7h\x83UD/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_xrc.bklq\xA8sb(h oq\xA9}q\xAAh\x83U</home/mimile/Projects/wxdevcenter/build/bakefiles/config.bklq\xABsb(h oq\xAC}q\xADh\x83U)/usr/share/bakefile/output/msvs200xprj.pyq\xAEsbeub(UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklUmsvctq\xAF(hoq\xB0}q\xB1(Uoutputsq\xB2]q\xB3(U7/home/mimile/Projects/wxdevcenter/build/msw/makefile.vcUreplacetq\xB4aUdepsq\xB5]q\xB6((h oq\xB7}q\xB8Ufilenameq\xB9U$/usr/share/bakefile/rules/common.bklq\xBAsb(h oq\xBB}q\xBCh\xB9U%/usr/share/bakefile/rules/version.bklq\xBDsb(h oq\xBE}q\xBFh\xB9U"/usr/share/bakefile/rules/dirs.bklq\xC0sb(h oq\xC1}q\xC2h\xB9U-/usr/share/bakefile/rules/format_features.bklq\xC3sb(h oq\xC4}q\xC5h\xB9U"/usr/share/bakefile/rules/msvc.bklq\xC6sb(h oq\xC7}q\xC8h\xB9U&/usr/share/bakefile/rules/makefile.bklq\xC9sb(h oq\xCA}q\xCBh\xB9U0/usr/share/bakefile/rules/makefile_defs_msvc.bklq\xCCsb(h oq\xCD}q\xCEh\xB9U#/usr/share/bakefile/rules/win32.bklq\xCFsb(h oq\xD0}q\xD1h\xB9U)/usr/share/bakefile/rules/msvc_common.bklq\xD2sb(h oq\xD3}q\xD4h\xB9U@/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx.bklq\xD5sb(h oq\xD6}q\xD7h\xB9UG/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_presets.pyq\xD8sb(h oq\xD9}q\xDAh\xB9UF/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_win32.bklq\xDBsb(h oq\xDC}q\xDDh\xB9UD/home/mimile/Projects/wxdevcenter/build/bakefiles/presets/wx_xrc.bklq\xDEsb(h oq\xDF}q\xE0h\xB9U</home/mimile/Projects/wxdevcenter/build/bakefiles/config.bklq\xE1sb(h oq\xE2}q\xE3h\xB9U$/usr/share/bakefile/output/msvc.empyq\xE4sbeub(UA/home/mimile/Projects/wxdevcenter/build/bakefiles/wxdevcenter.bklUautoconftq\xE5(hoq\xE6}q\xE7(Uoutputsq\xE8]q\xE9((U1/home/mimile/Projects/wxdevcenter/autoconf_inc.m4UmergeBlocksWithFilelisttq\xEA(U-/home/mimile/Projects/wxdevcenter/Makefile.inUreplacetq\xEBeUdepsq\xEC]q\xED((h oq\xEE}q\xEFUfilenameq\xF0U$/usr/share/bakefile/rules/common.bklq\xF1sb(h oq\xF2}q\xF3h\xF0U%/usr/share/bakefile/rules/version.bklq\xF4sb(h oq\xF5}q\xF6h\xF0U"/usr/share/bakefile/rules/dirs.bklq\xF7sb(h oq\xF8}q\xF9h\xF0U-/usr/share/bakefile/rules/format_features.bklq\xFAsb(h oq\xFB}q\xFCh\xF0U&/usr/share/bakefile/rules/autoconf.bklq\xFDsb(h oq\xFE}q\xFFh\xF0U-/usr/share/bakefile/rules/makefile_macres.bklr |
|
From: <cur...@us...> - 2010-05-13 16:34:29
|
Revision: 68
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=68&view=rev
Author: cursorstar
Date: 2010-05-13 16:34:21 +0000 (Thu, 13 May 2010)
Log Message:
-----------
Begin to use bakefile+autoconf instead of automake/autoconf.
Modified Paths:
--------------
trunk/wxdevcenter/Makefile.in
trunk/wxdevcenter/aclocal.m4
trunk/wxdevcenter/configure
trunk/wxdevcenter/configure.ac
trunk/wxdevcenter/src/tools/Makefile
Added Paths:
-----------
trunk/wxdevcenter/autoconf_inc.m4
trunk/wxdevcenter/build/
trunk/wxdevcenter/build/bakefiles/
trunk/wxdevcenter/build/bakefiles/.bakefile_gen.state
trunk/wxdevcenter/build/bakefiles/Bakefiles.bkgen
trunk/wxdevcenter/build/bakefiles/config.bkl
trunk/wxdevcenter/build/bakefiles/plugins.bkl
trunk/wxdevcenter/build/bakefiles/presets/
trunk/wxdevcenter/build/bakefiles/presets/wx.bkl
trunk/wxdevcenter/build/bakefiles/presets/wx_presets.py
trunk/wxdevcenter/build/bakefiles/presets/wx_unix.bkl
trunk/wxdevcenter/build/bakefiles/presets/wx_win32.bkl
trunk/wxdevcenter/build/bakefiles/presets/wx_xrc.bkl
trunk/wxdevcenter/build/bakefiles/wxdevcenter.bkl
Removed Paths:
-------------
trunk/wxdevcenter/Makefile.am
trunk/wxdevcenter/plugins/Makefile.am
trunk/wxdevcenter/plugins/Makefile.in
trunk/wxdevcenter/plugins/bitmap/Makefile.am
trunk/wxdevcenter/plugins/bitmap/Makefile.in
trunk/wxdevcenter/plugins/text/Makefile.am
trunk/wxdevcenter/plugins/text/Makefile.in
trunk/wxdevcenter/share/Makefile.am
trunk/wxdevcenter/share/Makefile.in
trunk/wxdevcenter/share/xrc/Makefile.am
trunk/wxdevcenter/share/xrc/Makefile.in
trunk/wxdevcenter/src/Makefile.am
trunk/wxdevcenter/src/Makefile.in
trunk/wxdevcenter/src/docview/Makefile.am
trunk/wxdevcenter/src/docview/Makefile.in
trunk/wxdevcenter/src/sys/Makefile.am
trunk/wxdevcenter/src/sys/Makefile.in
trunk/wxdevcenter/src/tools/Makefile.am
trunk/wxdevcenter/src/tools/Makefile.in
trunk/wxdevcenter/src/ui/Makefile.am
trunk/wxdevcenter/src/ui/Makefile.in
trunk/wxdevcenter/src/ui/dialog/Makefile.am
trunk/wxdevcenter/src/ui/dialog/Makefile.in
trunk/wxdevcenter/src/uistd/Makefile.am
trunk/wxdevcenter/src/uistd/Makefile.in
Deleted: trunk/wxdevcenter/Makefile.am
===================================================================
--- trunk/wxdevcenter/Makefile.am 2010-05-11 18:16:28 UTC (rev 67)
+++ trunk/wxdevcenter/Makefile.am 2010-05-13 16:34:21 UTC (rev 68)
@@ -1,30 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Created by Anjuta
-
-SUBDIRS = . src po share plugins
-
-wxdevcenterdocdir = ${prefix}/doc/wxdevcenter
-wxdevcenterdoc_DATA = \
- README\
- COPYING\
- AUTHORS\
- ChangeLog\
- INSTALL\
- NEWS
-
-EXTRA_DIST = $(wxdevcenterdoc_DATA)
-
-# Copy all the spec files. Of cource, only one is actually used.
-dist-hook:
- for specfile in *.spec; do \
- if test -f $$specfile; then \
- cp -p $$specfile $(distdir); \
- fi \
- done
-
-
-# overide default process to create pch
-#all-local: src/wxdevcenter.hpp.gch
-
-#src/wxdevcenter.hpp.gch:
-# cd src && $(MAKE) $(AM_MAKEFLAGS) wxdevcenter.hpp.gch
Modified: trunk/wxdevcenter/Makefile.in
===================================================================
--- trunk/wxdevcenter/Makefile.in 2010-05-11 18:16:28 UTC (rev 67)
+++ trunk/wxdevcenter/Makefile.in 2010-05-13 16:34:21 UTC (rev 68)
@@ -1,764 +1,234 @@
-# Makefile.in generated by automake 1.10.3 from Makefile.am.
-# @configure_input@
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.8 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
+@MAKE_SET@
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- config.guess config.sub depcomp install-sh ltmain.sh missing \
- mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(wxdevcenterdocdir)"
-wxdevcenterdocDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(wxdevcenterdoc_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+INSTALL = @INSTALL@
+SHARED_LD_CXX = @SHARED_LD_CXX@
+SHARED_LD_MODULE_CXX = @SHARED_LD_MODULE_CXX@
+LIBPREFIX = @LIBPREFIX@
+SO_SUFFIX = @SO_SUFFIX@
+SO_SUFFIX_MODULE = @SO_SUFFIX_MODULE@
+DLLIMP_SUFFIX = @DLLIMP_SUFFIX@
+EXEEXT = @EXEEXT@
+SETFILE = @SETFILE@
+PIC_FLAG = @PIC_FLAG@
+NM = @NM@
+BK_DEPS = @BK_DEPS@
+srcdir = @srcdir@
+DLLPREFIX = @DLLPREFIX@
+DLLPREFIX_MODULE = @DLLPREFIX_MODULE@
+LIBS = @LIBS@
+LDFLAGS_GUI = @LDFLAGS_GUI@
CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-LD = @LD@
+CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PLUGIN_DATADIR = @PLUGIN_DATADIR@
-PLUGIN_LIBDIR = @PLUGIN_LIBDIR@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WXDEVCENTER_CFLAGS = @WXDEVCENTER_CFLAGS@
-WXDEVCENTER_LIBS = @WXDEVCENTER_LIBS@
-WX_CPPFLAGS = @WX_CPPFLAGS@
WX_CXXFLAGS = @WX_CXXFLAGS@
WX_LIBS = @WX_LIBS@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = . src po share plugins
-wxdevcenterdocdir = ${prefix}/doc/wxdevcenter
-wxdevcenterdoc_DATA = \
- README\
- COPYING\
- AUTHORS\
- ChangeLog\
- INSTALL\
- NEWS
+LIBWXDEVCENTER_DEP_CFLAGS = @LIBWXDEVCENTER_DEP_CFLAGS@
+LIBWXDEVCENTER_DEP_LIBS = @LIBWXDEVCENTER_DEP_LIBS@
-EXTRA_DIST = $(wxdevcenterdoc_DATA)
-all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+### Variables: ###
-.SUFFIXES:
-am--refresh:
- @:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
- cd $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- esac;
+DESTDIR =
+LIBWXDEVCENTER_CXXFLAGS = -Isrc $(LIBWXDEVCENTER_DEP_CFLAGS) $(PIC_FLAG) \
+ $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+LIBWXDEVCENTER_OBJECTS = \
+ libwxdevcenter_action.o \
+ libwxdevcenter_manager.o \
+ libwxdevcenter_plugin.o \
+ libwxdevcenter_config.o \
+ libwxdevcenter_task.o \
+ libwxdevcenter_bookmark.o \
+ libwxdevcenter_search.o \
+ libwxdevcenter_bitvector.o \
+ libwxdevcenter_document.o \
+ libwxdevcenter_view.o \
+ libwxdevcenter_project.o \
+ libwxdevcenter_workspace.o \
+ libwxdevcenter_newdocument.o \
+ libwxdevcenter_opendocument.o \
+ libwxdevcenter_frame.o \
+ libwxdevcenter_perspective.o \
+ libwxdevcenter_workbar.o \
+ libwxdevcenter_configui.o \
+ libwxdevcenter_art.o
+WXDEVCENTER_CXXFLAGS = -Isrc $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+WXDEVCENTER_OBJECTS = \
+ wxdevcenter_fsworkbar.o \
+ wxdevcenter_stdconfig.o \
+ wxdevcenter_stdframe.o \
+ wxdevcenter_application.o
+DCTEXT_CXXFLAGS = -Isrc $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+DCTEXT_OBJECTS = \
+ dctext_editctrl.o \
+ dctext_text.o \
+ dctext_view.o \
+ dctext_prefs.o \
+ dctext_bookmark.o \
+ dctext_markbar.o \
+ dctext_text_search.o
+DCBITMAP_CXXFLAGS = -Isrc $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+DCBITMAP_OBJECTS = \
+ dcbitmap_bitmap.o
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
+### Conditionally set variables: ###
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
+@COND_PLATFORM_OS2_1@__libwxdevcenter___importlib = \
+@COND_PLATFORM_OS2_1@ -import $(LIBPREFIX)libwxdevcenter.$(DLLIMP_SUFFIX)
+@COND_WINDOWS_IMPLIB_1@__libwxdevcenter___importlib \
+@COND_WINDOWS_IMPLIB_1@ = \
+@COND_WINDOWS_IMPLIB_1@ -Wl,--out-implib=$(LIBPREFIX)libwxdevcenter.$(DLLIMP_SUFFIX)
+@COND_PLATFORM_MAC_0@__wxdevcenter___mac_setfilecmd = @true
+@COND_PLATFORM_MAC_1@__wxdevcenter___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL wxdevcenter$(EXEEXT)
+COND_PLATFORM_OS2_1___wxdevcenter___os2_emxbindcmd = $(NM) \
+ wxdevcenter$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \
+ wxdevcenter$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__wxdevcenter___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___wxdevcenter___os2_emxbindcmd)
-config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
+### Targets: ###
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
+all: $(DLLPREFIX)libwxdevcenter.$(SO_SUFFIX) wxdevcenter$(EXEEXT) plugins/text/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE) plugins/bitmap/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE)
-distclean-hdr:
- -rm -f config.h stamp-h1
+install:
-mostlyclean-libtool:
- -rm -f *.lo
+uninstall:
-clean-libtool:
- -rm -rf .libs _libs
+install-strip: install
-distclean-libtool:
- -rm -f libtool config.lt
-install-wxdevcenterdocDATA: $(wxdevcenterdoc_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(wxdevcenterdocdir)" || $(MKDIR_P) "$(DESTDIR)$(wxdevcenterdocdir)"
- @list='$(wxdevcenterdoc_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(wxdevcenterdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(wxdevcenterdocdir)/$$f'"; \
- $(wxdevcenterdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(wxdevcenterdocdir)/$$f"; \
- done
+clean:
+ rm -rf ./.deps ./.pch
+ rm -f ./*.o
+ rm -f $(DLLPREFIX)libwxdevcenter.$(SO_SUFFIX)
+ rm -f $(LIBPREFIX)libwxdevcenter.$(DLLIMP_SUFFIX)
+ rm -f wxdevcenter$(EXEEXT)
+ rm -f plugins/text/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE)
+ rm -f plugins/bitmap/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE)
-uninstall-wxdevcenterdocDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(wxdevcenterdoc_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(wxdevcenterdocdir)/$$f'"; \
- rm -f "$(DESTDIR)$(wxdevcenterdocdir)/$$f"; \
- done
+distclean: clean
+ rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
+$(DLLPREFIX)libwxdevcenter.$(SO_SUFFIX): $(LIBWXDEVCENTER_OBJECTS)
+ $(SHARED_LD_CXX) $@ $(LIBWXDEVCENTER_OBJECTS) $(__libwxdevcenter___importlib) $(LDFLAGS) $(LIBWXDEVCENTER_DEP_LIBS) $(LIBS)
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+wxdevcenter$(EXEEXT): $(WXDEVCENTER_OBJECTS) $(DLLPREFIX)libwxdevcenter.$(SO_SUFFIX) $(DLLPREFIX)libwxdevcenter.$(SO_SUFFIX)
+ $(CXX) -o $@ $(WXDEVCENTER_OBJECTS) -L. $(LDFLAGS_GUI) $(LDFLAGS) -llibwxdevcenter $(WX_LIBS) $(LIBS)
+
+ $(__wxdevcenter___mac_setfilecmd)
+ $(__wxdevcenter___os2_emxbindcmd)
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
+plugins/text/$(DLLPREFIX_MODULE)dctext.$(SO_SUFFIX_MODULE): $(DCTEXT_OBJECTS)
+ $(SHARED_LD_MODULE_CXX) $@ $(DCTEXT_OBJECTS) $(LDFLAGS) $(LIBS)
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+plugins/bitmap/$(DLLPREFIX_MODULE)dcbitmap.$(SO_SUFFIX_MODULE): $(DCBITMAP_OBJECTS)
+ $(SHARED_LD_MODULE_CXX) $@ $(DCBITMAP_OBJECTS) $(LDFLAGS) $(LIBS)
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+libwxdevcenter_action.o: $(srcdir)/src/sys/action.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/sys/action.cpp
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+libwxdevcenter_manager.o: $(srcdir)/src/sys/manager.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/sys/manager.cpp
-distdir: $(DISTFILES)
- $(am__remove_distdir)
- test -d $(distdir) || mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
- done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
- -find "$(distdir)" -type d ! -perm -755 \
- -exec chmod u+rwx,go+rx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
-dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+libwxdevcenter_plugin.o: $(srcdir)/src/sys/plugin.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/sys/plugin.cpp
-dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+libwxdevcenter_config.o: $(srcdir)/src/sys/config.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/sys/config.cpp
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
+libwxdevcenter_task.o: $(srcdir)/src/sys/task.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/sys/task.cpp
-dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
+libwxdevcenter_bookmark.o: $(srcdir)/src/sys/bookmark.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/sys/bookmark.cpp
-dist-shar: distdir
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
+libwxdevcenter_search.o: $(srcdir)/src/sys/search.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/sys/search.cpp
-dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
+libwxdevcenter_bitvector.o: $(srcdir)/src/tools/bitvector.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/tools/bitvector.cpp
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+libwxdevcenter_document.o: $(srcdir)/src/docview/document.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/docview/document.cpp
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
- chmod a-w $(distdir)
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
- $(DISTCHECK_CONFIGURE_FLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
- echo " (check DESTDIR support)"; \
- fi ; \
- $(distuninstallcheck_listfiles) ; \
- exit 1; } >&2
-distcleancheck: distclean
- @if test '$(srcdir)' = . ; then \
- echo "ERROR: distcleancheck can only run from a VPATH build" ; \
- exit 1 ; \
- fi
- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left in build directory after distclean:" ; \
- $(distcleancheck_listfiles) ; \
- exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA) config.h
-installdirs: installdirs-recursive
-installdirs-am:
- for dir in "$(DESTDIR)$(wxdevcenterdocdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+libwxdevcenter_view.o: $(srcdir)/src/docview/view.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/docview/view.cpp
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+libwxdevcenter_project.o: $(srcdir)/src/docview/project.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/docview/project.cpp
-installcheck: installcheck-recursive
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
+libwxdevcenter_workspace.o: $(srcdir)/src/docview/workspace.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/docview/workspace.cpp
-clean-generic:
+libwxdevcenter_newdocument.o: $(srcdir)/src/ui/dialog/newdocument.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/ui/dialog/newdocument.cpp
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+libwxdevcenter_opendocument.o: $(srcdir)/src/ui/dialog/opendocument.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/ui/dialog/opendocument.cpp
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
+libwxdevcenter_frame.o: $(srcdir)/src/ui/frame.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/ui/frame.cpp
-clean-am: clean-generic clean-libtool mostlyclean-am
+libwxdevcenter_perspective.o: $(srcdir)/src/ui/perspective.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/ui/perspective.cpp
-distclean: distclean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
- distclean-libtool distclean-tags
+libwxdevcenter_workbar.o: $(srcdir)/src/ui/workbar.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/ui/workbar.cpp
-dvi: dvi-recursive
+libwxdevcenter_configui.o: $(srcdir)/src/ui/configui.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/ui/configui.cpp
-dvi-am:
+libwxdevcenter_art.o: $(srcdir)/src/ui/art.cpp
+ $(CXXC) -c -o $@ $(LIBWXDEVCENTER_CXXFLAGS) $(srcdir)/src/ui/art.cpp
-html: html-recursive
+wxdevcenter_fsworkbar.o: $(srcdir)/src/uistd/fsworkbar.cpp
+ $(CXXC) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(srcdir)/src/uistd/fsworkbar.cpp
-html-am:
+wxdevcenter_stdconfig.o: $(srcdir)/src/uistd/stdconfig.cpp
+ $(CXXC) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(srcdir)/src/uistd/stdconfig.cpp
-info: info-recursive
+wxdevcenter_stdframe.o: $(srcdir)/src/uistd/stdframe.cpp
+ $(CXXC) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(srcdir)/src/uistd/stdframe.cpp
-info-am:
+wxdevcenter_application.o: $(srcdir)/src/application.cpp
+ $(CXXC) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(srcdir)/src/application.cpp
-install-data-am: install-wxdevcenterdocDATA
+dctext_editctrl.o: $(srcdir)/plugins/text/editctrl.cpp
+ $(CXXC) -c -o $@ $(DCTEXT_CXXFLAGS) $(srcdir)/plugins/text/editctrl.cpp
-install-dvi: install-dvi-recursive
+dctext_text.o: $(srcdir)/plugins/text/text.cpp
+ $(CXXC) -c -o $@ $(DCTEXT_CXXFLAGS) $(srcdir)/plugins/text/text.cpp
-install-dvi-am:
+dctext_view.o: $(srcdir)/plugins/text/view.cpp
+ $(CXXC) -c -o $@ $(DCTEXT_CXXFLAGS) $(srcdir)/plugins/text/view.cpp
-install-exec-am:
+dctext_prefs.o: $(srcdir)/plugins/text/prefs.cpp
+ $(CXXC) -c -o $@ $(DCTEXT_CXXFLAGS) $(srcdir)/plugins/text/prefs.cpp
-install-html: install-html-recursive
+dctext_bookmark.o: $(srcdir)/plugins/text/bookmark.cpp
+ $(CXXC) -c -o $@ $(DCTEXT_CXXFLAGS) $(srcdir)/plugins/text/bookmark.cpp
-install-html-am:
+dctext_markbar.o: $(srcdir)/plugins/text/markbar.cpp
+ $(CXXC) -c -o $@ $(DCTEXT_CXXFLAGS) $(srcdir)/plugins/text/markbar.cpp
-install-info: install-info-recursive
+dctext_text_search.o: $(srcdir)/plugins/text/text-search.cpp
+ $(CXXC) -c -o $@ $(DCTEXT_CXXFLAGS) $(srcdir)/plugins/text/text-search.cpp
-install-info-am:
+dcbitmap_bitmap.o: $(srcdir)/plugins/bitmap/bitmap.cpp
+ $(CXXC) -c -o $@ $(DCBITMAP_CXXFLAGS) $(srcdir)/plugins/bitmap/bitmap.cpp
-install-man:
-install-pdf: install-pdf-recursive
+# Include dependency info, if present:
+@IF_GNU_MAKE@-include ./.deps/*.d
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf $(top_srcdir)/autom4te.cache
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-wxdevcenterdocDATA
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
- distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip install-wxdevcenterdocDATA installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-wxdevcenterdocDATA
-
-
-# Copy all the spec files. Of cource, only one is actually used.
-dist-hook:
- for specfile in *.spec; do \
- if test -f $$specfile; then \
- cp -p $$specfile $(distdir); \
- fi \
- done
-
-# overide default process to create pch
-#all-local: src/wxdevcenter.hpp.gch
-
-#src/wxdevcenter.hpp.gch:
-# cd src && $(MAKE) $(AM_MAKEFLAGS) wxdevcenter.hpp.gch
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
+.PHONY: all install uninstall clean distclean
Modified: trunk/wxdevcenter/aclocal.m4
===================================================================
--- trunk/wxdevcenter/aclocal.m4 2010-05-11 18:16:28 UTC (rev 67)
+++ trunk/wxdevcenter/aclocal.m4 2010-05-13 16:34:21 UTC (rev 68)
@@ -11,14 +11,1984 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+AC_DEFUN([AC_BAKEFILE_CREATE_FILE_DLLAR_SH],
+[
+dnl ===================== dllar.sh begins here =====================
+dnl (Created by merge-scripts.py from dllar.sh
+dnl file do not edit here!)
+D='$'
+cat <<EOF >dllar.sh
+#!/bin/sh
+#
+# dllar - a tool to build both a .dll and an .a file
+# from a set of object (.o) files for EMX/OS2.
+#
+# Written by Andrew Zabolotny, bi...@fr...
+# Ported to Unix like shell by Stefan Neis, Ste...@t-...
+#
+# This script will accept a set of files on the command line.
+# All the public symbols from the .o files will be exported into
+# a .DEF file, then linker will be run (through gcc) against them to
+# build a shared library consisting of all given .o files. All libraries
+# (.a) will be first decompressed into component .o files then act as
+# described above. You can optionally give a description (-d "description")
+# which will be put into .DLL. To see the list of accepted options (as well
+# as command-line format) simply run this program without options. The .DLL
+# is built to be imported by name (there is no guarantee that new versions
+# of the library you build will have same ordinals for same symbols).
+#
+# dllar is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# dllar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with dllar; see the file COPYING. If not, write to the Free
+# Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+# To successfuly run this program you will need:
+# - Current drive should have LFN support (HPFS, ext2, network, etc)
+# (Sometimes dllar generates filenames which won't fit 8.3 scheme)
+# - gcc
+# (used to build the .dll)
+# - emxexp
+# (used to create .def file from .o files)
+# - emximp
+# (used to create .a file from .def file)
+# - GNU text utilites (cat, sort, uniq)
+# used to process emxexp output
+# - GNU file utilities (mv, rm)
+# - GNU sed
+# - lxlite (optional, see flag below)
+# (used for general .dll cleanup)
+#
+
+flag_USE_LXLITE=1;
+
+#
+# helper functions
+# basnam, variant of basename, which does _not_ remove the path, _iff_
+# second argument (suffix to remove) is given
+basnam(){
+ case ${D}# in
+ 1)
+ echo ${D}1 | sed 's/.*\\///' | sed 's/.*\\\\//'
+ ;;
+ 2)
+ echo ${D}1 | sed 's/'${D}2'${D}//'
+ ;;
+ *)
+ echo "error in basnam ${D}*"
+ exit 8
+ ;;
+ esac
+}
+
+# Cleanup temporary files and output
+CleanUp() {
+ cd ${D}curDir
+ for i in ${D}inputFiles ; do
+ case ${D}i in
+ *!)
+ rm -rf \`basnam ${D}i !\`
+ ;;
+ *)
+ ;;
+ esac
+ done
+
+ # Kill result in case of failure as there is just to many stupid make/nmake
+ # things out there which doesn't do this.
+ if @<:@ ${D}# -eq 0 @:>@; then
+ rm -f ${D}arcFile ${D}arcFile2 ${D}defFile ${D}dllFile
+ fi
+}
+
+# Print usage and exit script with rc=1.
+PrintHelp() {
+ echo 'Usage: dllar.sh @<:@-o@<:@utput@:>@ output_file@:>@ @<:@-i@<:@mport@:>@ importlib_name@:>@'
+ echo ' @<:@-name-mangler-script script.sh@:>@'
+ echo ' @<:@-d@<:@escription@:>@ "dll descrption"@:>@ @<:@-cc "CC"@:>@ @<:@-f@<:@lags@:>@ "CFLAGS"@:>@'
+ echo ' @<:@-ord@<:@inals@:>@@:>@ -ex@<:@clude@:>@ "symbol(s)"'
+ echo ' @<:@-libf@<:@lags@:>@ "{INIT|TERM}{GLOBAL|INSTANCE}"@:>@ @<:@-nocrt@<:@dll@:>@@:>@ @<:@-nolxl@<:@ite@:>@@:>@'
+ echo ' @<:@*.o@:>@ @<:@*.a@:>@'
+ echo '*> "output_file" should have no extension.'
+ echo ' If it has the .o, .a or .dll extension, it is automatically removed.'
+ echo ' The import library name is derived from this and is set to "name".a,'
+ echo ' unless overridden by -import'
+ echo '*> "importlib_name" should have no extension.'
+ echo ' If it has the .o, or .a extension, it is automatically removed.'
+ echo ' This name is used as the import library name and may be longer and'
+ echo ' more descriptive than the DLL name which has to follow the old '
+ echo ' 8.3 convention of FAT.'
+ echo '*> "script.sh may be given to override the output_file name by a'
+ echo ' different name. It is mainly useful if the regular make process'
+ echo ' of some package does not take into account OS/2 restriction of'
+ echo ' DLL name lengths. It takes the importlib name as input and is'
+ echo ' supposed to procude a shorter name as output. The script should'
+ echo ' expect to get importlib_name without extension and should produce'
+ echo ' a (max.) 8 letter name without extension.'
+ echo '*> "cc" is used to use another GCC executable. (default: gcc.exe)'
+ echo '*> "flags" should be any set of valid GCC flags. (default: -s -Zcrtdll)'
+ echo ' These flags will be put at the start of GCC command line.'
+ echo '*> -ord@<:@inals@:>@ tells dllar to export entries by ordinals. Be careful.'
+ echo '*> -ex@<:@clude@:>@ defines symbols which will not be exported. You can define'
+ echo ' multiple symbols, for example -ex "myfunc yourfunc _GLOBAL*".'
+ echo ' If the last character of a symbol is "*", all symbols beginning'
+ echo ' with the prefix before "*" will be exclude, (see _GLOBAL* above).'
+ echo '*> -libf@<:@lags@:>@ can be used to add INITGLOBAL/INITINSTANCE and/or'
+ echo ' TERMGLOBAL/TERMINSTANCE flags to the dynamically-linked library.'
+ echo '*> -nocrt@<:@dll@:>@ switch will disable linking the library against emx''s'
+ echo ' C runtime DLLs.'
+ echo '*> -nolxl@<:@ite@:>@ switch will disable running lxlite on the resulting DLL.'
+ echo '*> All other switches (for example -L./ or -lmylib) will be passed'
+ echo ' unchanged to GCC at the end of command line.'
+ echo '*> If you create a DLL from a library and you do not specify -o,'
+ echo ' the basename for DLL and import library will be set to library name,'
+ echo ' the initial library will be renamed to 'name'_s.a (_s for static)'
+ echo ' i.e. "dllar gcc.a" will create gcc.dll and gcc.a, and the initial'
+ echo ' library will be renamed into gcc_s.a.'
+ echo '--------'
+ echo 'Example:'
+ echo ' dllar -o gcc290.dll libgcc.a -d "GNU C runtime library" -ord'
+ echo ' -ex "__main __ctordtor*" -libf "INITINSTANCE TERMINSTANCE"'
+ CleanUp
+ exit 1
+}
+
+# Execute a command.
+# If exit code of the commnad <> 0 CleanUp() is called and we'll exit the script.
+# @Uses Whatever CleanUp() uses.
+doCommand() {
+ echo "${D}*"
+ eval ${D}*
+ rcCmd=${D}?
+
+ if @<:@ ${D}rcCmd -ne 0 @:>@; then
+ echo "command failed, exit code="${D}rcCmd
+ CleanUp
+ exit ${D}rcCmd
+ fi
+}
+
+# main routine
+# setup globals
+cmdLine=${D}*
+outFile=""
+outimpFile=""
+inputFiles=""
+renameScript=""
+description=""
+CC=gcc.exe
+CFLAGS="-s -Zcrtdll"
+EXTRA_CFLAGS=""
+EXPORT_BY_ORDINALS=0
+exclude_symbols=""
+library_flags=""
+curDir=\`pwd\`
+curDirS=curDir
+case ${D}curDirS in
+*/)
+ ;;
+*)
+ curDirS=${D}{curDirS}"/"
+ ;;
+esac
+# Parse commandline
+libsToLink=0
+omfLinking=0
+while @<:@ ${D}1 @:>@; do
+ case ${D}1 in
+ -ord*)
+ EXPORT_BY_ORDINALS=1;
+ ;;
+ -o*)
+ shift
+ outFile=${D}1
+ ;;
+ -i*)
+ shift
+ outimpFile=${D}1
+ ;;
+ -name-mangler-script)
+ shift
+ renameScript=${D}1
+ ;;
+ -d*)
+ shift
+ description=${D}1
+ ;;
+ -f*)
+ shift
+ CFLAGS=${D}1
+ ;;
+ -c*)
+ shift
+ CC=${D}1
+ ;;
+ -h*)
+ PrintHelp
+ ;;
+ -ex*)
+ shift
+ exclude_symbols=${D}{exclude_symbols}${D}1" "
+ ;;
+ -libf*)
+ shift
+ library_flags=${D}{library_flags}${D}1" "
+ ;;
+ -nocrt*)
+ CFLAGS="-s"
+ ;;
+ -nolxl*)
+ flag_USE_LXLITE=0
+ ;;
+ -* | /*)
+ case ${D}1 in
+ -L* | -l*)
+ libsToLink=1
+ ;;
+ -Zomf)
+ omfLinking=1
+ ;;
+ *)
+ ;;
+ esac
+ EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
+ ;;
+ *.dll)
+ EXTRA_CFLAGS="${D}{EXTRA_CFLAGS} \`basnam ${D}1 .dll\`"
+ if @<:@ ${D}omfLinking -eq 1 @:>@; then
+ EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.lib"
+ else
+ EXTRA_CFLAGS="${D}{EXTRA_CFLAGS}.a"
+ fi
+ ;;
+ *)
+ found=0;
+ if @<:@ ${D}libsToLink -ne 0 @:>@; then
+ EXTRA_CFLAGS=${D}{EXTRA_CFLAGS}" "${D}1
+ else
+ for file in ${D}1 ; do
+ if @<:@ -f ${D}file @:>@; then
+ inputFiles="${D}{inputFiles} ${D}file"
+ found=1
+ fi
+ done
+ if @<:@ ${D}found -eq 0 @:>@; then
+ echo "ERROR: No file(s) found: "${D}1
+ exit 8
+ fi
+ fi
+ ;;
+ esac
+ shift
+done # iterate cmdline words
+
+#
+if @<:@ -z "${D}inputFiles" @:>@; then
+ echo "dllar: no input files"
+ PrintHelp
+fi
+
+# Now extract all .o files from .a files
+newInputFiles=""
+for file in ${D}inputFiles ; do
+ case ${D}file in
+ *.a | *.lib)
+ case ${D}file in
+ *.a)
+ suffix=".a"
+ AR="ar"
+ ;;
+ *.lib)
+ suffix=".lib"
+ AR="emxomfar"
+ EXTRA_CFLAGS="${D}EXTRA_CFLAGS -Zomf"
+ ;;
+ *)
+ ;;
+ esac
+ dirname=\`basnam ${D}file ${D}suffix\`"_%"
+ mkdir ${D}dirname
+ if @<:@ ${D}? -ne 0 @:>@; then
+ echo "Failed to create subdirectory ./${D}dirname"
+ CleanUp
+ exit 8;
+ fi
+ # Append '!' to indicate archive
+ newInputFiles="${D}newInputFiles ${D}{dirname}!"
+ doCommand "cd ${D}dirname; ${D}AR x ../${D}file"
+ cd ${D}curDir
+ found=0;
+ for subfile in ${D}dirname/*.o* ; do
+ if @<:@ -f ${D}subfile @:>@; then
+ found=1
+ if @<:@ -s ${D}subfile @:>@; then
+ # FIXME: This should be: is file size > 32 byte, _not_ > 0!
+ newInputFiles="${D}newInputFiles ${D}subfile"
+ fi
+ fi
+ done
+ if @<:@ ${D}found -eq 0 @:>@; then
+ echo "WARNING: there are no files in archive \\'${D}file\\'"
+ fi
+ ;;
+ *)
+ newInputFiles="${D}{newInputFiles} ${D}file"
+ ;;
+ esac
+done
+inputFiles="${D}newInputFiles"
+
+# Output filename(s).
+do_backup=0;
+if @<:@ -z ${D}outFile @:>@; then
+ do_backup=1;
+ set outFile ${D}inputFiles; outFile=${D}2
+fi
+
+# If it is an archive, remove the '!' and the '_%' suffixes
+case ${D}outFile in
+*_%!)
+ outFile=\`basnam ${D}outFile _%!\`
+ ;;
+*)
+ ;;
+esac
+case ${D}outFile in
+*.dll)
+ outFile=\`basnam ${D}outFile .dll\`
+ ;;
+*.DLL)
+ outFile=\`basnam ${D}outFile .DLL\`
+ ;;
+*.o)
+ outFile=\`basnam ${D}outFile .o\`
+ ;;
+*.obj)
+ outFile=\`basnam ${D}outFile .obj\`
+ ;;
+*.a)
+ outFile=\`basnam ${D}outFile .a\`
+ ;;
+*.lib)
+ outFile=\`basnam ${D}outFile .lib\`
+ ;;
+*)
+ ;;
+esac
+case ${D}outimpFile in
+*.a)
+ outimpFile=\`basnam ${D}outimpFile .a\`
+ ;;
+*.lib)
+ outimpFile=\`basnam ${D}outimpFile .lib\`
+ ;;
+*)
+ ;;
+esac
+if @<:@ -z ${D}outimpFile @:>@; then
+ outimpFile=${D}outFile
+fi
+defFile="${D}{outFile}.def"
+arcFile="${D}{outimpFile}.a"
+arcFile2="${D}{outimpFile}.lib"
+
+#create ${D}dllFile as something matching 8.3 restrictions,
+if @<:@ -z ${D}renameScript @:>@ ; then
+ dllFile="${D}outFile"
+else
+ dllFile=\`${D}renameScript ${D}outimpFile\`
+fi
+
+if @<:@ ${D}do_backup -ne 0 @:>@ ; then
+ if @<:@ -f ${D}arcFile @:>@ ; then
+ doCommand "mv ${D}arcFile ${D}{outFile}_s.a"
+ fi
+ if @<:@ -f ${D}arcFile2 @:>@ ; then
+ doCommand "mv ${D}arcFile2 ${D}{outFile}_s.lib"
+ fi
+fi
+
+# Extract public symbols from all the object files.
+tmpdefFile=${D}{defFile}_%
+rm -f ${D}tmpdefFile
+for file in ${D}inputFiles ; do
+ case ${D}file in
+ *!)
+ ;;
+ *)
+ doCommand "emxexp -u ${D}file >> ${D}tmpdefFile"
+ ;;
+ esac
+done
+
+# Create the def file.
+rm -f ${D}defFile
+echo "LIBRARY \`basnam ${D}dllFile\` ${D}library_flags" >> ${D}defFile
+dllFile="${D}{dllFile}.dll"
+if @<:@ ! -z ${D}description @:>@; then
+ echo "DESCRIPTION \\"${D}{description}\\"" >> ${D}defFile
+fi
+echo "EXPORTS" >> ${D}defFile
+
+doCommand "cat ${D}tmpdefFile | sort.exe | uniq.exe > ${D}{tmpdefFile}%"
+grep -v "^ *;" < ${D}{tmpdefFile}% | grep -v "^ *${D}" >${D}tmpdefFile
+
+# Checks if the export is ok or not.
+for word in ${D}exclude_symbols; do
+ grep -v ${D}word < ${D}tmpdefFile >${D}{tmpdefFile}%
+ mv ${D}{tmpdefFile}% ${D}tmpdefFile
+done
+
+
+if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
+ sed "=" < ${D}tmpdefFile | \\
+ sed '
+ N
+ : loop
+ s/^\\(@<:@0-9@:>@\\+\\)\\(@<:@^;@:>@*\\)\\(;.*\\)\\?/\\2 @\\1 NONAME/
+ t loop
+ ' > ${D}{tmpdefFile}%
+ grep -v "^ *${D}" < ${D}{tmpdefFile}% > ${D}tmpdefFile
+else
+ rm -f ${D}{tmpdefFile}%
+fi
+cat ${D}tmpdefFile >> ${D}defFile
+rm -f ${D}tmpdefFile
+
+# Do linking, create implib, and apply lxlite.
+gccCmdl="";
+for file in ${D}inputFiles ; do
+ case ${D}file in
+ *!)
+ ;;
+ *)
+ gccCmdl="${D}gccCmdl ${D}file"
+ ;;
+ esac
+done
+doCommand "${D}CC ${D}CFLAGS -Zdll -o ${D}dllFile ${D}defFile ${D}gccCmdl ${D}EXTRA_CFLAGS"
+touch "${D}{outFile}.dll"
+
+doCommand "emximp -o ${D}arcFile ${D}defFile"
+if @<:@ ${D}flag_USE_LXLITE -ne 0 @:>@; then
+ add_flags="";
+ if @<:@ ${D}EXPORT_BY_ORDINALS -ne 0 @:>@; then
+ add_flags="-ynd"
+ fi
+ doCommand "lxlite -cs -t: -mrn -mln ${D}add_flags ${D}dllFile"
+fi
+doCommand "emxomf -s -l ${D}arcFile"
+
+# Successful exit.
+CleanUp 1
+exit 0
+EOF
+dnl ===================== dllar.sh ends here =====================
+])
+
+dnl
+dnl This file is part of Bakefile (http://www.bakefile.org)
+dnl
+dnl Copyright (C) 2003-2007 Vaclav Slavik, David Elliott and others
+dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the "Software"),
+dnl to deal in the Software without restriction, including without limitation
+dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
+dnl and/or sell copies of the Software, and to permit persons to whom the
+dnl Software is furnished to do so, subject to the following conditions:
+dnl
+dnl The above copyright notice and this permission notice shall be included in
+dnl all copies or substantial portions of the Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+dnl DEALINGS IN THE SOFTWARE.
+dnl
+dnl $Id: bakefile-lang.m4 1278 2008-11-17 22:26:10Z vadz $
+dnl
+dnl Compiler detection macros by David Elliott and Vadim Zeitlin
+dnl
+
+
+dnl ===========================================================================
+dnl Macros to detect different C/C++ compilers
+dnl ===========================================================================
+
+dnl Based on autoconf _AC_LANG_COMPILER_GNU
+dnl _AC_BAKEFILE_LANG_COMPILER(NAME, LANG, SYMBOL, IF-YES, IF-NO)
+AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
+[
+ AC_LANG_PUSH($2)
+ AC_CACHE_CHECK(
+ [whether we are using the $1 $2 compiler],
+ [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3],
+ [AC_TRY_COMPILE(
+ [],
+ [
+ #ifndef $3
+ choke me
+ #endif
+ ],
+ [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=yes],
+ [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=no]
+ )
+ ]
+ )
+ if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then
+ :; $4
+ else
+ :; $5
+ fi
+ AC_LANG_POP($2)
+])
+
+dnl More specific version of the above macro checking whether the compiler
+dnl version is at least the given one (assumes that we do use this compiler)
+dnl
+dnl _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(NAME, LANG, SYMBOL, VER, VERMSG, IF-YES, IF-NO)
+AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_LATER_THAN],
+[
+ AC_LANG_PUSH($2)
+ AC_CACHE_CHECK(
+ [whether we are using $1 $2 compiler v$5 or later],
+ [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4],
+ [AC_TRY_COMPILE(
+ [],
+ [
+ #ifndef $3 || $3 < $4
+ choke me
+ #endif
+ ],
+ [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=yes],
+ [bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4=no]
+ )
+ ]
+ )
+ if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3[]_lt_[]$4" = "xyes"; then
+ :; $6
+ else
+ :; $7
+ fi
+ AC_LANG_POP($2)
+])
+
+dnl CodeWarrior Metrowerks compiler defines __MWERKS__ for both C and C++
+AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
+[
+ _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C, __MWERKS__, MWCC=yes)
+])
+
+AC_DEFUN([AC_BAKEFILE_PROG_MWCXX],
+[
+ _AC_BAKEFILE_LANG_COMPILER(Metrowerks, C++, __MWERKS__, MWCXX=yes)
+])
+
+dnl IBM xlC compiler defines __xlC__ for both C and C++
+AC_DEFUN([AC_BAKEFILE_PROG_XLCC],
+[
+ _AC_BAKEFILE_LANG_COMPILER([IBM xlC], C, __xlC__, XLCC=yes)
+])
+
+AC_DEFUN([AC_BAKEFILE_PROG_XLCXX],
+[
+ _AC_BAKEFILE_LANG_COMPILER([IBM xlC], C++, __xlC__, XLCXX=yes)
+])
+
+dnl recent versions of SGI mipsPro compiler define _SGI_COMPILER_VERSION
+dnl
+dnl NB: old versions define _COMPILER_VERSION but this could probably be
+dnl defined by other compilers too so don't test for it to be safe
+AC_DEFUN([AC_BAKEFILE_PROG_SGICC],
+[
+ _AC_BAKEFILE_LANG_COMPILER(SGI, C, _SGI_COMPILER_VERSION, SGICC=yes)
+])
+
+AC_DEFUN([AC_BAKEFILE_PROG_SGICXX],
+[
+ _AC_BAKEFILE_LANG_COMPILER(SGI, C++, _SGI_COMPILER_VERSION, SGICXX=yes)
+])
+
+dnl Sun compiler defines __SUNPRO_C/__SUNPRO_CC
+AC_DEFUN([AC_BAKEFILE_PROG_SUNCC],
+[
+ _AC_BAKEFILE_LANG_COMPILER(Sun, C, __SUNPRO_C, SUNCC=yes)
+])
+
+AC_DEFUN([AC_BAKEFILE_PROG_SUNCXX],
+[
+ _AC_BAKEFILE_LANG_COMPILER(Sun, C++, __SUNPRO_CC, SUNCXX=yes)
+])
+
+dnl Intel icc compiler defines __INTEL_COMPILER for both C and C++
+AC_DEFUN([AC_BAKEFILE_PROG_INTELCC],
+[
+ _AC_BAKEFILE_LANG_COMPILER(Intel, C, __INTEL_COMPILER, INTELCC=yes)
+])
+
+AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX],
+[
+ _AC_BAKEFILE_LANG_COMPILER(Intel, C++, __INTEL_COMPILER, INTELCXX=yes)
+])
+
+dnl Intel compiler command line options changed in incompatible ways sometimes
+dnl before v8 (-KPIC was replaced with gcc-compatible -fPIC) and again in v10
+dnl (-create-pch deprecated in favour of -pch-create) so we need to test for
+dnl its exact version too
+AC_DEFUN([AC_BAKEFILE_PROG_INTELCC_8],
+[
+ _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C, __INTEL_COMPILER, 800, 8, INTELCC8=yes)
+])
+AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX_8],
+[
+ _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C++, __INTEL_COMPILER, 800, 8, INTELCXX8=yes)
+])
+
+AC_DEFUN([AC_BAKEFILE_PROG_INTELCC_10],
+[
+ _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C, __INTEL_COMPILER, 1000, 10, INTELCC10=yes)
+])
+
+AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX_10],
+[
+ _AC_BAKEFILE_LANG_COMPILER_LATER_THAN(Intel, C++, __INTEL_COMPILER, 1000, 10, INTELCXX10=yes)
+])
+
+dnl HP-UX aCC: see http://docs.hp.com/en/6162/preprocess.htm#macropredef
+AC_DEFUN([AC_BAKEFILE_PROG_HPCC],
+[
+ _AC_BAKEFILE_LANG_COMPILER(HP, C, __HP_cc, HPCC=yes)
+])
+
+AC_DEFUN([AC_BAKEFILE_PROG_HPCXX],
+[
+ _AC_BAKEFILE_LANG_COMPILER(HP, C++, __HP_aCC, HPCXX=yes)
+])
+
+dnl Tru64 cc and cxx
+AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCC],
+[
+ _AC_BAKEFILE_LANG_COMPILER(Compaq, C, __DECC, COMPAQCC=yes)
+])
+
+AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCXX],
+[
+ _AC_BAKEFILE_LANG_COMPILER(Compaq, C++, __DECCXX, COMPAQCXX=yes)
+])
+
+dnl ===========================================================================
+dnl macros to detect specialty compiler options
+dnl ===========================================================================
+
+dnl Figure out if we need to pass -ext o to compiler (MetroWerks)
+AC_DEFUN([AC_BAKEFILE_METROWERKS_EXTO],
+[AC_CACHE_CHECK([if the _AC_LANG compiler requires -ext o], bakefile_cv_[]_AC_LANG_ABBREV[]_exto,
+dnl First create an empty conf test
+[AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
+dnl Now remove .o and .c.o or .cc.o
+rm -f conftest.$ac_objext conftest.$ac_ext.o
+dnl Now compile the test
+AS_IF([AC_TRY_EVAL(ac_compile)],
+dnl If the test succeeded look for conftest.c.o or conftest.cc.o
+[for ac_file in `(ls conftest.* 2>/dev/null)`; do
+ case $ac_file in
+ conftest.$ac_ext.o)
+ bakefile_cv_[]_AC_LANG_ABBREV[]_exto="-ext o"
+ ;;
+ *)
+ ;;
+ esac
+done],
+[AC_MSG_FAILURE([cannot figure out if compiler needs -ext o: cannot compile])
+]) dnl AS_IF
+
+rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext
+]) dnl AC_CACHE_CHECK
+
+if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_exto" '!=' "x"; then
+ if test "[]_AC_LANG_ABBREV[]" = "c"; then
+ CFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CFLAGS"
+ fi
+ if test "[]_AC_LANG_ABBREV[]" = "cxx"; then
+ CXXFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CXXFLAGS"
+ fi
+fi
+]) dnl AC_DEFUN
+
+
+dnl ===========================================================================
+dnl Macros to do all of the compiler detections as one macro
+dnl ===========================================================================
+
+dnl check for different proprietary compilers depending on target platform
+dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
+AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
+[
+ AC_PROG_$1
+
+ dnl Intel compiler can be used under several different OS and even
+ dnl different architectures (x86, amd64 and Itanium) so it's easier to just
+ dnl always test for it
+ AC_BAKEFILE_PROG_INTEL$1
+
+ dnl If we use Intel compiler we also need to know its version
+ if test "$INTEL$1" = "yes"; then
+ AC_BAKEFILE_PROG_INTEL$1_8
+ AC_BAKEFILE_PROG_INTEL$1_10
+ fi
+
+ dn...
[truncated message content] |
|
From: <cur...@us...> - 2010-05-11 18:16:35
|
Revision: 67
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=67&view=rev
Author: cursorstar
Date: 2010-05-11 18:16:28 +0000 (Tue, 11 May 2010)
Log Message:
-----------
Add svg support (with rsvg).
Add svg icons for ribbon.
Modified Paths:
--------------
trunk/wxdevcenter/configure
trunk/wxdevcenter/configure.ac
trunk/wxdevcenter/plugins/text/text.cpp
trunk/wxdevcenter/src/application.cpp
trunk/wxdevcenter/src/docview/document.cpp
trunk/wxdevcenter/src/sys/config.cpp
trunk/wxdevcenter/src/sys/search.cpp
trunk/wxdevcenter/src/ui/art.cpp
trunk/wxdevcenter/src/ui/art.hpp
trunk/wxdevcenter/src/ui/frame.cpp
trunk/wxdevcenter/src/uistd/stdframe.cpp
Added Paths:
-----------
trunk/wxdevcenter/plugins/text/bookmark-new.svg
trunk/wxdevcenter/plugins/text/bookmark-next.svg
trunk/wxdevcenter/plugins/text/bookmark-previous.svg
trunk/wxdevcenter/plugins/text/bookmark-remove-all.svg
trunk/wxdevcenter/plugins/text/change-case-lower.svg
trunk/wxdevcenter/plugins/text/change-case-upper.svg
trunk/wxdevcenter/plugins/text/zoom-in.svg
trunk/wxdevcenter/plugins/text/zoom-original.svg
trunk/wxdevcenter/plugins/text/zoom-out.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/Preferences.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/Terminal.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/application-exit.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/document-close-all.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/document-close.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/document-new.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/document-open.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/document-revert.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/document-save-all.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/document-save-as.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/document-save.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/edit-clear.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/edit-copy.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/edit-cut.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/edit-delete.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/edit-find-replace.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/edit-find.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/edit-paste.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/edit-redo.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/edit-select-all.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/edit-select-line.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/edit-undo.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/help-about.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/image-missing.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/system-search.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/window-close.svg
trunk/wxdevcenter/share/pixmaps/wxdevcenter/workbar.svg
Modified: trunk/wxdevcenter/configure
===================================================================
--- trunk/wxdevcenter/configure 2010-05-07 19:06:35 UTC (rev 66)
+++ trunk/wxdevcenter/configure 2010-05-11 18:16:28 UTC (rev 67)
@@ -17229,12 +17229,12 @@
pkg_cv_WXDEVCENTER_CFLAGS="$WXDEVCENTER_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 libglade-2.0 \""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 libglade-2.0 ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "librsvg-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_WXDEVCENTER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 libglade-2.0 " 2>/dev/null`
+ pkg_cv_WXDEVCENTER_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -17245,12 +17245,12 @@
pkg_cv_WXDEVCENTER_LIBS="$WXDEVCENTER_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 libglade-2.0 \""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 libglade-2.0 ") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "librsvg-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_WXDEVCENTER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 libglade-2.0 " 2>/dev/null`
+ pkg_cv_WXDEVCENTER_LIBS=`$PKG_CONFIG --libs "librsvg-2.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -17268,14 +17268,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 libglade-2.0 " 2>&1`
+ WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "librsvg-2.0" 2>&1`
else
- WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 libglade-2.0 " 2>&1`
+ WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "librsvg-2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$WXDEVCENTER_PKG_ERRORS" >&5
- as_fn_error "Package requirements (gtk+-2.0 libglade-2.0 ) were not met:
+ as_fn_error "Package requirements (librsvg-2.0) were not met:
$WXDEVCENTER_PKG_ERRORS
Modified: trunk/wxdevcenter/configure.ac
===================================================================
--- trunk/wxdevcenter/configure.ac 2010-05-07 19:06:35 UTC (rev 66)
+++ trunk/wxdevcenter/configure.ac 2010-05-11 18:16:28 UTC (rev 67)
@@ -57,7 +57,7 @@
-PKG_CHECK_MODULES(WXDEVCENTER, [gtk+-2.0 libglade-2.0 ])
+PKG_CHECK_MODULES(WXDEVCENTER, [librsvg-2.0])
AC_SUBST(WXDEVCENTER_CFLAGS)
AC_SUBST(WXDEVCENTER_LIBS)
Added: trunk/wxdevcenter/plugins/text/bookmark-new.svg
===================================================================
--- trunk/wxdevcenter/plugins/text/bookmark-new.svg (rev 0)
+++ trunk/wxdevcenter/plugins/text/bookmark-new.svg 2010-05-11 18:16:28 UTC (rev 67)
@@ -0,0 +1,672 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:export-ydpi="240.00000"
+ inkscape:export-xdpi="240.00000"
+ inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
+ sodipodi:docname="bookmark-new.svg"
+ sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
+ inkscape:version="0.46"
+ sodipodi:version="0.32"
+ id="svg249"
+ height="48.000000px"
+ width="48.000000px"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs3">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 24 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="48 : 24 : 1"
+ inkscape:persp3d-origin="24 : 16 : 1"
+ id="perspective100" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient5031"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5060">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop5062" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5064" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient5029"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ id="linearGradient5048">
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="0"
+ id="stop5050" />
+ <stop
+ id="stop5056"
+ offset="0.5"
+ style="stop-color:black;stop-opacity:1;" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5052" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5048"
+ id="linearGradient5027"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+ x1="302.85715"
+ y1="366.64789"
+ x2="302.85715"
+ y2="609.50507" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2906">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2908" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2910" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2896">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop2898" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop2900" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2598">
+ <stop
+ style="stop-color:#859dbc;stop-opacity:1;"
+ offset="0"
+ id="stop2600" />
+ <stop
+ style="stop-color:#547299;stop-opacity:1;"
+ offset="1"
+ id="stop2602" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2590">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2592" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2594" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5897">
+ <stop
+ style="stop-color:#000000;stop-opacity:0.0000000;"
+ offset="0.0000000"
+ id="stop5899" />
+ <stop
+ id="stop5905"
+ offset="0.50000000"
+ style="stop-color:#000000;stop-opacity:0.56701028;" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.0000000;"
+ offset="1.0000000"
+ id="stop5901" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5866">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop5868" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop5870" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4404">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4406" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4408" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4542">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4544" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop4546" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient15662">
+ <stop
+ id="stop15664"
+ offset="0.0000000"
+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+ <stop
+ id="stop15666"
+ offset="1.0000000"
+ style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient269">
+ <stop
+ id="stop270"
+ offset="0.0000000"
+ style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+ <stop
+ id="stop271"
+ offset="1.0000000"
+ style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient259">
+ <stop
+ id="stop260"
+ offset="0.0000000"
+ style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+ <stop
+ id="stop261"
+ offset="1.0000000"
+ style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient12512">
+ <stop
+ id="stop12513"
+ offset="0.0000000"
+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+ <stop
+ id="stop12517"
+ offset="0.50000000"
+ style="stop-color:#fff520;stop-opacity:0.89108908;" />
+ <stop
+ id="stop12514"
+ offset="1.0000000"
+ style="stop-color:#fff300;stop-opacity:0.0000000;" />
+ </linearGradient>
+ <radialGradient
+ r="14.375000"
+ fy="125.00000"
+ fx="55.000000"
+ cy="125.00000"
+ cx="55.000000"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient278"
+ xlink:href="#linearGradient12512"
+ inkscape:collect="always" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient269"
+ id="radialGradient15656"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.968273,0.000000,0.000000,1.036374,3.250000,0.489522)"
+ cx="8.8244190"
+ cy="3.7561285"
+ fx="8.8244190"
+ fy="3.7561285"
+ r="37.751713" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient259"
+ id="radialGradient15658"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.960493,0.000000,0.000000,1.044769,-0.103553,-0.159183)"
+ cx="33.966679"
+ cy="35.736916"
+ fx="33.966679"
+ fy="35.736916"
+ r="86.708450" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient15662"
+ id="radialGradient15668"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.973033,0.000000,0.000000,1.034937,3.168754,0.555277)"
+ cx="8.1435566"
+ cy="7.2678967"
+ fx="8.1435566"
+ fy="7.2678967"
+ r="38.158695" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4542"
+ id="radialGradient4548"
+ cx="24.306795"
+ cy="42.07798"
+ fx="24.306795"
+ fy="42.07798"
+ r="15.821514"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.284916,0.000000,30.08928)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4404"
+ id="linearGradient4410"
+ x1="16.812500"
+ y1="1.8750000"
+ x2="16.812500"
+ y2="4.7187500"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.319549,0.000000,0.000000,1.362060,40.38853,-0.362057)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5866"
+ id="linearGradient5872"
+ x1="19.452349"
+ y1="13.174174"
+ x2="19.685436"
+ y2="27.095339"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.224255,0.000000,0.000000,1.282176,0.371569,0.264657)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5897"
+ id="linearGradient5903"
+ x1="19.000000"
+ y1="9.7738247"
+ x2="19.000000"
+ y2="15.635596"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.319549,0.000000,0.000000,2.133926,-4.476133,-14.64845)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2590"
+ id="linearGradient2596"
+ x1="19.970377"
+ y1="6.1167107"
+ x2="19.970377"
+ y2="2.53125"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.319549,0.000000,0.000000,1.280356,-5.745298,0.249007)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2598"
+ id="linearGradient2604"
+ x1="18.431311"
+ y1="19.119474"
+ x2="18.402472"
+ y2="4.2702327"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.319549,0.000000,0.000000,1.299013,-3.106200,-1.336165)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2896"
+ id="linearGradient2902"
+ x1="14.584077"
+ y1="1.6392649"
+ x2="14.552828"
+ y2="2.4912448"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,1.594214,0.000000,-0.790249)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2906"
+ id="linearGradient2912"
+ x1="13.354311"
+ y1="1.4866425"
+ x2="14.075844"
+ y2="2.4017651"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,1.184816,0.000000,-0.727880)" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-y="158"
+ inkscape:window-x="433"
+ inkscape:window-height="690"
+ inkscape:window-width="872"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ showgrid="false"
+ inkscape:current-layer="layer6"
+ inkscape:cy="16.785697"
+ inkscape:cx="-154.12746"
+ inkscape:zoom="1"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ borderopacity="0.25490196"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ inkscape:showpageshadow="false"
+ showguides="true"
+ inkscape:guide-bbox="true" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>New Bookmark</dc:title>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>bookmark</rdf:li>
+ <rdf:li>remember</rdf:li>
+ <rdf:li>favorite</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Andreas Nilsson</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source />
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:contributor>
+ <dc:description>create bookmark action</dc:description>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer6"
+ inkscape:label="Shadow">
+ <g
+ style="display:inline"
+ id="g5022"
+ transform="matrix(2.165152e-2,0,0,1.485743e-2,43.0076,42.68539)">
+ <rect
+ y="-150.69685"
+ x="-1559.2523"
+ height="478.35718"
+ width="1339.6335"
+ id="rect4173"
+ style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path5058"
+ d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+ id="path5018"
+ sodipodi:nodetypes="cccc" />
+ </g>
+ </g>
+ <g
+ style="display:inline"
+ inkscape:groupmode="layer"
+ inkscape:label="Base"
+ id="layer1">
+ <rect
+ style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ id="rect15391"
+ width="34.875000"
+ height="41.063431"
+ x="6.5000000"
+ y="3.5000000"
+ ry="1.1490481"
+ rx="1.1490486" />
+ <rect
+ style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ id="rect15660"
+ width="32.937012"
+ height="39.028210"
+ x="7.5024552"
+ y="4.5010486"
+ ry="0.14904849"
+ rx="0.14904852" />
+ <path
+ style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.98855311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.017543854"
+ d="M 11.505723,5.4942766 L 11.505723,43.400869"
+ id="path15672"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.20467831"
+ d="M 12.500000,5.0205154 L 12.500000,43.038228"
+ id="path15674"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Text"
+ style="display:inline">
+ <g
+ id="g2188">
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15686"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="9.0000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15688"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="11.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15690"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="13.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15692"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="15.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15694"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="17.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15696"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="19.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15698"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="21.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15700"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="23.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15732"
+ width="9.0000057"
+ height="1.0000000"
+ x="15.999986"
+ y="25.000000"
+ rx="0.062003858"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15736"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999986"
+ y="29.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15738"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999986"
+ y="31.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15740"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999986"
+ y="33.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15742"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999986"
+ y="35.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15744"
+ width="14.000014"
+ height="1.0000000"
+ x="15.999986"
+ y="37.000000"
+ rx="0.096450485"
+ ry="0.065390877" />
+ </g>
+ <path
+ style="opacity:0.28021976;fill:url(#linearGradient5872);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 28.245858,31.324906 L 21.147869,27.133701 L 14.30757,30.8838 L 13.761859,3.9475667 L 28.549598,3.9475667 L 28.245858,31.324906 z "
+ id="path5138"
+ sodipodi:nodetypes="cccccc" />
+ <path
+ style="fill:url(#linearGradient2604);fill-opacity:1;fill-rule:evenodd;stroke:#364878;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
+ d="M 12.427339,3.5180202 C 12.427339,3.5180202 12.240033,0.60520607 15.107867,0.54270607 L 25.119343,0.50728624 C 26.277287,0.50728624 26.581888,1.1910178 26.581888,2.1095589 L 26.581888,29.729916 L 20.545426,24.533862 L 14.674346,29.729916 L 14.591655,3.519629 L 12.427339,3.5180202 z "
+ id="path2204"
+ sodipodi:nodetypes="ccccccccc" />
+ <path
+ style="opacity:0.4450549;fill:url(#linearGradient4410);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 13.030252,3.0117919 C 13.011046,2.225362 13.312918,1.0801307 15.375418,1.0176307 L 25.027906,1 C 25.640922,1 26.090152,1.1674319 26.090152,1.7994802 L 26.060994,10.491851 L 15.317102,10.491851 L 15.192102,2.9993251 C 15.192102,2.9993251 13.030252,3.0117919 13.030252,3.0117919 z "
+ id="path3668"
+ sodipodi:nodetypes="cccccccs" />
+ <rect
+ style="opacity:0.28021976;fill:url(#linearGradient5903);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect5895"
+ width="10.556392"
+ height="12.803556"
+ x="15.317101"
+ y="6.6907959"
+ rx="0.062003858"
+ ry="0.065390877" />
+ <path
+ style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2596);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.19125683;display:inline"
+ d="M 24.476832,2.2095507 L 25.575535,3.113139 L 25.547445,27.511911 L 20.497463,23.203758 L 15.704084,27.415203 L 15.699081,2.7495618 L 24.476832,2.2095507 z "
+ id="path5969"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:url(#radialGradient278);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25000024;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block"
+ id="path12511"
+ sodipodi:cx="55"
+ sodipodi:cy="125"
+ sodipodi:rx="14.375"
+ sodipodi:ry="14.375"
+ d="M 69.375 125 A 14.375 14.375 0 1 1 40.625,125 A 14.375 14.375 0 1 1 69.375 125 z"
+ transform="matrix(0.611127,0.000000,0.000000,0.611127,5.632438,-67.28175)"
+ inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/stock_new-16.png"
+ inkscape:export-xdpi="33.852203"
+ inkscape:export-ydpi="33.852203" />
+ <path
+ style="opacity:0.48295456;color:#000000;fill:url(#linearGradient2912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 15.158602,3.9384083 L 15.114407,1.0335178 C 12.983906,1.0335178 12.993087,2.9680775 12.993087,3.9384083 L 15.158602,3.9384083 z "
+ id="path2894"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path2904"
+ d="M 15.158602,3.9384086 L 15.114407,1.8247593 C 12.81631,1.8426926 12.993087,3.9384086 12.993087,3.9384086 L 15.158602,3.9384086 z "
+ style="opacity:0.35795455;color:#000000;fill:url(#linearGradient2902);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ </g>
+</svg>
Added: trunk/wxdevcenter/plugins/text/bookmark-next.svg
===================================================================
--- trunk/wxdevcenter/plugins/text/bookmark-next.svg (rev 0)
+++ trunk/wxdevcenter/plugins/text/bookmark-next.svg 2010-05-11 18:16:28 UTC (rev 67)
@@ -0,0 +1,762 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ inkscape:export-ydpi="240.00000"
+ inkscape:export-xdpi="240.00000"
+ inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
+ sodipodi:docname="bookmark-next.svg"
+ inkscape:version="0.47 r22583"
+ sodipodi:version="0.32"
+ id="svg249"
+ height="48.000000px"
+ width="48.000000px"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ version="1.1">
+ <defs
+ id="defs3">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 24 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="48 : 24 : 1"
+ inkscape:persp3d-origin="24 : 16 : 1"
+ id="perspective100" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient5031"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5060">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop5062" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5064" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient5029"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ id="linearGradient5048">
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="0"
+ id="stop5050" />
+ <stop
+ id="stop5056"
+ offset="0.5"
+ style="stop-color:black;stop-opacity:1;" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5052" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5048"
+ id="linearGradient5027"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+ x1="302.85715"
+ y1="366.64789"
+ x2="302.85715"
+ y2="609.50507" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2906">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2908" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2910" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2896">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop2898" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop2900" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2598">
+ <stop
+ style="stop-color:#859dbc;stop-opacity:1;"
+ offset="0"
+ id="stop2600" />
+ <stop
+ style="stop-color:#547299;stop-opacity:1;"
+ offset="1"
+ id="stop2602" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient2590">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop2592" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop2594" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient5897">
+ <stop
+ style="stop-color:#000000;stop-opacity:0.0000000;"
+ offset="0.0000000"
+ id="stop5899" />
+ <stop
+ id="stop5905"
+ offset="0.50000000"
+ style="stop-color:#000000;stop-opacity:0.56701028;" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.0000000;"
+ offset="1.0000000"
+ id="stop5901" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5866">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop5868" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop5870" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4404">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4406" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4408" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4542">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4544" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop4546" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient15662">
+ <stop
+ id="stop15664"
+ offset="0.0000000"
+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+ <stop
+ id="stop15666"
+ offset="1.0000000"
+ style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient269">
+ <stop
+ id="stop270"
+ offset="0.0000000"
+ style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+ <stop
+ id="stop271"
+ offset="1.0000000"
+ style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient259">
+ <stop
+ id="stop260"
+ offset="0.0000000"
+ style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+ <stop
+ id="stop261"
+ offset="1.0000000"
+ style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient12512">
+ <stop
+ id="stop12513"
+ offset="0.0000000"
+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+ <stop
+ id="stop12517"
+ offset="0.50000000"
+ style="stop-color:#fff520;stop-opacity:0.89108908;" />
+ <stop
+ id="stop12514"
+ offset="1.0000000"
+ style="stop-color:#fff300;stop-opacity:0.0000000;" />
+ </linearGradient>
+ <radialGradient
+ r="14.375000"
+ fy="125.00000"
+ fx="55.000000"
+ cy="125.00000"
+ cx="55.000000"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient278"
+ xlink:href="#linearGradient12512"
+ inkscape:collect="always" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient269"
+ id="radialGradient15656"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.968273,0.000000,0.000000,1.036374,3.250000,0.489522)"
+ cx="8.8244190"
+ cy="3.7561285"
+ fx="8.8244190"
+ fy="3.7561285"
+ r="37.751713" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient259"
+ id="radialGradient15658"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.960493,0.000000,0.000000,1.044769,-0.103553,-0.159183)"
+ cx="33.966679"
+ cy="35.736916"
+ fx="33.966679"
+ fy="35.736916"
+ r="86.708450" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient15662"
+ id="radialGradient15668"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.973033,0.000000,0.000000,1.034937,3.168754,0.555277)"
+ cx="8.1435566"
+ cy="7.2678967"
+ fx="8.1435566"
+ fy="7.2678967"
+ r="38.158695" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4542"
+ id="radialGradient4548"
+ cx="24.306795"
+ cy="42.07798"
+ fx="24.306795"
+ fy="42.07798"
+ r="15.821514"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,0.284916,0.000000,30.08928)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4404"
+ id="linearGradient4410"
+ x1="16.812500"
+ y1="1.8750000"
+ x2="16.812500"
+ y2="4.7187500"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.319549,0.000000,0.000000,1.362060,40.38853,-0.362057)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5866"
+ id="linearGradient5872"
+ x1="19.452349"
+ y1="13.174174"
+ x2="19.685436"
+ y2="27.095339"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.224255,0.000000,0.000000,1.282176,0.371569,0.264657)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5897"
+ id="linearGradient5903"
+ x1="19.000000"
+ y1="9.7738247"
+ x2="19.000000"
+ y2="15.635596"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.319549,0.000000,0.000000,2.133926,-4.476133,-14.64845)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2590"
+ id="linearGradient2596"
+ x1="19.970377"
+ y1="6.1167107"
+ x2="19.970377"
+ y2="2.53125"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.319549,0.000000,0.000000,1.280356,-5.745298,0.249007)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2598"
+ id="linearGradient2604"
+ x1="18.431311"
+ y1="19.119474"
+ x2="18.402472"
+ y2="4.2702327"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.319549,0.000000,0.000000,1.299013,-3.106200,-1.336165)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2896"
+ id="linearGradient2902"
+ x1="14.584077"
+ y1="1.6392649"
+ x2="14.552828"
+ y2="2.4912448"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,1.594214,0.000000,-0.790249)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2906"
+ id="linearGradient2912"
+ x1="13.354311"
+ y1="1.4866425"
+ x2="14.075844"
+ y2="2.4017651"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.000000,0.000000,0.000000,1.184816,0.000000,-0.727880)" />
+ <inkscape:perspective
+ id="perspective2836"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.046729,0,0,1.55761,-13.655784,9.8889664)"
+ r="17.171415"
+ fy="2.8969381"
+ fx="19.701141"
+ cy="2.8969381"
+ cx="19.701141"
+ id="radialGradient8656"
+ xlink:href="#linearGradient8650"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient8650"
+ inkscape:collect="always">
+ <stop
+ id="stop8652"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop8654"
+ offset="1"
+ style="stop-color:#ffffff;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2591"
+ id="radialGradient2597"
+ cx="22.291636"
+ cy="32.797512"
+ fx="22.291636"
+ fy="32.797512"
+ r="16.9562"
+ gradientTransform="matrix(0.843022,0,0,1.020168,10.361504,7.8188723)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient2591">
+ <stop
+ style="stop-color:#73d216"
+ offset="0"
+ id="stop2593" />
+ <stop
+ style="stop-color:#4e9a06"
+ offset="1.0000000"
+ id="stop2595" />
+ </linearGradient>
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+ r="15.644737"
+ fy="36.421127"
+ fx="24.837126"
+ cy="36.421127"
+ cx="24.837126"
+ id="radialGradient8668"
+ xlink:href="#linearGradient8662"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient8662"
+ inkscape:collect="always">
+ <stop
+ id="stop8664"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop8666"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <radialGradient
+ r="15.644737"
+ fy="36.421127"
+ fx="24.837126"
+ cy="36.421127"
+ cx="24.837126"
+ gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
+ gradientUnits="userSpaceOnUse"
+ id="radialGradient2856"
+ xlink:href="#linearGradient8662"
+ inkscape:collect="always" />
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-y="32"
+ inkscape:window-x="0"
+ inkscape:window-height="846"
+ inkscape:window-width="1440"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ showgrid="false"
+ inkscape:current-layer="layer5"
+ inkscape:cy="24"
+ inkscape:cx="1.4899329"
+ inkscape:zoom="12.416667"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ borderopacity="0.25490196"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ inkscape:showpageshadow="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>New Bookmark</dc:title>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>bookmark</rdf:li>
+ <rdf:li>remember</rdf:li>
+ <rdf:li>favorite</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Andreas Nilsson</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source />
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:contributor>
+ <dc:description>create bookmark action</dc:description>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/publicdomain/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer6"
+ inkscape:label="Shadow">
+ <g
+ style="display:inline"
+ id="g5022"
+ transform="matrix(2.165152e-2,0,0,1.485743e-2,43.0076,42.68539)">
+ <rect
+ y="-150.69685"
+ x="-1559.2523"
+ height="478.35718"
+ width="1339.6335"
+ id="rect4173"
+ style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path5058"
+ d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+ id="path5018"
+ sodipodi:nodetypes="cccc" />
+ </g>
+ </g>
+ <g
+ style="display:inline"
+ inkscape:groupmode="layer"
+ inkscape:label="Base"
+ id="layer1">
+ <rect
+ style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ id="rect15391"
+ width="34.875000"
+ height="41.063431"
+ x="6.5000000"
+ y="3.5000000"
+ ry="1.1490481"
+ rx="1.1490486" />
+ <rect
+ style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+ id="rect15660"
+ width="32.937012"
+ height="39.028210"
+ x="7.5024552"
+ y="4.5010486"
+ ry="0.14904849"
+ rx="0.14904852" />
+ <path
+ style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.98855311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.017543854"
+ d="M 11.505723,5.4942766 L 11.505723,43.400869"
+ id="path15672"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.20467831"
+ d="M 12.500000,5.0205154 L 12.500000,43.038228"
+ id="path15674"
+ sodipodi:nodetypes="cc" />
+ </g>
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Text"
+ style="display:inline">
+ <g
+ id="g2188">
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15686"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="9.0000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15688"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="11.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15690"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="13.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15692"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="15.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15694"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="17.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
+ id="rect15696"
+ width="20.000006"
+ height="1.0000000"
+ x="15.999994"
+ y="19.000000"
+ rx="0.13778631"
+ ry="0.065390877" />
+ <rect
+ style="color:#000000...
[truncated message content] |
|
From: <cur...@us...> - 2010-05-07 19:06:43
|
Revision: 66
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=66&view=rev
Author: cursorstar
Date: 2010-05-07 19:06:35 +0000 (Fri, 07 May 2010)
Log Message:
-----------
Use wxRibbonBar istead of wxMenu.
(Keeping many bugs)
Modified Paths:
--------------
trunk/wxdevcenter/Makefile.am
trunk/wxdevcenter/Makefile.in
trunk/wxdevcenter/aclocal.m4
trunk/wxdevcenter/config.h.in
trunk/wxdevcenter/configure
trunk/wxdevcenter/configure.ac
trunk/wxdevcenter/plugins/Makefile.in
trunk/wxdevcenter/plugins/bitmap/Makefile.in
trunk/wxdevcenter/plugins/bitmap/bitmap.cpp
trunk/wxdevcenter/plugins/text/Makefile.in
trunk/wxdevcenter/plugins/text/editctrl.cpp
trunk/wxdevcenter/plugins/text/editctrl.hpp
trunk/wxdevcenter/plugins/text/text.cpp
trunk/wxdevcenter/plugins/text/text.hpp
trunk/wxdevcenter/share/Makefile.in
trunk/wxdevcenter/share/xrc/Makefile.in
trunk/wxdevcenter/src/Makefile.in
trunk/wxdevcenter/src/application.cpp
trunk/wxdevcenter/src/application.hpp
trunk/wxdevcenter/src/docview/Makefile.in
trunk/wxdevcenter/src/docview/document.cpp
trunk/wxdevcenter/src/docview/document.hpp
trunk/wxdevcenter/src/docview/view.cpp
trunk/wxdevcenter/src/docview/view.hpp
trunk/wxdevcenter/src/sys/Makefile.in
trunk/wxdevcenter/src/sys/action.cpp
trunk/wxdevcenter/src/sys/action.hpp
trunk/wxdevcenter/src/sys/search.cpp
trunk/wxdevcenter/src/sys/search.hpp
trunk/wxdevcenter/src/tools/Makefile
trunk/wxdevcenter/src/tools/Makefile.in
trunk/wxdevcenter/src/ui/Makefile.in
trunk/wxdevcenter/src/ui/dialog/Makefile.in
trunk/wxdevcenter/src/ui/frame.cpp
trunk/wxdevcenter/src/ui/frame.hpp
trunk/wxdevcenter/src/ui/workbar.cpp
trunk/wxdevcenter/src/uistd/Makefile.in
trunk/wxdevcenter/src/uistd/stdframe.cpp
trunk/wxdevcenter/src/uistd/stdframe.hpp
Modified: trunk/wxdevcenter/Makefile.am
===================================================================
--- trunk/wxdevcenter/Makefile.am 2010-04-21 18:48:27 UTC (rev 65)
+++ trunk/wxdevcenter/Makefile.am 2010-05-07 19:06:35 UTC (rev 66)
@@ -24,7 +24,7 @@
# overide default process to create pch
-all-local: src/wxdevcenter.hpp.gch
+#all-local: src/wxdevcenter.hpp.gch
-src/wxdevcenter.hpp.gch:
- cd src && $(MAKE) $(AM_MAKEFLAGS) wxdevcenter.hpp.gch
+#src/wxdevcenter.hpp.gch:
+# cd src && $(MAKE) $(AM_MAKEFLAGS) wxdevcenter.hpp.gch
Modified: trunk/wxdevcenter/Makefile.in
===================================================================
--- trunk/wxdevcenter/Makefile.in 2010-04-21 18:48:27 UTC (rev 65)
+++ trunk/wxdevcenter/Makefile.in 2010-05-07 19:06:35 UTC (rev 66)
@@ -173,6 +173,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
@@ -624,7 +625,7 @@
exit 1; } >&2
check-am: all-am
check: check-recursive
-all-am: Makefile $(DATA) config.h all-local
+all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(wxdevcenterdocdir)"; do \
@@ -728,22 +729,21 @@
install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am all-local am--refresh check check-am clean \
- clean-generic clean-libtool ctags ctags-recursive dist \
- dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \
- dist-tarZ dist-zip distcheck distclean distclean-generic \
- distclean-hdr distclean-libtool distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-data install-data-am \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip install-wxdevcenterdocDATA \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
- uninstall-wxdevcenterdocDATA
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
+ distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip install-wxdevcenterdocDATA installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-wxdevcenterdocDATA
# Copy all the spec files. Of cource, only one is actually used.
@@ -755,10 +755,10 @@
done
# overide default process to create pch
-all-local: src/wxdevcenter.hpp.gch
+#all-local: src/wxdevcenter.hpp.gch
-src/wxdevcenter.hpp.gch:
- cd src && $(MAKE) $(AM_MAKEFLAGS) wxdevcenter.hpp.gch
+#src/wxdevcenter.hpp.gch:
+# cd src && $(MAKE) $(AM_MAKEFLAGS) wxdevcenter.hpp.gch
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: trunk/wxdevcenter/aclocal.m4
===================================================================
--- trunk/wxdevcenter/aclocal.m4 2010-04-21 18:48:27 UTC (rev 65)
+++ trunk/wxdevcenter/aclocal.m4 2010-05-07 19:06:35 UTC (rev 66)
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
Modified: trunk/wxdevcenter/config.h.in
===================================================================
--- trunk/wxdevcenter/config.h.in 2010-04-21 18:48:27 UTC (rev 65)
+++ trunk/wxdevcenter/config.h.in 2010-05-07 19:06:35 UTC (rev 66)
@@ -70,6 +70,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
Modified: trunk/wxdevcenter/configure
===================================================================
--- trunk/wxdevcenter/configure 2010-04-21 18:48:27 UTC (rev 65)
+++ trunk/wxdevcenter/configure 2010-05-07 19:06:35 UTC (rev 66)
@@ -1,18 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for wxdevcenter 0.1.
+# Generated by GNU Autoconf 2.65 for wxdevcenter 0.1.
#
+#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
# Be more Bourne compatible
DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -20,23 +24,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
+ case `(set -o) 2>/dev/null` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
esac
-
fi
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
as_nl='
'
export as_nl
@@ -44,7 +40,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='print -r --'
+ as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
as_echo='printf %s\n'
as_echo_n='printf %s'
else
@@ -55,7 +57,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
- case $arg in
+ case $arg in #(
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -78,14 +80,7 @@
}
fi
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
# there to prevent editors from complaining about space-tab.
@@ -94,15 +89,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ done
IFS=$as_save_IFS
;;
@@ -114,12 +109,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
- { (exit 1); exit 1; }
+ exit 1
fi
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there. '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
done
PS1='$ '
PS2='> '
@@ -131,330 +130,299 @@
LANGUAGE=C
export LANGUAGE
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{
- s//\1/
- q
- }
- /^X\/\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\/\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'`
-
# CDPATH.
-$as_unset CDPATH
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
if test "x$CONFIG_SHELL" = x; then
- if (eval ":") 2>/dev/null; then
- as_have_required=yes
+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ emulate sh
+ NULLCMD=:
+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
else
- as_have_required=no
+ case \`(set -o) 2>/dev/null\` in #(
+ *posix*) :
+ set -o posix ;; #(
+ *) :
+ ;;
+esac
fi
+"
+ as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
- if test $as_have_required = yes && (eval ":
-(as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
-fi
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
else
- exitcode=1
- echo as_func_ret_success failed.
+ exitcode=1; echo positional parameters were not saved.
fi
-
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+test x\$exitcode = x0 || exit 1"
+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
else
- exitcode=1
- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
- as_lineno_1=\$LINENO
- as_lineno_2=\$LINENO
- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- case $as_dir in
+ as_found=:
+ case $as_dir in #(
/*)
for as_base in sh bash ksh sh5; do
- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+ # Try only shells that exist, to save several forks.
+ as_shell=$as_dir/$as_base
+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ CONFIG_SHELL=$as_shell as_have_required=yes
+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+ break 2
+fi
+fi
done;;
esac
+ as_found=false
done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
IFS=$as_save_IFS
- for as_shell in $as_candidate_shells $SHELL; do
- # Try only shells that exist, to save several forks.
- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- { ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
+ if test "x$CONFIG_SHELL" != x; then :
+ # We cannot yet assume a decent shell, so we have to provide a
+ # neutralization value for shells without unset; and this also
+ # works around shells that cannot unset nonexistent variables.
+ BASH_ENV=/dev/null
+ ENV=/dev/null
+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
-
-:
-_ASEOF
-}; then
- CONFIG_SHELL=$as_shell
- as_have_required=yes
- if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
- setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in
- *posix*) set -o posix ;;
-esac
-
+ if test x$as_have_required = xno; then :
+ $as_echo "$0: This script requires a shell more modern than all"
+ $as_echo "$0: the shells that I found on your system."
+ if test x${ZSH_VERSION+set} = xset ; then
+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ else
+ $as_echo "$0: Please tell bug...@gn... about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+ fi
+ exit 1
fi
-
-
-:
-(as_func_return () {
- (exit $1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
-else
- exitcode=1
- echo as_func_success failed.
fi
-
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
-if as_func_ret_success; then
- :
-else
- exitcode=1
- echo as_func_ret_success failed.
-fi
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+ { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+ return $1
+} # as_fn_set_status
-if ( set x; as_func_ret_success y && test x = "$1" ); then
- :
-else
- exitcode=1
- echo positional parameters were not saved.
-fi
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+ set +e
+ as_fn_set_status $1
+ exit $1
+} # as_fn_exit
-test $exitcode = 0) || { (exit 1); exit 1; }
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
-(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
+ test -d "$as_dir" || eval $as_mkdir_p || {
+ as_dirs=
+ while :; do
+ case $as_dir in #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *) as_qdir=$as_dir;;
+ esac
+ as_dirs="'$as_qdir' $as_dirs"
+ as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-_ASEOF
-}; then
- break
-fi
-fi
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+ eval 'as_fn_append ()
+ {
+ eval $1+=\$2
+ }'
+else
+ as_fn_append ()
+ {
+ eval $1=\$$1\$2
+ }
+fi # as_fn_append
- done
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+ eval 'as_fn_arith ()
+ {
+ as_val=$(( $* ))
+ }'
+else
+ as_fn_arith ()
+ {
+ as_val=`expr "$@" || test $? -eq 1`
+ }
+fi # as_fn_arith
- if test "x$CONFIG_SHELL" != x; then
- for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+ as_status=$?; test $as_status -eq 0 && as_status=1
+ if test "$3"; then
+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+} # as_fn_error
- if test $as_have_required = no; then
- echo This script requires a shell more modern than all the
- echo shells that I found on your system. Please install a
- echo modern shell, or manually run the script under such a
- echo shell if you do have one.
- { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
- (exit \$1)
-}
-as_func_success () {
- as_func_return 0
-}
-as_func_failure () {
- as_func_return 1
-}
-as_func_ret_success () {
- return 0
-}
-as_func_ret_failure () {
- return 1
-}
-
-exitcode=0
-if as_func_success; then
- :
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
+ as_expr=expr
else
- exitcode=1
- echo as_func_success failed.
+ as_expr=false
fi
-if as_func_failure; then
- exitcode=1
- echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
- :
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+ as_basename=basename
else
- exitcode=1
- echo as_func_ret_success failed.
+ as_basename=false
fi
-if as_func_ret_failure; then
- exitcode=1
- echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
- :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+ as_dirname=dirname
else
- exitcode=1
- echo positional parameters were not saved.
+ as_dirname=false
fi
-test \$exitcode = 0") || {
- echo No shell found that supports shell functions.
- echo Please tell bug...@gn... about your system,
- echo including any error possibly output before this message.
- echo This can help us improve future autoconf versions.
- echo Configuration will now proceed without shell functions.
-}
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\/\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line after each line using $LINENO; the second 'sed'
- # does the real work. The second script uses 'N' to pair each
- # line-number line with the line containing $LINENO, and appends
- # trailing '-' during substitution so that $LINENO is not a special
- # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # scripts with optimization help from Paolo Bonzini. Blame Lee
- # E. McMahon (1931-1989) for sed's syntax. :-)
+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
sed -n '
p
/[$]LINENO/=
@@ -471,8 +439,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
@@ -482,29 +449,18 @@
exit
}
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
- as_dirname=dirname
-else
- as_dirname=false
-fi
-
ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
-n*)
- case `echo 'x\c'` in
+ case `echo 'xy\c'` in
*c*) ECHO_T=' ';; # ECHO_T is single tab character.
- *) ECHO_C='\c';;
+ xy) ECHO_C='\c';;
+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
+ ECHO_T=' ';;
esac;;
*)
ECHO_N='-n';;
esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
- test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
-else
- as_expr=false
-fi
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
@@ -534,7 +490,7 @@
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
+ as_mkdir_p='mkdir -p "$as_dir"'
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
@@ -553,10 +509,10 @@
if test -d "$1"; then
test -d "$1/.";
else
- case $1 in
+ case $1 in #(
-*)set "./$1";;
esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
@@ -571,7 +527,6 @@
-
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -720,7 +675,8 @@
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -738,7 +694,6 @@
subdirs=
MFLAGS=
MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='wxdevcenter'
@@ -746,6 +701,7 @@
PACKAGE_VERSION='0.1'
PACKAGE_STRING='wxdevcenter 0.1'
PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
# Factoring default headers for most tests.
ac_includes_default="\
@@ -942,6 +898,7 @@
program_transform_name
prefix
exec_prefix
+PACKAGE_URL
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
@@ -1087,8 +1044,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1114,8 +1070,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid feature name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1319,8 +1274,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1336,8 +1290,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "invalid package name: $ac_useropt"
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
@@ -1367,17 +1320,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
+ -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
;;
*=*)
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
@@ -1394,15 +1347,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "missing argument to $ac_option"
fi
if test -n "$ac_unrecognized_opts"; then
case $enable_option_checking in
no) ;;
- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
- { (exit 1); exit 1; }; } ;;
+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
@@ -1425,8 +1376,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
done
# There might be people who depend on the old broken behavior: `$host'
@@ -1456,11 +1406,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { $as_echo "$as_me: error: working directory cannot be determined" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "working directory cannot be determined"
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "pwd does not report name of working directory"
# Find the source files, if location was not specified.
@@ -1499,13 +1447,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1636,7 +1582,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
CXX C++ compiler command
@@ -1651,6 +1597,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
+Report bugs to the package provider.
_ACEOF
ac_status=$?
fi
@@ -1714,21 +1661,493 @@
if $ac_init_version; then
cat <<\_ACEOF
wxdevcenter configure 0.1
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
exit
fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext
+ if { { ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_compile") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_header_compiler=yes
+else
+ ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ ac_header_preproc=yes
+else
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+ yes:no: )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+ ;;
+esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by wxdevcenter $as_me 0.1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -1764,8 +2183,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
-done
+ $as_echo "PATH: $as_dir"
+ done
IFS=$as_save_IFS
} >&5
@@ -1802,9 +2221,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ as_fn_append ac_configure_args1 " '$ac_arg'"
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
@@ -1820,13 +2239,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
- ac_configure_args="$ac_configure_args '$ac_arg'"
+ as_fn_append ac_configure_args " '$ac_arg'"
;;
esac
done
done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
@@ -1851,13 +2270,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
- *) $as_unset $ac_var ;;
+ *) { eval $ac_var=; unset $ac_var;} ;;
esac ;;
esac
done
@@ -1929,40 +2348,42 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
done
ac_signal=0
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -f -r conftest* confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
+
# Predefined preprocessor variables.
cat >>confdefs.h <<_ACEOF
#define PACKAGE_NAME "$PACKAGE_NAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_VERSION "$PACKAGE_VERSION"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_STRING "$PACKAGE_STRING"
_ACEOF
-
cat >>confdefs.h <<_ACEOF
#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
_ACEOF
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
ac_site_file1=NONE
@@ -1979,8 +2400,8 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
@@ -1988,10 +2409,10 @@
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -1999,7 +2420,7 @@
esac
fi
else
- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -2014,11 +2435,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
@@ -2028,17 +2449,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
ac_cache_corrupted=:
else
- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
eval $ac_var=\$ac_old_val
fi
- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
@@ -2050,44 +2471,21 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
esac
fi
done
if $ac_cache_corrupted; then
- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2100,24 +2498,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
+ for ac_t in install-sh install.sh shtool; do
+ if test -f "$ac_dir/$ac_t"; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/$ac_t -c"
+ break 2
+ fi
+ done
done
if test -z "$ac_aux_dir"; then
- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
fi
# These three variables are undocumented and unsupported,
@@ -2143,10 +2533,10 @@
# OS/2's system install, which ...
[truncated message content] |
|
From: <cur...@us...> - 2010-04-21 18:48:33
|
Revision: 65
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=65&view=rev
Author: cursorstar
Date: 2010-04-21 18:48:27 +0000 (Wed, 21 Apr 2010)
Log Message:
-----------
Use official wxStyledTextCtrl instead of personnal wxScintillaCtrl.
Remove widgets subdirectory.
Removed Paths:
-------------
trunk/wxdevcenter/src/widgets/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2010-04-21 18:41:36
|
Revision: 64
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=64&view=rev
Author: cursorstar
Date: 2010-04-21 18:41:29 +0000 (Wed, 21 Apr 2010)
Log Message:
-----------
Use official wxStyledTextCtrl instead of personnal wxScintillaCtrl.
Remove widgets subdirectory.
Modified Paths:
--------------
trunk/wxdevcenter/configure
trunk/wxdevcenter/configure.ac
trunk/wxdevcenter/plugins/text/Makefile.am
trunk/wxdevcenter/plugins/text/Makefile.in
trunk/wxdevcenter/plugins/text/editctrl.cpp
trunk/wxdevcenter/plugins/text/editctrl.hpp
trunk/wxdevcenter/plugins/text/prefs.hpp
trunk/wxdevcenter/plugins/text/text.cpp
trunk/wxdevcenter/plugins/text/text.hpp
trunk/wxdevcenter/plugins/text/view.cpp
trunk/wxdevcenter/plugins/text/view.hpp
trunk/wxdevcenter/src/Makefile.am
trunk/wxdevcenter/src/Makefile.in
trunk/wxdevcenter/src/tools/Makefile
Added Paths:
-----------
trunk/wxdevcenter/plugins/text/markbar.cpp
trunk/wxdevcenter/plugins/text/markbar.hpp
Modified: trunk/wxdevcenter/configure
===================================================================
--- trunk/wxdevcenter/configure 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/configure 2010-04-21 18:41:29 UTC (rev 64)
@@ -6017,7 +6017,7 @@
$as_echo "$as_me: error: wxWidgets is required. Try --with-wx-config." >&2;}
{ (exit 1); exit 1; }; }
fi
-WXLIBS="xrc,aui,qa,adv,core,xml,net,base"
+WXLIBS="stc,xrc,aui,qa,adv,core,xml,net,base"
WX_CPPFLAGS="`$WXCONFIG --cppflags $WXLIBS`"
WX_CXXFLAGS="`$WXCONFIG --cxxflags $WXLIBS`"
WX_LIBS="`$WXCONFIG --libs $WXLIBS`"
@@ -19733,7 +19733,7 @@
-ac_config_files="$ac_config_files Makefile src/Makefile src/docview/Makefile src/sys/Makefile src/tools/Makefile src/ui/Makefile src/ui/dialog/Makefile src/uistd/Makefile src/widgets/Makefile src/widgets/wxscintilla/Makefile plugins/Makefile plugins/text/Makefile plugins/bitmap/Makefile share/Makefile share/xrc/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile src/Makefile src/docview/Makefile src/sys/Makefile src/tools/Makefile src/ui/Makefile src/ui/dialog/Makefile src/uistd/Makefile plugins/Makefile plugins/text/Makefile plugins/bitmap/Makefile share/Makefile share/xrc/Makefile po/Makefile.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -20757,8 +20757,6 @@
"src/ui/Makefile") CONFIG_FILES="$CONFIG_FILES src/ui/Makefile" ;;
"src/ui/dialog/Makefile") CONFIG_FILES="$CONFIG_FILES src/ui/dialog/Makefile" ;;
"src/uistd/Makefile") CONFIG_FILES="$CONFIG_FILES src/uistd/Makefile" ;;
- "src/widgets/Makefile") CONFIG_FILES="$CONFIG_FILES src/widgets/Makefile" ;;
- "src/widgets/wxscintilla/Makefile") CONFIG_FILES="$CONFIG_FILES src/widgets/wxscintilla/Makefile" ;;
"plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
"plugins/text/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/text/Makefile" ;;
"plugins/bitmap/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/bitmap/Makefile" ;;
Modified: trunk/wxdevcenter/configure.ac
===================================================================
--- trunk/wxdevcenter/configure.ac 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/configure.ac 2010-04-21 18:41:29 UTC (rev 64)
@@ -29,7 +29,7 @@
AC_MSG_RESULT([not found])
AC_MSG_ERROR([wxWidgets is required. Try --with-wx-config.])
fi
-WXLIBS="xrc,aui,qa,adv,core,xml,net,base"
+WXLIBS="stc,xrc,aui,qa,adv,core,xml,net,base"
WX_CPPFLAGS="`$WXCONFIG --cppflags $WXLIBS`"
WX_CXXFLAGS="`$WXCONFIG --cxxflags $WXLIBS`"
WX_LIBS="`$WXCONFIG --libs $WXLIBS`"
@@ -82,8 +82,6 @@
src/ui/Makefile
src/ui/dialog/Makefile
src/uistd/Makefile
-src/widgets/Makefile
-src/widgets/wxscintilla/Makefile
plugins/Makefile
plugins/text/Makefile
plugins/bitmap/Makefile
Modified: trunk/wxdevcenter/plugins/text/Makefile.am
===================================================================
--- trunk/wxdevcenter/plugins/text/Makefile.am 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/plugins/text/Makefile.am 2010-04-21 18:41:29 UTC (rev 64)
@@ -1,7 +1,6 @@
## File created by the gnome-build tools
-INCLUDES = \
- $(WX_CXXFLAGS)
+INCLUDES = $(WX_CXXFLAGS)
plugindir = $(libdir)/wxdevcenter/plugins
@@ -18,16 +17,15 @@
prefs.cpp \
bookmark.hpp \
bookmark.cpp \
+ markbar.cpp \
+ markbar.hpp \
text-search.hpp \
text-search.cpp
libdctext_la_CXXFLAGS = \
- -Iscintilla/include \
- -Iscintilla/src \
-I$(top_srcdir)/src
libdctext_la_INCLUDES = -I$(top_srcdir)/src
-libdctext_la_LDFLAGS = -L$(top_srcdir)/src -L$(top_srcdir)/src/widgets
-libdctext_la_LIBADD = $(WX_LIBS) -lwxdcwidgets
-#-l$(top_srcdir)/src/wxdevcenter
+libdctext_la_LDFLAGS = -L$(top_srcdir)/src
+libdctext_la_LIBADD = $(WX_LIBS)
Modified: trunk/wxdevcenter/plugins/text/Makefile.in
===================================================================
--- trunk/wxdevcenter/plugins/text/Makefile.in 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/plugins/text/Makefile.in 2010-04-21 18:41:29 UTC (rev 64)
@@ -56,7 +56,7 @@
am_libdctext_la_OBJECTS = libdctext_la-editctrl.lo \
libdctext_la-text.lo libdctext_la-view.lo \
libdctext_la-prefs.lo libdctext_la-bookmark.lo \
- libdctext_la-text-search.lo
+ libdctext_la-markbar.lo libdctext_la-text-search.lo
libdctext_la_OBJECTS = $(am_libdctext_la_OBJECTS)
libdctext_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libdctext_la_CXXFLAGS) \
@@ -253,9 +253,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = \
- $(WX_CXXFLAGS)
-
+INCLUDES = $(WX_CXXFLAGS)
plugindir = $(libdir)/wxdevcenter/plugins
plugin_LTLIBRARIES = libdctext.la
libdctext_la_SOURCES = \
@@ -269,17 +267,17 @@
prefs.cpp \
bookmark.hpp \
bookmark.cpp \
+ markbar.cpp \
+ markbar.hpp \
text-search.hpp \
text-search.cpp
libdctext_la_CXXFLAGS = \
- -Iscintilla/include \
- -Iscintilla/src \
-I$(top_srcdir)/src
libdctext_la_INCLUDES = -I$(top_srcdir)/src
-libdctext_la_LDFLAGS = -L$(top_srcdir)/src -L$(top_srcdir)/src/widgets
-libdctext_la_LIBADD = $(WX_LIBS) -lwxdcwidgets
+libdctext_la_LDFLAGS = -L$(top_srcdir)/src
+libdctext_la_LIBADD = $(WX_LIBS)
all: all-am
.SUFFIXES:
@@ -351,6 +349,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdctext_la-bookmark.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdctext_la-editctrl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdctext_la-markbar.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdctext_la-prefs.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdctext_la-text-search.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdctext_la-text.Plo@am__quote@
@@ -412,6 +411,13 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdctext_la_CXXFLAGS) $(CXXFLAGS) -c -o libdctext_la-bookmark.lo `test -f 'bookmark.cpp' || echo '$(srcdir)/'`bookmark.cpp
+libdctext_la-markbar.lo: markbar.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdctext_la_CXXFLAGS) $(CXXFLAGS) -MT libdctext_la-markbar.lo -MD -MP -MF $(DEPDIR)/libdctext_la-markbar.Tpo -c -o libdctext_la-markbar.lo `test -f 'markbar.cpp' || echo '$(srcdir)/'`markbar.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libdctext_la-markbar.Tpo $(DEPDIR)/libdctext_la-markbar.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='markbar.cpp' object='libdctext_la-markbar.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdctext_la_CXXFLAGS) $(CXXFLAGS) -c -o libdctext_la-markbar.lo `test -f 'markbar.cpp' || echo '$(srcdir)/'`markbar.cpp
+
libdctext_la-text-search.lo: text-search.cpp
@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdctext_la_CXXFLAGS) $(CXXFLAGS) -MT libdctext_la-text-search.lo -MD -MP -MF $(DEPDIR)/libdctext_la-text-search.Tpo -c -o libdctext_la-text-search.lo `test -f 'text-search.cpp' || echo '$(srcdir)/'`text-search.cpp
@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libdctext_la-text-search.Tpo $(DEPDIR)/libdctext_la-text-search.Plo
@@ -616,7 +622,6 @@
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags uninstall uninstall-am uninstall-pluginLTLIBRARIES
-#-l$(top_srcdir)/src/wxdevcenter
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: trunk/wxdevcenter/plugins/text/editctrl.cpp
===================================================================
--- trunk/wxdevcenter/plugins/text/editctrl.cpp 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/plugins/text/editctrl.cpp 2010-04-21 18:41:29 UTC (rev 64)
@@ -19,9 +19,9 @@
#include "wxdevcenter.hpp"
+#include "prefs.hpp"
#include "editctrl.hpp"
#include "view.hpp"
-#include "prefs.hpp"
#include <wx/filename.h>
@@ -29,7 +29,7 @@
// dcEditCtrl
//==========================================================================
-BEGIN_EVENT_TABLE (dcEditCtrl, wxScintillaCtrl)
+BEGIN_EVENT_TABLE (dcEditCtrl, wxStyledTextCtrl)
// stc
EVT_STC_MODIFIED(wxID_ANY, dcEditCtrl::OnModified)
EVT_STC_CHARADDED (wxID_ANY, dcEditCtrl::OnCharAdded)
@@ -70,7 +70,7 @@
const wxPoint &pos,
const wxSize &size,
long style)
- : wxScintillaCtrl (parent, id, pos, size, style) {
+ : wxStyledTextCtrl (parent, id, pos, size, style) {
// initialize language
m_language = NULL;
@@ -222,7 +222,7 @@
*/
//! misc
-void dcEditCtrl::OnMarginClick (wxScintillaEvent &event) {
+void dcEditCtrl::OnMarginClick (wxStyledTextEvent &event) {
if (event.GetMargin() == 2) {
int lineClick = LineFromPosition (event.GetPosition());
int levelClick = GetFoldLevel (lineClick);
@@ -232,7 +232,7 @@
}
}
-void dcEditCtrl::OnCharAdded (wxScintillaEvent &event) {
+void dcEditCtrl::OnCharAdded (wxStyledTextEvent &event) {
char chr = (char)event.GetKey();
int currentLine = GetCurrentLine();
// Change this if support for mac files with \r is needed
@@ -363,7 +363,7 @@
event.Skip();
}
-void dcEditCtrl::OnModified(wxScintillaEvent& event)
+void dcEditCtrl::OnModified(wxStyledTextEvent& event)
{
if(event.GetLinesAdded()!=0)
CalcLineNbMargin();
Modified: trunk/wxdevcenter/plugins/text/editctrl.hpp
===================================================================
--- trunk/wxdevcenter/plugins/text/editctrl.hpp 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/plugins/text/editctrl.hpp 2010-04-21 18:41:29 UTC (rev 64)
@@ -20,15 +20,17 @@
#ifndef _EDITCTRL_HPP_
#define _EDITCTRL_HPP_
-#include "widgets/wxscintilla/wxscintilla.h"
+#include <wx/stc/stc.h>
+
+
class LanguageProperty;
class dcTextView;
/**
* dcEditCtrl
*/
-class dcEditCtrl: public wxScintillaCtrl {
+class dcEditCtrl: public wxStyledTextCtrl {
friend class EditProperties;
friend class EditPrint;
friend class dcTextView;
@@ -104,8 +106,8 @@
//! extra
// void OnConvertEOL (wxCommandEvent &event);
// stc
- void OnMarginClick (wxScintillaEvent &event);
- void OnCharAdded (wxScintillaEvent &event);
+ void OnMarginClick (wxStyledTextEvent &event);
+ void OnCharAdded (wxStyledTextEvent &event);
int GetLineNumberMargin()const{return m_LineNrMargin;}
int GetFoldingMargin()const{return m_FoldingMargin;}
@@ -119,7 +121,7 @@
void SetTextView(dcTextView* view){m_textView = view;}
private:
- void OnModified(wxScintillaEvent& event);
+ void OnModified(wxStyledTextEvent& event);
void OnMouseLeftDown(wxMouseEvent& event);
void OnMouseLeftUp(wxMouseEvent& event);
Added: trunk/wxdevcenter/plugins/text/markbar.cpp
===================================================================
--- trunk/wxdevcenter/plugins/text/markbar.cpp (rev 0)
+++ trunk/wxdevcenter/plugins/text/markbar.cpp 2010-04-21 18:41:29 UTC (rev 64)
@@ -0,0 +1,448 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * wxmarkbar
+ * Copyright (C) Emilien KIA 2009 <emi...@fr...>
+ *
+ * wxmarkbar is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wxmarkbar is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <wx/wxprec.h>
+
+#include "markbar.hpp"
+
+#ifndef WX_PRECOMP
+ #include <wx/dcclient.h>
+#endif
+
+#include <iostream>
+
+wxDEFINE_EVENT(MARKBAR_ACTIVATED, wxMarkBarEvent);
+
+wxMarkBarEvent::wxMarkBarEvent():
+wxCommandEvent(MARKBAR_ACTIVATED, wxNOT_FOUND)
+{
+}
+
+wxMarkBarEvent::wxMarkBarEvent(int id, int markid, int pos, int category):
+wxCommandEvent(MARKBAR_ACTIVATED, id),
+markid(markid),
+pos(pos),
+category(category)
+{
+}
+
+
+wxMarkBarEvent::wxMarkBarEvent(const wxMarkBarEvent& event):
+wxCommandEvent(MARKBAR_ACTIVATED, event.GetId()),
+markid(event.markid),
+pos(event.pos),
+category(event.category)
+{
+}
+
+
+
+
+IMPLEMENT_DYNAMIC_CLASS(wxMarkBar, wxControl)
+
+BEGIN_EVENT_TABLE(wxMarkBar, wxControl)
+ EVT_PAINT(wxMarkBar::OnPaint)
+ EVT_SET_CURSOR(wxMarkBar::OnSetCursor)
+ EVT_MOTION(wxMarkBar::OnMouseMove)
+ EVT_ENTER_WINDOW(wxMarkBar::OnMouseEnter)
+ EVT_LEAVE_WINDOW(wxMarkBar::OnMouseLeave)
+ EVT_LEFT_UP(wxMarkBar::OnMouseLeftUp)
+END_EVENT_TABLE()
+
+
+wxMarkBar::wxMarkBar():
+wxControl(),
+min(0),
+max(100),
+idxCount(0),
+shownCategories(0),
+focused(markers.end())
+{
+}
+
+wxMarkBar::wxMarkBar(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style, const wxString &name):
+wxControl(),
+min(0),
+max(100),
+idxCount(0),
+shownCategories(0),
+focused(markers.end())
+{
+ Create(parent, id, pos, size, style, name);
+}
+
+wxMarkBar::wxMarkBar(wxWindow *parent, wxWindowID id, int minValue, int maxValue, const wxPoint &pos, const wxSize &size, long style, const wxString &name):
+wxControl(),
+min(min),
+max(max),
+idxCount(0),
+shownCategories(0),
+focused(markers.end())
+{
+ Create(parent, id, pos, size, style, name);
+}
+
+bool wxMarkBar::Create(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style, const wxString &name)
+{
+ return Create(parent, id, 0, 1, pos, size, style, name);
+}
+
+bool wxMarkBar::Create(wxWindow *parent, wxWindowID id, int minValue, int maxValue, const wxPoint &pos, const wxSize &size, long style, const wxString &name)
+{
+ // Set vertical style by default
+ if((style&(MB_VERTICAL|MB_HORIZONTAL))==(MB_VERTICAL|MB_HORIZONTAL))
+ style &= ~(MB_VERTICAL|MB_HORIZONTAL);
+ if((style&(MB_VERTICAL|MB_HORIZONTAL))==0)
+ style |= MB_VERTICAL;
+
+ this->min = minValue;
+ this->max = maxValue;
+
+ if(!wxWindow::Create(parent, id, pos, size, style, name))
+ return false;
+
+ if(style&MB_VERTICAL)
+ {
+ if(size.x>0)
+ SetMinSize(wxSize(size.x, 0));
+ }
+ else
+ {
+ if(size.y>0)
+ SetMinSize(wxSize(0, size.y));
+ }
+
+ SetCategory(0, wxColour(192, 192, 192), wxColour(192, 192, 192, 128));
+
+ return true;
+}
+
+wxMarkBar::~wxMarkBar()
+{
+}
+
+void wxMarkBar::SetOrientation(int orient)
+{
+ if((orient&(MB_VERTICAL|MB_HORIZONTAL))==(MB_VERTICAL|MB_HORIZONTAL))
+ orient &= ~(MB_VERTICAL|MB_HORIZONTAL);
+ if((orient&(MB_VERTICAL|MB_HORIZONTAL))==0)
+ orient |= MB_VERTICAL;
+
+ SetWindowStyle( (GetWindowStyle() & ~(MB_VERTICAL|MB_HORIZONTAL)) | orient);
+ Refresh();
+}
+
+void wxMarkBar::SetMin(int min)
+{
+ this->min = min;
+ Refresh();
+}
+
+void wxMarkBar::SetMax(int max)
+{
+ this->max = max;
+ Refresh();
+}
+
+void wxMarkBar::Clear()
+{
+ markers.clear();
+ idxCount = 0;
+ Refresh();
+}
+
+int wxMarkBar::AddMarker(int pos, const wxString& name, int category)
+{
+ wxMarkBarMarker mark = {idxCount++, pos, category>=0&&category<=(sizeof(int)*8)?category:0, name};
+
+ markerList::iterator it = markers.begin();
+ for(;it!=markers.end(); it++)
+ if(it->pos>=pos)
+ break;
+ markers.insert(it, mark);
+ Refresh();
+ return mark.idx;
+}
+
+void wxMarkBar::RemoveMarker(int index)
+{
+ markerList::iterator it = find(index);
+ if(it!=markers.end())
+ markers.erase(it);
+ Refresh();
+}
+
+void wxMarkBar::RemoveMarker(int pos, int category)
+{
+ markerList::iterator it = markers.begin();
+ for(; it!=markers.end(); it++)
+ {
+ if(it->category==category && it->pos==pos)
+ {
+ markers.erase(it);
+ Refresh();
+ return;
+ }
+ }
+}
+
+void wxMarkBar::RemoveCategoryMarker(int category)
+{
+ markerList::iterator it1, it2;
+ for(it1=it2=markers.begin(); it1!=markers.end(); it1=it2)
+ {
+ it2++;
+ if(it1->category==category)
+ markers.erase(it1);
+ }
+ Refresh();
+}
+
+void wxMarkBar::SetMarkerPosition(int idx, int pos)
+{
+ markerList::iterator it = find(idx);
+ if(it!=markers.end())
+ it->pos = pos;
+ Refresh();
+}
+
+void wxMarkBar::SetMarkerName(int idx, const wxString& name)
+{
+ markerList::iterator it = find(idx);
+ if(it!=markers.end())
+ it->name = name;
+}
+
+void wxMarkBar::SetMarkerCategory(int idx, int category)
+{
+ markerList::iterator it = find(idx);
+ if(it!=markers.end())
+ it->category = category;
+ Refresh();
+}
+
+int wxMarkBar::GetMarkerPosition(int idx)const
+{
+ markerList::const_iterator it = find(idx);
+ if(it!=markers.end())
+ return it->pos;
+ return -1;
+}
+
+wxString wxMarkBar::GetMarkerName(int idx)const
+{
+ markerList::const_iterator it = find(idx);
+ if(it!=markers.end())
+ return it->name;
+ return wxT("");
+}
+
+int wxMarkBar::GetMarkerCategory(int idx)const
+{
+ markerList::const_iterator it = find(idx);
+ if(it!=markers.end())
+ return it->category;
+ return -1;
+}
+
+wxMarkBar::markerList::const_iterator wxMarkBar::find(int index)const
+{
+ markerList::const_iterator it = markers.begin();
+ for(;it!=markers.end(); it++)
+ if(it->idx==index)
+ break;
+ return it;
+}
+
+wxMarkBar::markerList::iterator wxMarkBar::find(int index)
+{
+ markerList::iterator it = markers.begin();
+ for(;it!=markers.end(); it++)
+ if(it->idx==index)
+ break;
+ return it;
+}
+
+// sz.y | yreal
+// --------+--------
+// max-min | pos-min
+
+#define WXMARKBAR_CALCPOSITION(clientsize, pos, min, max) (clientsize*(pos-min)/(max-min))
+#define WXMARKBAR_MARK_WIDTH 2
+
+void wxMarkBar::OnPaint(wxPaintEvent& event)
+{
+ wxSize sz = GetClientSize();
+ wxPaintDC dc(this);
+
+ if((GetWindowStyle()&MB_VERTICAL)!=0)
+ {
+ for(markerList::iterator it=markers.begin(); it!=markers.end(); it++)
+ {
+ if(InternalIsCategoryShown(it->category))
+ {
+ int y = WXMARKBAR_CALCPOSITION(sz.y, it->pos, min, max);
+ paintItemVertical(dc, *it, y, sz.x);
+ }
+ }
+ }
+ else
+ {
+ for(markerList::iterator it=markers.begin(); it!=markers.end(); it++)
+ {
+ if(InternalIsCategoryShown(it->category))
+ {
+ int x = WXMARKBAR_CALCPOSITION(sz.x, it->pos, min, max);
+ paintItemHorizontal(dc, *it, x, sz.y);
+ }
+ }
+ }
+}
+
+void wxMarkBar::paintItemVertical(wxDC& dc, wxMarkBarMarker& mark, int realpos, int clientwidth)
+{
+ wxPen pen(categories[mark.category].fore);
+ wxBrush brush(categories[mark.category].back);
+ wxDCPenChanger pc(dc, pen);
+ wxDCBrushChanger bc(dc, brush);
+ dc.DrawRectangle(1, realpos-WXMARKBAR_MARK_WIDTH, clientwidth-2, WXMARKBAR_MARK_WIDTH*2+1);
+}
+
+void wxMarkBar::paintItemHorizontal(wxDC& dc, wxMarkBarMarker& mark, int realpos, int clientheight)
+{
+ wxPen pen(categories[mark.category].fore);
+ wxBrush brush(categories[mark.category].back);
+ wxDCPenChanger pc(dc, pen);
+ wxDCBrushChanger bc(dc, brush);
+ dc.DrawRectangle(realpos-WXMARKBAR_MARK_WIDTH, 1, WXMARKBAR_MARK_WIDTH*2+1, clientheight-2);
+}
+
+void wxMarkBar::SetCategory(int category, wxColour fore, wxColour back, bool activable)
+{
+ if(category<0 ||category>(sizeof(int)*8))
+ return;
+
+ categories[category].fore = fore;
+ categories[category].back = back;
+ categories[category].activable = activable;
+
+ shownCategories |= 1<<category;
+}
+
+void wxMarkBar::ShowCategory(int category, bool show)
+{
+ if(category<0 ||category>(sizeof(int)*8))
+ return;
+
+ if(show)
+ shownCategories |= 1<<category;
+ else
+ shownCategories &= ~(1<<category);
+}
+
+void wxMarkBar::OnMouseEnter(wxMouseEvent& event)
+{
+ focused = InternalHitTest(event.GetPosition());
+ if(focused!=markers.end())
+ SetToolTip(focused->name);
+}
+
+void wxMarkBar::OnMouseLeave(wxMouseEvent& event)
+{
+ focused = markers.end();
+ UnsetToolTip();
+}
+
+void wxMarkBar::OnMouseMove(wxMouseEvent& event)
+{
+ focused = InternalHitTest(event.GetPosition());
+ if(focused!=markers.end())
+ SetToolTip(focused->name);
+ else
+ UnsetToolTip();
+}
+
+void wxMarkBar::OnMouseLeftUp(wxMouseEvent& event)
+{
+ if(focused!=markers.end())
+ {
+ if(categories[focused->category].activable)
+ {
+ wxMarkBarEvent evt(GetId(), focused->idx, focused->pos, focused->category);
+ ProcessEvent(evt);
+ }
+ }
+}
+
+wxMarkBar::markerList::const_iterator wxMarkBar::InternalHitTest(const wxPoint& pt)const
+{
+ wxSize csz = GetClientSize();
+ if(GetOrientation()==wxVERTICAL)
+ {
+ for(markerList::const_iterator it=markers.begin(); it!=markers.end(); it++)
+ {
+ if(InternalIsCategoryShown(it->category))
+ {
+ int pos = WXMARKBAR_CALCPOSITION(csz.y, it->pos, min, max);
+ if(pt.y>= pos-WXMARKBAR_MARK_WIDTH && pt.y<= pos+WXMARKBAR_MARK_WIDTH)
+ return it;
+ }
+ }
+ }
+ else
+ {
+ for(markerList::const_iterator it=markers.begin(); it!=markers.end(); it++)
+ {
+ if(InternalIsCategoryShown(it->category))
+ {
+ int pos = WXMARKBAR_CALCPOSITION(csz.x, it->pos, min, max);
+ if(pt.x>= pos-WXMARKBAR_MARK_WIDTH && pt.x<= pos+WXMARKBAR_MARK_WIDTH)
+ return it;
+ }
+ }
+ }
+ return markers.end();
+}
+
+int wxMarkBar::HitTest(const wxPoint& pt)const
+{
+ markerList::const_iterator it = InternalHitTest(pt);
+ if(it!=markers.end())
+ return it->idx;
+ else
+ return wxNOT_FOUND;
+}
+
+void wxMarkBar::OnSetCursor(wxSetCursorEvent& event)
+{
+ if(focused==markers.end())
+ event.SetCursor(wxCursor(wxCURSOR_ARROW));
+ else if(categories[focused->category].activable)
+ event.SetCursor(wxCursor(wxCURSOR_HAND));
+ else
+ event.SetCursor(wxCursor(wxCURSOR_ARROW));
+}
+
+void wxMarkBar::MoveMarkers(int pos, int offset)
+{
+ for(markerList::iterator it=markers.begin(); it!=markers.end(); it++)
+ {
+ if(it->pos>=pos)
+ it->pos+=offset;
+ }
+}
Added: trunk/wxdevcenter/plugins/text/markbar.hpp
===================================================================
--- trunk/wxdevcenter/plugins/text/markbar.hpp (rev 0)
+++ trunk/wxdevcenter/plugins/text/markbar.hpp 2010-04-21 18:41:29 UTC (rev 64)
@@ -0,0 +1,143 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * wxmarkbar
+ * Copyright (C) Emilien KIA 2009 <emi...@fr...>
+ *
+ * wxmarkbar is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wxmarkbar is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _MARKBAR_HPP_
+#define _MARKBAR_HPP_
+
+#include <wx/defs.h>
+#include <wx/control.h>
+
+#include <list>
+
+#define MB_HORIZONTAL wxHORIZONTAL
+#define MB_VERTICAL wxVERTICAL
+
+#define MB_DEFAULT_CATEGORY -1
+
+/**
+ * Mark bar control.
+ */
+class wxMarkBar: public wxControl
+{
+ DECLARE_EVENT_TABLE()
+ DECLARE_DYNAMIC_CLASS(wxMarkBar)
+public:
+ wxMarkBar();
+ wxMarkBar(wxWindow *parent, wxWindowID id, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=MB_VERTICAL, const wxString &name=wxT("wxMarkCtrl"));
+ wxMarkBar(wxWindow *parent, wxWindowID id, int minValue, int maxValue, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=MB_VERTICAL, const wxString &name=wxT("wxMarkCtrl"));
+ virtual bool Create(wxWindow *parent, wxWindowID id, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=MB_VERTICAL, const wxString &name=wxT("wxMarkCtrl"));
+ virtual bool Create(wxWindow *parent, wxWindowID id, int minValue, int maxValue, const wxPoint &pos=wxDefaultPosition, const wxSize &size=wxDefaultSize, long style=MB_VERTICAL, const wxString &name=wxT("wxMarkCtrl"));
+ virtual ~wxMarkBar();
+
+ int GetMin()const{return min;}
+ int GetMax()const{return max;}
+ void SetMin(int min);
+ void SetMax(int max);
+
+ int GetOrientation()const{return GetWindowStyle() & (MB_VERTICAL|MB_HORIZONTAL);}
+ void SetOrientation(int orient);
+
+ void Clear();
+ int AddMarker(int pos, const wxString& name=wxT(""), int category=MB_DEFAULT_CATEGORY);
+ void RemoveMarker(int pos, int category);
+ void RemoveMarker(int index);
+ void RemoveCategoryMarker(int category);
+ void SetMarkerPosition(int idx, int pos);
+ void SetMarkerName(int idx, const wxString& name);
+ void SetMarkerCategory(int idx, int category);
+ int GetMarkerPosition(int idx)const;
+ wxString GetMarkerName(int idx)const;
+ int GetMarkerCategory(int idx)const;
+
+ void SetCategory(int category, wxColour fore, wxColour back, bool activable=true);
+ void ShowCategory(int category, bool show = true);
+ void HideCategory(int category){ShowCategory(category, false);}
+ bool IsCategoryShown(int category)const{return category>=0&&category<=(sizeof(int)*8)?InternalIsCategoryShown(category):false;}
+
+ int HitTest(const wxPoint& pt)const;
+
+ void MoveMarkers(int pos, int offset);
+
+protected:
+ struct wxMarkBarMarker{
+ int idx, pos, category;
+ wxString name;
+ };
+
+ int min, max;
+ int idxCount;
+
+ typedef std::list<wxMarkBarMarker> markerList;
+ markerList markers;
+ markerList::const_iterator focused;
+
+ struct wxMarkBarCategory{
+ wxColour fore, back;
+ bool activable;
+ };
+ wxMarkBarCategory categories[sizeof(int)*8];
+ int shownCategories;
+
+ markerList::const_iterator find(int index)const;
+ markerList::iterator find(int index);
+ bool InternalIsCategoryShown(int category)const{return shownCategories&(1<<category)!=0;}
+
+ void OnSetCursor(wxSetCursorEvent& event);
+ void OnMouseEnter(wxMouseEvent& event);
+ void OnMouseLeave(wxMouseEvent& event);
+ void OnMouseMove(wxMouseEvent& event);
+ void OnMouseLeftUp(wxMouseEvent& event);
+ void OnPaint(wxPaintEvent& event);
+
+ void paintItemVertical(wxDC& dc, wxMarkBarMarker& mark, int realpos, int clientwidth);
+ void paintItemHorizontal(wxDC& dc, wxMarkBarMarker& mark, int realpos, int clientheight);
+ markerList::const_iterator InternalHitTest(const wxPoint& pt)const;
+};
+
+class wxMarkBarEvent : public wxCommandEvent
+{
+public:
+ wxMarkBarEvent();
+ wxMarkBarEvent(int id, int markid, int pos, int category);
+ wxMarkBarEvent(const wxMarkBarEvent& event);
+ virtual wxEvent* Clone ()const{return new wxMarkBarEvent(*this);}
+
+ int getMarkId()const{return markid;}
+ int getPosition()const{return pos;}
+ int getCategory()const{return category;}
+
+ void setMarkId(int markid){this->markid=markid;}
+ void setPosition(int pos){this->pos=pos;}
+ void setCategory(int category){this->category=category;}
+
+protected:
+ int markid;
+ int pos;
+ int category;
+};
+
+wxDECLARE_EVENT(MARKBAR_ACTIVATED, wxMarkBarEvent);
+
+#define wxMarkBarEventHandler(func) (&func)
+#define MARKBAR_CLICK(id, func) wx__DECLARE_EVT1(MARKBAR_ACTIVATED, id, wxMarkBarEventHandler(func))
+
+
+
+
+#endif // _MARKBAR_HPP_
Modified: trunk/wxdevcenter/plugins/text/prefs.hpp
===================================================================
--- trunk/wxdevcenter/plugins/text/prefs.hpp 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/plugins/text/prefs.hpp 2010-04-21 18:41:29 UTC (rev 64)
@@ -23,7 +23,7 @@
#include <map>
#include <vector>
-#include "widgets/wxscintilla/wxscintilla.h"
+#include <wx/stc/stc.h>
#include <wx/xrc/xmlres.h>
#include "ui/configui.hpp"
Modified: trunk/wxdevcenter/plugins/text/text.cpp
===================================================================
--- trunk/wxdevcenter/plugins/text/text.cpp 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/plugins/text/text.cpp 2010-04-21 18:41:29 UTC (rev 64)
@@ -10,7 +10,7 @@
#include <wx/sstream.h>
-#include "widgets/wxscintilla/wxscintilla.h"
+#include <wx/stc/stc.h>
#include <wx/cmdproc.h>
#include "editctrl.hpp"
@@ -20,7 +20,7 @@
/**
* Scintilla specific headers :
*/
-#include "widgets/wxscintilla/scintilla/include/Platform.h"
+/*#include "widgets/wxscintilla/scintilla/include/Platform.h"
#include "widgets/wxscintilla/scintilla/include/Scintilla.h"
#include "widgets/wxscintilla/scintilla/src/SplitVector.h"
#include "widgets/wxscintilla/scintilla/src/Partitioning.h"
@@ -31,9 +31,9 @@
#include "widgets/wxscintilla/scintilla/src/Decoration.h"
#include "widgets/wxscintilla/scintilla/src/Document.h"
#include "widgets/wxscintilla/scintilla/src/RESearch.h"
+*/
-
#include "wx/defs.h"
#include "wx/string.h"
@@ -132,38 +132,33 @@
// cmdTextReplace
//==========================================================================
-cmdTextReplace::cmdTextReplace(dcTextDocument* doc, int pos, const char* removedText, int removedLen, const char* insertedText, int insertedLen):
+cmdTextReplace::cmdTextReplace(dcTextDocument* doc, int pos, /*const wxString& removedText*/int len, const wxString& insertedText):
wxCommand(true, _T("Replace text")),
m_doc(doc),
pos(pos),
-removedLen(removedLen),
-insertedLen(insertedLen)
+len(len),
+removed(),
+inserted(insertedText)
{
- this->removedText = new char[removedLen+1];
- this->insertedText = new char[insertedLen+1];
-
- memcpy(this->removedText, removedText, removedLen);
- memcpy(this->insertedText, insertedText, insertedLen);
- this->removedText[removedLen] = 0;
- this->insertedText[insertedLen] = 0;
}
bool cmdTextReplace::Do()
{
m_doc->PreventHistory();
- bool res = m_doc->GetStcDocument()->DeleteChars(pos, removedLen);
- res |= m_doc->GetStcDocument()->InsertString(pos, insertedText, insertedLen);
+
+ removed = m_doc->GetText(pos, len);
+ m_doc->ReplaceText(pos, len, inserted);
+
m_doc->AllowHistory();
- return res;
+ return false;
}
bool cmdTextReplace::Undo()
{
m_doc->PreventHistory();
- bool res = m_doc->GetStcDocument()->DeleteChars(pos, insertedLen);
- res |= m_doc->GetStcDocument()->InsertString(pos, removedText, removedLen);
+ m_doc->ReplaceText(pos, inserted.Length(), removed);
m_doc->AllowHistory();
- return res;
+ return false;
}
//==========================================================================
@@ -181,11 +176,10 @@
dcTextDocument::dcTextDocument():
dcCommandDocument(),
-m_doc(NULL),
-m_historyProtectCounter(0)
+m_historyProtectCounter(0),
+m_buffer(),
+m_document(NULL)
{
- m_doc = new Document;
- m_doc->AddRef();
}
dcTextDocument::~dcTextDocument()
@@ -195,70 +189,64 @@
bool dcTextDocument::LoadDocument(wxInputStream& stream, const wxURI& uri, const wxString& mime)
{
dcCommandDocument::LoadDocument(stream, uri, mime);
-
- size_t pos = 0;
- char buffer[2049];
- PreventHistory();
- while(!stream.Eof())
- {
- size_t sz = stream.Read(buffer, 2048).LastRead();
- buffer[2048] = 0;
- m_doc->InsertString(pos, buffer, sz);
- pos+=sz;
- }
+ PreventHistory();
+
+ wxStringOutputStream stm(&m_buffer);
+ stream.Read(stm);
+ stm.Close();
+
+ dcEditCtrl* ctrl = GetEditCtrl();
+ if(ctrl)
+ ctrl->SetText(m_buffer);
+
AllowHistory();
return true;
}
bool dcTextDocument::SaveDocument(wxOutputStream& stream, const wxURI& uri, const wxString& mime)
{
- char buffer[2049];
- size_t len = m_doc->Length(), pos = 0, sz;
- while(pos<len)
- {
- sz = 2048;
- if(pos+sz>len)
- sz = len-pos;
-
- m_doc->GetCharRange(buffer, pos, sz);
- stream.Write(buffer, sz);
- pos+=sz;
- }
+ dcEditCtrl* ctrl = GetEditCtrl();
+ if(ctrl)
+ m_buffer = ctrl->GetText();
+
+ wxStringInputStream stm(m_buffer);
+ stream.Write(stm);
stream.Close();
return true;
}
void dcTextDocument::Clear()
{
- size_t len = m_doc->Length();
- m_doc->DeleteChars(0, len);
+ dcEditCtrl* ctrl = GetEditCtrl();
+ if(ctrl)
+ ctrl->ClearAll();
+ m_buffer.Clear();
}
-void dcTextDocument::SetText(const wxString& test)
+void dcTextDocument::SetText(const wxString& text)
{
Clear();
- m_doc->InsertString(0, (const char*)test.mb_str(wxConvUTF8), test.Length());
- Modify(true);
+ AppendText(text);
}
wxString dcTextDocument::GetText()const
{
- wxStringOutputStream stream;
- char buffer[2049];
- size_t len = m_doc->Length(), pos = 0, sz;
- while(pos<len)
- {
- sz = 2048;
- if(pos+sz>len)
- sz = len-pos;
- m_doc->GetCharRange(buffer, pos, sz);
- stream.Write(buffer, sz);
- pos+=sz;
- }
- stream.Close();
- return stream.GetString();
+ const dcEditCtrl* ctrl = GetEditCtrl();
+ if(ctrl)
+ m_buffer = ctrl->GetText();
+
+ return m_buffer;
}
+wxString dcTextDocument::GetText(int pos, int len)const
+{
+ const dcEditCtrl* ctrl = GetEditCtrl();
+ if(ctrl)
+ m_buffer = ctrl->GetText();
+ return m_buffer.Mid(pos, len);
+}
+
+
void dcTextDocument::RelayDocWatcherEventInsert(int pos, int linesAdded, const wxString& text)
{
if(IsHistoryAllowed())
@@ -343,6 +331,29 @@
return NULL;
}
+const dcEditCtrl* dcTextDocument::GetEditCtrl()const
+{
+ for(ViewSet::iterator it=m_views.begin(); it!=m_views.end(); it++)
+ {
+ dcTextView* view = dynamic_cast<dcTextView*>(*it);
+ if(view!=NULL)
+ return &view->GetEditCtrl();
+ }
+ return NULL;
+}
+
+
+bool dcTextDocument::AppendText(const wxString& text)
+{
+ dcEditCtrl* ctrl = GetEditCtrl();
+ if(ctrl){
+ ctrl->AppendText(text);
+ Modify(true);
+ return true;
+ }
+ return false;
+}
+
bool dcTextDocument::InsertText(int pos, const wxString& text)
{
dcEditCtrl* ctrl = GetEditCtrl();
@@ -367,18 +378,23 @@
bool dcTextDocument::ReplaceText(int pos, int len, const wxString& text)
{
- char* buff = new char [len+1];
- GetStcDocument()->GetCharRange(buff, pos, len);
- buff[len] = 0;
- const wxWX2MBbuf tmp_buf = wx2stc(text);
- const char* txt = (const char*)tmp_buf;
- int sz = strlen(txt);
-
- GetCommandProcessor()->Submit(new cmdTextReplace(this, pos, buff, len, txt, sz));
- delete buff;
- return true;
+ return GetCommandProcessor()->Submit(new cmdTextReplace(this, pos, len, text));
}
+
+void dcTextDocument::InitTextView(dcTextView* view)
+{
+ if(m_document==NULL)
+ {
+ m_document = view->GetEditCtrl().GetDocPointer();
+ view->GetEditCtrl().SetText(m_buffer);
+ }
+ else
+ {
+ view->GetEditCtrl().SetDocPointer(m_document);
+ }
+}
+
//==========================================================================
// dcTextDocumentModule
//==========================================================================
Modified: trunk/wxdevcenter/plugins/text/text.hpp
===================================================================
--- trunk/wxdevcenter/plugins/text/text.hpp 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/plugins/text/text.hpp 2010-04-21 18:41:29 UTC (rev 64)
@@ -15,7 +15,6 @@
/**
* Scintilla classes :
*/
-class Document;
class wxStyledTextCtrl;
class dcEditCtrl;
class dcTextView;
@@ -32,8 +31,9 @@
DECLARE_NO_COPY_CLASS(dcTextDocument)
DECLARE_EVENT_TABLE()
protected:
- Document* m_doc;
int m_historyProtectCounter;
+ mutable wxString m_buffer;
+ void* m_document;
public:
dcTextDocument();
virtual ~dcTextDocument();
@@ -43,16 +43,14 @@
void Clear();
wxString GetText()const;
- void SetText(const wxString& test);
-
+ wxString GetText(int pos, int len)const;
+ void SetText(const wxString& text);
+
+ bool AppendText(const wxString& text);
bool InsertText(int pos, const wxString& text);
bool RemoveText(int pos, int len);
bool ReplaceText(int pos, int len, const wxString& text);
-
-
- Document* GetStcDocument(){return m_doc;}
-
void PreventHistory(){m_historyProtectCounter--;}
void AllowHistory(){m_historyProtectCounter++;}
@@ -62,8 +60,11 @@
bool IsHistoryAllowed()const{return m_historyProtectCounter>=0;}
+ const dcEditCtrl* GetEditCtrl()const;
dcEditCtrl* GetEditCtrl();
+ void InitTextView(dcTextView* view);
+
private:
void dump();
void OnUndo(dcActionEvent& event);
@@ -128,11 +129,11 @@
{
public:
dcTextDocument* m_doc;
- char* removedText, *insertedText;
- int pos, removedLen, insertedLen;
+ wxString removed, inserted;
+ int pos, len;
cmdTextReplace(){}
- cmdTextReplace(dcTextDocument* doc, int pos, const char* removedText, int removedLen, const char* insertedText, int insertedLen);
+ cmdTextReplace(dcTextDocument* doc, int pos, /*const wxString& removedText*/int len, const wxString& insertedText);
bool Do();
bool Undo();
};
Modified: trunk/wxdevcenter/plugins/text/view.cpp
===================================================================
--- trunk/wxdevcenter/plugins/text/view.cpp 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/plugins/text/view.cpp 2010-04-21 18:41:29 UTC (rev 64)
@@ -25,7 +25,7 @@
#include "prefs.hpp"
#include "editctrl.hpp"
#include "bookmark.hpp"
-#include "widgets/markbar.hpp"
+#include "markbar.hpp"
#include <wx/spinctrl.h>
@@ -127,7 +127,6 @@
m_txt = new dcEditCtrl(this);
m_markbar = new wxMarkBar(this, wxID_ANY, 0, 1, wxDefaultPosition, wxSize(14, -1), MB_VERTICAL|wxBORDER_NONE);
- InitEditCtrl(m_txt);
wxSizer* sz = new wxBoxSizer(wxVERTICAL);
wxSizer* s = new wxBoxSizer(wxHORIZONTAL);
s->Add(m_txt, 1, wxEXPAND);
@@ -149,14 +148,11 @@
Connect(minid, maxid, dcEVT_ACTION, dcActionEventHandler(dcTextView::OnShowHilightedLanguage));
}
-void dcTextView::InitEditCtrl(dcEditCtrl* ctrl)
-{
- ctrl->SetDocPointer(GetDocument()->GetStcDocument());
- ctrl->SetTextView(this);
-}
-
void dcTextView::OnInitialUpdate()
{
+ m_txt->SetTextView(this);
+ GetDocument()->InitTextView(this);
+
m_lang = dcEditCtrl::DeterminePrefsFromFilename(GetDocument()->GetFilename());
UpdatePrefs();
@@ -498,7 +494,7 @@
event.Check(m_txt->GetWrapMode());
}
-void dcTextView::OnStyledTextModified(wxScintillaEvent& event)
+void dcTextView::OnStyledTextModified(wxStyledTextEvent& event)
{
// Set line range
m_line->SetRange(1, m_txt->GetLineCount());
@@ -742,7 +738,7 @@
SetFocusToTextCtrl();
}
-void dcTextView::OnStyledTextCharAdded(wxScintillaEvent& event)
+void dcTextView::OnStyledTextCharAdded(wxStyledTextEvent& event)
{
AutoComplete();
}
Modified: trunk/wxdevcenter/plugins/text/view.hpp
===================================================================
--- trunk/wxdevcenter/plugins/text/view.hpp 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/plugins/text/view.hpp 2010-04-21 18:41:29 UTC (rev 64)
@@ -29,11 +29,10 @@
class dcEditCtrl;
class wxSpinCtrl;
class wxBitmapButton;
-class wxScintillaEvent;
class wxMarkBar;
class wxMarkBarEvent;
+class wxStyledTextEvent;
-
/**
* A simple view document.
* Usefull to test doc/view mecanism.
@@ -72,6 +71,7 @@
bool FastFindShown()const;
void ToggleFastFind(){ShowFastFind(!FastFindShown());}
+ const dcEditCtrl& GetEditCtrl()const{return *m_txt;}
dcEditCtrl& GetEditCtrl(){return *m_txt;}
void AddBookmark(int line=wxNOT_FOUND, wxString name=wxT(""));
@@ -169,8 +169,8 @@
void OnMarkerActivated(wxMarkBarEvent& event);
- void OnStyledTextModified(wxScintillaEvent& event);
- void OnStyledTextCharAdded(wxScintillaEvent& event);
+ void OnStyledTextModified(wxStyledTextEvent& event);
+ void OnStyledTextCharAdded(wxStyledTextEvent& event);
};
#endif // _VIEW_HPP_
Modified: trunk/wxdevcenter/src/Makefile.am
===================================================================
--- trunk/wxdevcenter/src/Makefile.am 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/src/Makefile.am 2010-04-21 18:41:29 UTC (rev 64)
@@ -1,8 +1,7 @@
## Process this file with automake to produce Makefile.in
## Created by Anjuta
-
-SUBDIRS = widgets ui uistd sys tools docview .
+SUBDIRS = ui uistd sys tools docview .
INCLUDES = \
Modified: trunk/wxdevcenter/src/Makefile.in
===================================================================
--- trunk/wxdevcenter/src/Makefile.in 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/src/Makefile.in 2010-04-21 18:41:29 UTC (rev 64)
@@ -273,7 +273,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = widgets ui uistd sys tools docview .
+SUBDIRS = ui uistd sys tools docview .
INCLUDES = \
$(WX_CPPFLAGS) \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
Modified: trunk/wxdevcenter/src/tools/Makefile
===================================================================
--- trunk/wxdevcenter/src/tools/Makefile 2010-04-20 19:01:31 UTC (rev 63)
+++ trunk/wxdevcenter/src/tools/Makefile 2010-04-21 18:41:29 UTC (rev 64)
@@ -155,7 +155,7 @@
WXDEVCENTER_LIBS = -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
WX_CPPFLAGS = -I/usr/local/lib/wx/include/gtk2-unicode-2.9 -I/usr/local/include/wx-2.9 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__
WX_CXXFLAGS = -I/usr/local/lib/wx/include/gtk2-unicode-2.9 -I/usr/local/include/wx-2.9 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread
-WX_LIBS = -L/usr/local/lib -pthread -lwx_gtk2u_xrc-2.9 -lwx_gtk2u_aui-2.9 -lwx_gtk2u_qa-2.9 -lwx_gtk2u_adv-2.9 -lwx_gtk2u_core-2.9 -lwx_baseu_xml-2.9 -lwx_baseu_net-2.9 -lwx_baseu-2.9
+WX_LIBS = -L/usr/local/lib -pthread -lwx_gtk2u_stc-2.9 -lwx_gtk2u_xrc-2.9 -lwx_gtk2u_aui-2.9 -lwx_gtk2u_qa-2.9 -lwx_gtk2u_adv-2.9 -lwx_gtk2u_core-2.9 -lwx_baseu_xml-2.9 -lwx_baseu_net-2.9 -lwx_baseu-2.9
XGETTEXT = /usr/bin/xgettext
abs_builddir = /home/mimile/Projects/wxdevcenter/src/tools
abs_srcdir = /home/mimile/Projects/wxdevcenter/src/tools
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2010-04-20 19:01:39
|
Revision: 63
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=63&view=rev
Author: cursorstar
Date: 2010-04-20 19:01:31 +0000 (Tue, 20 Apr 2010)
Log Message:
-----------
Replace DocWatcher by wxStyledTextEvent.
Many minor things.
Modified Paths:
--------------
trunk/wxdevcenter/Makefile.in
trunk/wxdevcenter/aclocal.m4
trunk/wxdevcenter/configure
trunk/wxdevcenter/configure.ac
trunk/wxdevcenter/ltmain.sh
trunk/wxdevcenter/plugins/Makefile.in
trunk/wxdevcenter/plugins/bitmap/Makefile.in
trunk/wxdevcenter/plugins/text/Makefile.in
trunk/wxdevcenter/plugins/text/editctrl.cpp
trunk/wxdevcenter/plugins/text/editctrl.hpp
trunk/wxdevcenter/plugins/text/prefs.cpp
trunk/wxdevcenter/plugins/text/prefs.hpp
trunk/wxdevcenter/plugins/text/text.conf
trunk/wxdevcenter/plugins/text/text.cpp
trunk/wxdevcenter/plugins/text/text.hpp
trunk/wxdevcenter/plugins/text/view.cpp
trunk/wxdevcenter/plugins/text/view.hpp
trunk/wxdevcenter/po/Makefile.in.in
trunk/wxdevcenter/share/Makefile.in
trunk/wxdevcenter/share/xrc/Makefile.in
trunk/wxdevcenter/src/Makefile.am
trunk/wxdevcenter/src/Makefile.in
trunk/wxdevcenter/src/docview/Makefile.in
trunk/wxdevcenter/src/docview/document.cpp
trunk/wxdevcenter/src/docview/document.hpp
trunk/wxdevcenter/src/sys/Makefile.in
trunk/wxdevcenter/src/tools/Makefile
trunk/wxdevcenter/src/tools/Makefile.in
trunk/wxdevcenter/src/ui/Makefile.in
trunk/wxdevcenter/src/ui/dialog/Makefile.in
trunk/wxdevcenter/src/uistd/Makefile.in
trunk/wxdevcenter/src/uistd/stdframe.cpp
trunk/wxdevcenter/src/widgets/Makefile.in
trunk/wxdevcenter/src/widgets/markbar.cpp
trunk/wxdevcenter/src/widgets/markbar.hpp
trunk/wxdevcenter/src/widgets/wxscintilla/Makefile.am
trunk/wxdevcenter/src/widgets/wxscintilla/Makefile.in
trunk/wxdevcenter/src/widgets/wxscintilla/ScintillaWX.cpp
trunk/wxdevcenter/src/widgets/wxscintilla/wxscintilla.cpp
trunk/wxdevcenter/src/widgets/wxscintilla/wxscintilla.cpp.in
Modified: trunk/wxdevcenter/Makefile.in
===================================================================
--- trunk/wxdevcenter/Makefile.in 2009-12-15 17:50:46 UTC (rev 62)
+++ trunk/wxdevcenter/Makefile.in 2010-04-20 19:01:31 UTC (rev 63)
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -123,10 +124,29 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
@@ -327,7 +347,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -352,7 +372,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -498,7 +518,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -649,6 +670,8 @@
html: html-recursive
+html-am:
+
info: info-recursive
info-am:
@@ -657,18 +680,28 @@
install-dvi: install-dvi-recursive
+install-dvi-am:
+
install-exec-am:
install-html: install-html-recursive
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
install-pdf: install-pdf-recursive
+install-pdf-am:
+
install-ps: install-ps-recursive
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
Modified: trunk/wxdevcenter/aclocal.m4
===================================================================
--- trunk/wxdevcenter/aclocal.m4 2009-12-15 17:50:46 UTC (rev 62)
+++ trunk/wxdevcenter/aclocal.m4 2010-04-20 19:01:31 UTC (rev 63)
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.3 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -506,25 +506,25 @@
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
+AC_SUBST(INTLTOOL_DESKTOP_RULE)
+AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+AC_SUBST(INTLTOOL_KEYS_RULE)
+AC_SUBST(INTLTOOL_PROP_RULE)
+AC_SUBST(INTLTOOL_OAF_RULE)
+AC_SUBST(INTLTOOL_PONG_RULE)
+AC_SUBST(INTLTOOL_SERVER_RULE)
+AC_SUBST(INTLTOOL_SHEET_RULE)
+AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
+AC_SUBST(INTLTOOL_UI_RULE)
+AC_SUBST(INTLTOOL_XAM_RULE)
+AC_SUBST(INTLTOOL_KBD_RULE)
+AC_SUBST(INTLTOOL_XML_RULE)
+AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+AC_SUBST(INTLTOOL_CAVES_RULE)
+AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+AC_SUBST(INTLTOOL_THEME_RULE)
+AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
# Check the gettext tools to make sure they are GNU
AC_PATH_PROG(XGETTEXT, xgettext)
@@ -541,17 +541,12 @@
AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
fi
-AC_PATH_PROG(INTLTOOL_PERL, perl)
+AC_PATH_PROG(INTLTOOL_PERL, [perl])
if test -z "$INTLTOOL_PERL"; then
- AC_MSG_ERROR([perl not found])
+ AC_MSG_ERROR([perl not found; required for intltool])
fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
- AC_MSG_RESULT([$IT_PERL_VERSION])
+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+ AC_MSG_ERROR([perl 5.x required for intltool])
fi
if test "x$2" != "xno-xml"; then
AC_MSG_CHECKING([for XML::Parser])
@@ -607,7 +602,7 @@
dnl of config.status.
AC_CONFIG_COMMANDS_PRE([
AC_CONFIG_COMMANDS([$1/stamp-it], [
- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
fi
rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
@@ -629,17 +624,6 @@
])dnl
])
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
# deprecated macros
AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
# A hint is needed for aclocal from Automake <= 1.9.4:
@@ -2943,7 +2927,14 @@
*) objformat=elf ;;
esac
fi
- version_type=freebsd-$objformat
+ # Handle Gentoo/FreeBSD as it was Linux
+ case $host_vendor in
+ gentoo)
+ version_type=linux ;;
+ *)
+ version_type=freebsd-$objformat ;;
+ esac
+
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -2954,6 +2945,12 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
+ linux)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ need_lib_prefix=no
+ need_version=no
+ ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -3127,18 +3124,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3730,7 +3715,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4411,7 +4396,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4836,9 +4821,6 @@
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
- linux* | k*bsd*-gnu)
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5085,7 +5067,7 @@
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5260,7 +5242,6 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5499,7 +5480,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -8502,15 +8483,15 @@
# Generated from ltversion.in.
-# serial 3012 ltversion.m4
+# serial 3017 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6])
-m4_define([LT_PACKAGE_REVISION], [1.3012])
+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
+m4_define([LT_PACKAGE_REVISION], [1.3017])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6'
-macro_revision='1.3012'
+[macro_version='2.2.6b'
+macro_revision='1.3017'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
@@ -8708,16 +8689,14 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -8761,9 +8740,9 @@
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -8813,7 +8792,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.2], [],
+m4_if([$1], [1.10.3], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -8829,7 +8808,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.2])dnl
+[AM_AUTOMAKE_VERSION([1.10.3])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -8945,14 +8924,14 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 9
+# serial 10
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
@@ -9009,6 +8988,16 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
+ am__universal=false
+ m4_case([$1], [CC],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac],
+ [CXX],
+ [case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac])
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -9026,7 +9015,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -9036,19 +9035,23 @@
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -9198,7 +9201,7 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -9272,8 +9275,8 @@
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
Modified: trunk/wxdevcenter/configure
===================================================================
--- trunk/wxdevcenter/configure 2009-12-15 17:50:46 UTC (rev 62)
+++ trunk/wxdevcenter/configure 2010-04-20 19:01:31 UTC (rev 63)
@@ -2290,6 +2290,108 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
+else
+ STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
@@ -2472,108 +2574,6 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- STRIP=$ac_ct_STRIP
- fi
-else
- STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
# Always define AMTAR for backward compatibility.
@@ -3636,6 +3636,11 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -3653,7 +3658,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -3663,19 +3678,23 @@
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -4515,6 +4534,11 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -4532,7 +4556,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -4542,19 +4576,23 @@
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -5306,6 +5344,11 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -5323,7 +5366,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -5333,19 +5386,23 @@
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -5960,7 +6017,7 @@
$as_echo "$as_me: error: wxWidgets is required. Try --with-wx-config." >&2;}
{ (exit 1); exit 1; }; }
fi
-WXLIBS="xrc,aui,html,qa,adv,core,xml,net,base"
+WXLIBS="xrc,aui,qa,adv,core,xml,net,base"
WX_CPPFLAGS="`$WXCONFIG --cppflags $WXLIBS`"
WX_CXXFLAGS="`$WXCONFIG --cxxflags $WXLIBS`"
WX_LIBS="`$WXCONFIG --libs $WXLIBS`"
@@ -6607,6 +6664,11 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -6624,7 +6686,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -6634,19 +6706,23 @@
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -8560,82 +8636,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -8853,21 +8853,14 @@
if test -z "$INTLTOOL_PERL"; then
- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
-$as_echo "$as_me: error: perl not found" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
+$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
-$as_echo_n "checking for perl >= 5.8.1... " >&6; }
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+ { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
{ (exit 1); exit 1; }; }
-else
- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
-$as_echo "$IT_PERL_VERSION" >&6; }
fi
if test "x" != "xno-xml"; then
{ $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
@@ -9050,8 +9043,8 @@
-macro_version='2.2.6'
-macro_revision='1.3012'
+macro_version='2.2.6b'
+macro_revision='1.3017'
@@ -9610,13 +9603,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:9613: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:9606: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:9616: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:9609: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:9619: output\"" >&5)
+ (eval echo "\"\$as_me:9612: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -10086,7 +10079,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -10821,7 +10814,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 10824 "configure"' > conftest.$ac_ext
+ echo '#line 10817 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12092,6 +12085,11 @@
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
for depmode in $am_compiler_list; do
# Setup a source with many dependencies, because some compilers
# like to wrap large dependency lists on column 80 (with \), and
@@ -12109,7 +12107,17 @@
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
nosideeffect)
# after this tag, mechanisms are not by side-effect, so they'll
# only be used when explicitly requested
@@ -12119,19 +12127,23 @@
break
fi
;;
+ msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
none) break ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ source=sub/conftest.c object=$am__obj \
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
>/dev/null 2>conftest.err &&
grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
@@ -12905,11 +12917,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12908: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12920: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12912: \$? = $ac_status" >&5
+ echo "$as_me:12924: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13244,11 +13256,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13247: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13259: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13251: \$? = $ac_status" >&5
+ echo "$as_me:13263: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13349,11 +13361,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13352: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13364: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13356: \$? = $ac_status" >&5
+ echo "$as_me:13368: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13404,11 +13416,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13407: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13419: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13411: \$? = $ac_status" >&5
+ echo "$as_me:13423: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13705,7 +13717,7 @@
fi
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -13880,7 +13892,6 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
- link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -14295,7 +14306,7 @@
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -15041,7 +15052,14 @@
*) objformat=elf ;;
esac
fi
- version_type=freebsd-$objformat
+ # Handle Gentoo/FreeBSD as it was Linux
+ case $host_vendor in
+ gentoo)
+ version_type=linux ;;
+ *)
+ version_type=freebsd-$objformat ;;
+ esac
+
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -15052,6 +15070,12 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
+ linux)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ need_lib_prefix=no
+ need_version=no
+ ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -15272,18 +15296,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -16217,7 +16229,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 16220 "configure"
+#line 16232 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16313,7 +16325,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 16316 "configure"
+#line 16328 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18209,7 +18221,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu)
+ netbsd*)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -18333,11 +18345,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18336: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18348: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18340: \$? = $ac_status" >&5
+ echo "$as_me:18352: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18432,11 +18444,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18435: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18447: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18439: \$? = $ac_status" >&5
+ echo "$as_me:18451: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18484,11 +18496,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18487: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18499: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18491: \$? = $ac_status" >&5
+ echo "$as_me:18503: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18560,9 +18572,6 @@
cygwin* | mingw* | cegcc*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
- linux* | k*bsd*-gnu)
- link_all_deplibs_CXX=no
- ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -18918,7 +18927,14 @@
*) objformat=elf ;;
esac
fi
- version_type=freebsd-$objformat
+ # Handle Gentoo/FreeBSD as it was Linux
+ case $host_vendor in
+ gentoo)
+ version_type=linux ;;
+ *)
+ version_type=freebsd-$objformat ;;
+ esac
+
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -18929,6 +18945,12 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
+ linux)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ need_lib_prefix=no
+ need_version=no
+ ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -19149,18 +19171,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -19607,11 +19617,10 @@
{ $as_echo "$as_me:$LINENO: checking for WXDEVCENTER" >&5
$as_echo_n "checking for WXDEVCENTER... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$WXDEVCENTER_CFLAGS"; then
- pkg_cv_WXDEVCENTER_CFLAGS="$WXDEVCENTER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$WXDEVCENTER_CFLAGS"; then
+ pkg_cv_WXDEVCENTER_CFLAGS="$WXDEVCENTER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 libglade-2.0 \"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 libglade-2.0 ") 2>&5
ac_status=$?
@@ -19621,15 +19630,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$WXDEVCENTER_LIBS"; then
- pkg_cv_WXDEVCENTER_LIBS="$WXDEVCENTER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$WXDEVCENTER_LIBS"; then
+ pkg_cv_WXDEVCENTER_LIBS="$WXDEVCENTER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 libglade-2.0 \"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 libglade-2.0 ") 2>&5
ac_status=$?
@@ -19639,9 +19646,8 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
@@ -19654,9 +19660,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 libglade-2.0 "`
+ WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 libglade-2.0 " 2>&1`
else
- WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 libglade-2.0 "`
+ WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 libglade-2.0 " 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$WXDEVCENTER_PKG_ERRORS" >&5
@@ -22356,7 +22362,7 @@
;;
"po/stamp-it":C)
- if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
+ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
{ { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
{ (exit 1); exit 1; }; }
Modified: trunk/wxdevcenter/configure.ac
===================================================================
--- trunk/wxdevcenter/configure.ac 2009-12-15 17:50:46 UTC (rev 62)
+++ trunk/wxdevcenter/configure.ac 2010-04-20 19:01:31 UTC (rev 63)
@@ -29,7 +29,7 @@
AC_MSG_RESULT([not found])
AC_MSG_ERROR([wxWidgets is required. Try --with-wx-config.])
fi
-WXLIBS="xrc,aui,html,qa,adv,core,xml,net,base"
+WXLIBS="xrc,aui,qa,adv,core,xml,net,base"
WX_CPPFLAGS="`$WXCONFIG --cppflags $WXLIBS`"
WX_CXXFLAGS="`$WXCONFIG --cxxflags $WXLIBS`"
WX_LIBS="`$WXCONFIG --libs $WXLIBS`"
Modified: trunk/wxdevcenter/ltmain.sh
===================================================================
--- trunk/wxdevcenter/ltmain.sh 2009-12-15 17:50:46 UTC (rev 62)
+++ trunk/wxdevcenter/ltmain.sh 2010-04-20 19:01:31 UTC (rev 63)
@@ -1,6 +1,6 @@
# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6
+# ltmain.sh (GNU libtool) 2.2.6b
# Written by Gordon Matzigkeit <go...@gn...>, 1996
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
+# $progname: (GNU libtool) 2.2.6b
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,9 +73,9 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
+VERSION=2.2.6b
TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3017
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -5033,10 +5033,7 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link)
- libs="$deplibs %DEPLIBS%"
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
- ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6209,9 +6206,6 @@
revision="$number_minor"
lt_irix_increment=no
;;
- *)
- func_fatal_configuration "$modename: unknown library version type \`$version_type'"
- ;;
esac
;;
no)
Modified: trunk/wxdevcenter/plugins/Makefile.in
===================================================================
--- trunk/wxdevcenter/plugins/Makefile.in 2009-12-15 17:50:46 UTC (rev 62)
+++ trunk/wxdevcenter/plugins/Makefile.in 2010-04-20 19:01:31 UTC (rev 63)
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -97,10 +98,29 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
@@ -249,7 +269,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -274,7 +294,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -458,6 +478,8 @@
html: html-recursive
+html-am:
+
info: info-recursive
info-am:
@@ -466,18 +488,28 @@
install-dvi: install-dvi-recursive
+install-dvi-am:
+
install-exec-am:
install-html: install-html-recursive
+install-html-am:
+
install-info: install-info-recursive
+install-info-am:
+
install-man:
install-pdf: install-pdf-recursive
+install-pdf-am:
+
install-ps: install-ps-recursive
+install-ps-am:
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
Modified: trunk/wxdevcenter/plugins/bitmap/Makefile.in
===================================================================
--- trunk/wxdevcenter/plugins/bitmap/Makefile.in 2009-12-15 17:50:46 UTC (rev 62)
+++ trunk/wxdevcenter/plugins/bitmap/Makefile.in 2010-04-20 19:01:31 UTC (rev 63)
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.10.3 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
# This ...
[truncated message content] |
|
From: <cur...@us...> - 2009-12-15 17:50:56
|
Revision: 62
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=62&view=rev
Author: cursorstar
Date: 2009-12-15 17:50:46 +0000 (Tue, 15 Dec 2009)
Log Message:
-----------
Add module 'uistd' with all standard UI.
Add module 'widgets' with exported (independant lib) widget classes.
Move Scintilla classes to widgets lib.
Modified Paths:
--------------
trunk/wxdevcenter/Makefile.in
trunk/wxdevcenter/aclocal.m4
trunk/wxdevcenter/configure
trunk/wxdevcenter/configure.ac
trunk/wxdevcenter/ltmain.sh
trunk/wxdevcenter/plugins/Makefile.am
trunk/wxdevcenter/plugins/Makefile.in
trunk/wxdevcenter/plugins/bitmap/Makefile.in
trunk/wxdevcenter/plugins/text/Makefile.am
trunk/wxdevcenter/plugins/text/Makefile.in
trunk/wxdevcenter/plugins/text/editctrl.cpp
trunk/wxdevcenter/plugins/text/editctrl.hpp
trunk/wxdevcenter/plugins/text/prefs.hpp
trunk/wxdevcenter/plugins/text/text-search.cpp
trunk/wxdevcenter/plugins/text/text.cpp
trunk/wxdevcenter/plugins/text/view.cpp
trunk/wxdevcenter/plugins/text/view.hpp
trunk/wxdevcenter/po/Makefile.in.in
trunk/wxdevcenter/share/Makefile.in
trunk/wxdevcenter/share/xrc/Makefile.in
trunk/wxdevcenter/src/Makefile.am
trunk/wxdevcenter/src/Makefile.in
trunk/wxdevcenter/src/docview/Makefile.in
trunk/wxdevcenter/src/docview/document.cpp
trunk/wxdevcenter/src/docview/document.hpp
trunk/wxdevcenter/src/docview/view.cpp
trunk/wxdevcenter/src/sys/Makefile.in
trunk/wxdevcenter/src/sys/action.cpp
trunk/wxdevcenter/src/sys/action.hpp
trunk/wxdevcenter/src/sys/search.cpp
trunk/wxdevcenter/src/sys/task.cpp
trunk/wxdevcenter/src/sys/task.hpp
trunk/wxdevcenter/src/tools/Makefile.in
trunk/wxdevcenter/src/ui/Makefile.in
trunk/wxdevcenter/src/ui/dialog/Makefile.in
trunk/wxdevcenter/src/ui/frame.cpp
trunk/wxdevcenter/src/ui/frame.hpp
trunk/wxdevcenter/src/ui/perspective.cpp
trunk/wxdevcenter/src/ui/perspective.hpp
trunk/wxdevcenter/src/ui/workbar.cpp
trunk/wxdevcenter/src/ui/workbar.hpp
Added Paths:
-----------
trunk/wxdevcenter/src/uistd/
trunk/wxdevcenter/src/uistd/Makefile.am
trunk/wxdevcenter/src/uistd/Makefile.in
trunk/wxdevcenter/src/uistd/fsworkbar.cpp
trunk/wxdevcenter/src/uistd/fsworkbar.hpp
trunk/wxdevcenter/src/uistd/stdconfig.cpp
trunk/wxdevcenter/src/uistd/stdconfig.hpp
trunk/wxdevcenter/src/uistd/stdframe.cpp
trunk/wxdevcenter/src/uistd/stdframe.hpp
trunk/wxdevcenter/src/widgets/
trunk/wxdevcenter/src/widgets/Makefile.am
trunk/wxdevcenter/src/widgets/Makefile.in
trunk/wxdevcenter/src/widgets/markbar.cpp
trunk/wxdevcenter/src/widgets/markbar.hpp
trunk/wxdevcenter/src/widgets/wxscintilla/
trunk/wxdevcenter/src/widgets/wxscintilla/Makefile.am
trunk/wxdevcenter/src/widgets/wxscintilla/Makefile.in
trunk/wxdevcenter/src/widgets/wxscintilla/PlatWX.cpp
trunk/wxdevcenter/src/widgets/wxscintilla/PlatWX.h
trunk/wxdevcenter/src/widgets/wxscintilla/README.txt
trunk/wxdevcenter/src/widgets/wxscintilla/ScintillaWX.cpp
trunk/wxdevcenter/src/widgets/wxscintilla/ScintillaWX.h
trunk/wxdevcenter/src/widgets/wxscintilla/gen_iface.py
trunk/wxdevcenter/src/widgets/wxscintilla/private.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/Accessor.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/Face.py
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/HFacer.py
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/KeyWords.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/Platform.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/PropSet.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/SciLexer.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/Scintilla.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/Scintilla.iface
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/ScintillaWidget.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/include/WindowAccessor.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/AutoComplete.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/AutoComplete.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CallTip.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CallTip.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CellBuffer.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CellBuffer.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CharClassify.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CharClassify.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/CharacterSet.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ContractionState.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ContractionState.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Decoration.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Decoration.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Document.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Document.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/DocumentAccessor.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/DocumentAccessor.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Editor.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Editor.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ExternalLexer.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ExternalLexer.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Indicator.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Indicator.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/KeyMap.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/KeyMap.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/KeyWords.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAPDL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexASY.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAU3.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAVE.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAbaqus.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAda.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAsm.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexAsn1.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexBaan.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexBash.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexBasic.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexBullant.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCLW.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCOBOL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCPP.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCSS.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCaml.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCmake.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexConf.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCrontab.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexCsound.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexD.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexEScript.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexEiffel.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexErlang.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexFlagship.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexForth.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexFortran.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexGAP.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexGen.py
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexGui4Cli.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexHTML.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexHaskell.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexInno.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexKix.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexLisp.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexLout.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexLua.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMMIXAL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMPT.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMSSQL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMagik.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMatlab.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMetapost.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexMySQL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexNimrod.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexNsis.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexOpal.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexOthers.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPB.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPLM.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPOV.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPS.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPascal.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPerl.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPowerPro.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPowerShell.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexProgress.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexPython.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexR.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexRebol.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexRuby.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexSML.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexSQL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexScriptol.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexSmalltalk.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexSorcus.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexSpecman.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexSpice.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexTACL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexTADS3.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexTAL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexTCL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexTeX.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexVB.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexVHDL.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexVerilog.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LexYAML.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LineMarker.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/LineMarker.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Partitioning.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/PerLine.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/PerLine.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/PositionCache.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/PositionCache.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/PropSet.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/PropSetSimple.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/RESearch.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/RESearch.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/RunStyles.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/RunStyles.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/SVector.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/SciTE.properties
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ScintillaBase.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ScintillaBase.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Selection.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Selection.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/SplitVector.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Style.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/Style.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/StyleContext.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/StyleContext.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/UniConversion.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/UniConversion.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ViewStyle.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/ViewStyle.h
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/WindowAccessor.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/XPM.cxx
trunk/wxdevcenter/src/widgets/wxscintilla/scintilla/src/XPM.h
trunk/wxdevcenter/src/widgets/wxscintilla/wxscintilla.cpp
trunk/wxdevcenter/src/widgets/wxscintilla/wxscintilla.cpp.in
trunk/wxdevcenter/src/widgets/wxscintilla/wxscintilla.h
trunk/wxdevcenter/src/widgets/wxscintilla/wxscintilla.h.in
Removed Paths:
-------------
trunk/wxdevcenter/plugins/text/scintilla/
trunk/wxdevcenter/plugins/uistd/
Modified: trunk/wxdevcenter/Makefile.in
===================================================================
--- trunk/wxdevcenter/Makefile.in 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/Makefile.in 2009-12-15 17:50:46 UTC (rev 62)
@@ -123,29 +123,10 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
Modified: trunk/wxdevcenter/aclocal.m4
===================================================================
--- trunk/wxdevcenter/aclocal.m4 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/aclocal.m4 2009-12-15 17:50:46 UTC (rev 62)
@@ -506,25 +506,25 @@
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-AC_SUBST(INTLTOOL_DESKTOP_RULE)
-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-AC_SUBST(INTLTOOL_KEYS_RULE)
-AC_SUBST(INTLTOOL_PROP_RULE)
-AC_SUBST(INTLTOOL_OAF_RULE)
-AC_SUBST(INTLTOOL_PONG_RULE)
-AC_SUBST(INTLTOOL_SERVER_RULE)
-AC_SUBST(INTLTOOL_SHEET_RULE)
-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
-AC_SUBST(INTLTOOL_UI_RULE)
-AC_SUBST(INTLTOOL_XAM_RULE)
-AC_SUBST(INTLTOOL_KBD_RULE)
-AC_SUBST(INTLTOOL_XML_RULE)
-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-AC_SUBST(INTLTOOL_CAVES_RULE)
-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
-AC_SUBST(INTLTOOL_THEME_RULE)
-AC_SUBST(INTLTOOL_SERVICE_RULE)
-AC_SUBST(INTLTOOL_POLICY_RULE)
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
# Check the gettext tools to make sure they are GNU
AC_PATH_PROG(XGETTEXT, xgettext)
@@ -541,12 +541,17 @@
AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
fi
-AC_PATH_PROG(INTLTOOL_PERL, [perl])
+AC_PATH_PROG(INTLTOOL_PERL, perl)
if test -z "$INTLTOOL_PERL"; then
- AC_MSG_ERROR([perl not found; required for intltool])
+ AC_MSG_ERROR([perl not found])
fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
- AC_MSG_ERROR([perl 5.x required for intltool])
+AC_MSG_CHECKING([for perl >= 5.8.1])
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+ AC_MSG_RESULT([$IT_PERL_VERSION])
fi
if test "x$2" != "xno-xml"; then
AC_MSG_CHECKING([for XML::Parser])
@@ -602,7 +607,7 @@
dnl of config.status.
AC_CONFIG_COMMANDS_PRE([
AC_CONFIG_COMMANDS([$1/stamp-it], [
- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
fi
rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
@@ -624,6 +629,17 @@
])dnl
])
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
# deprecated macros
AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
# A hint is needed for aclocal from Automake <= 1.9.4:
@@ -2927,14 +2943,7 @@
*) objformat=elf ;;
esac
fi
- # Handle Gentoo/FreeBSD as it was Linux
- case $host_vendor in
- gentoo)
- version_type=linux ;;
- *)
- version_type=freebsd-$objformat ;;
- esac
-
+ version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -2945,12 +2954,6 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
- linux)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- need_lib_prefix=no
- need_version=no
- ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -3124,6 +3127,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3715,7 +3730,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4396,7 +4411,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4821,6 +4836,9 @@
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
+ linux* | k*bsd*-gnu)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -5067,7 +5085,7 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5242,6 +5260,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5480,7 +5499,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -8689,14 +8708,16 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- else
- pkg_failed=untried
+[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ fi
+else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -8740,9 +8761,9 @@
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -9091,59 +9112,61 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 4
+#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file. Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*) set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+[{
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
])# _AM_OUTPUT_DEPENDENCY_COMMANDS
Modified: trunk/wxdevcenter/configure
===================================================================
--- trunk/wxdevcenter/configure 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/configure 2009-12-15 17:50:46 UTC (rev 62)
@@ -5960,7 +5960,7 @@
$as_echo "$as_me: error: wxWidgets is required. Try --with-wx-config." >&2;}
{ (exit 1); exit 1; }; }
fi
-WXLIBS="xrc,stc,aui,html,qa,adv,core,xml,net,base"
+WXLIBS="xrc,aui,html,qa,adv,core,xml,net,base"
WX_CPPFLAGS="`$WXCONFIG --cppflags $WXLIBS`"
WX_CXXFLAGS="`$WXCONFIG --cxxflags $WXLIBS`"
WX_LIBS="`$WXCONFIG --libs $WXLIBS`"
@@ -8560,6 +8560,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -8777,14 +8853,21 @@
if test -z "$INTLTOOL_PERL"; then
- { { $as_echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
-$as_echo "$as_me: error: perl not found; required for intltool" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+$as_echo "$as_me: error: perl not found" >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
- { { $as_echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
-$as_echo "$as_me: error: perl 5.x required for intltool" >&2;}
+{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
+$as_echo_n "checking for perl >= 5.8.1... " >&6; }
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+ { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
{ (exit 1); exit 1; }; }
+else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+ { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
+$as_echo "$IT_PERL_VERSION" >&6; }
fi
if test "x" != "xno-xml"; then
{ $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
@@ -9527,13 +9610,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:9530: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:9613: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:9533: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:9616: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:9536: output\"" >&5)
+ (eval echo "\"\$as_me:9619: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -10003,7 +10086,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -10738,7 +10821,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 10741 "configure"' > conftest.$ac_ext
+ echo '#line 10824 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12822,11 +12905,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12825: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12908: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12829: \$? = $ac_status" >&5
+ echo "$as_me:12912: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13161,11 +13244,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13164: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13247: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13168: \$? = $ac_status" >&5
+ echo "$as_me:13251: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13266,11 +13349,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13269: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13352: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13273: \$? = $ac_status" >&5
+ echo "$as_me:13356: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13321,11 +13404,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13324: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13407: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13328: \$? = $ac_status" >&5
+ echo "$as_me:13411: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13622,7 +13705,7 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -13797,6 +13880,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -14211,7 +14295,7 @@
link_all_deplibs=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -14957,14 +15041,7 @@
*) objformat=elf ;;
esac
fi
- # Handle Gentoo/FreeBSD as it was Linux
- case $host_vendor in
- gentoo)
- version_type=linux ;;
- *)
- version_type=freebsd-$objformat ;;
- esac
-
+ version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -14975,12 +15052,6 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
- linux)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- need_lib_prefix=no
- need_version=no
- ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -15201,6 +15272,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -16134,7 +16217,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 16137 "configure"
+#line 16220 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16230,7 +16313,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 16233 "configure"
+#line 16316 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18126,7 +18209,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -18250,11 +18333,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18253: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18336: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18257: \$? = $ac_status" >&5
+ echo "$as_me:18340: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18349,11 +18432,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18352: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18435: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18356: \$? = $ac_status" >&5
+ echo "$as_me:18439: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18401,11 +18484,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18404: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18487: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18408: \$? = $ac_status" >&5
+ echo "$as_me:18491: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18477,6 +18560,9 @@
cygwin* | mingw* | cegcc*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
+ linux* | k*bsd*-gnu)
+ link_all_deplibs_CXX=no
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -18832,14 +18918,7 @@
*) objformat=elf ;;
esac
fi
- # Handle Gentoo/FreeBSD as it was Linux
- case $host_vendor in
- gentoo)
- version_type=linux ;;
- *)
- version_type=freebsd-$objformat ;;
- esac
-
+ version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -18850,12 +18929,6 @@
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
need_version=yes
;;
- linux)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- need_lib_prefix=no
- need_version=no
- ;;
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
@@ -19076,6 +19149,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -19522,10 +19607,11 @@
{ $as_echo "$as_me:$LINENO: checking for WXDEVCENTER" >&5
$as_echo_n "checking for WXDEVCENTER... " >&6; }
-if test -n "$WXDEVCENTER_CFLAGS"; then
- pkg_cv_WXDEVCENTER_CFLAGS="$WXDEVCENTER_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$WXDEVCENTER_CFLAGS"; then
+ pkg_cv_WXDEVCENTER_CFLAGS="$WXDEVCENTER_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 libglade-2.0 \"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 libglade-2.0 ") 2>&5
ac_status=$?
@@ -19535,13 +19621,15 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
-if test -n "$WXDEVCENTER_LIBS"; then
- pkg_cv_WXDEVCENTER_LIBS="$WXDEVCENTER_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+ if test -n "$WXDEVCENTER_LIBS"; then
+ pkg_cv_WXDEVCENTER_LIBS="$WXDEVCENTER_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 libglade-2.0 \"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 libglade-2.0 ") 2>&5
ac_status=$?
@@ -19551,8 +19639,9 @@
else
pkg_failed=yes
fi
- else
- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
fi
@@ -19565,9 +19654,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 libglade-2.0 " 2>&1`
+ WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 libglade-2.0 "`
else
- WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 libglade-2.0 " 2>&1`
+ WXDEVCENTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 libglade-2.0 "`
fi
# Put the nasty error message in config.log where it belongs
echo "$WXDEVCENTER_PKG_ERRORS" >&5
@@ -19638,7 +19727,7 @@
-ac_config_files="$ac_config_files Makefile src/Makefile src/ui/Makefile src/ui/dialog/Makefile src/sys/Makefile src/docview/Makefile src/tools/Makefile share/Makefile share/xrc/Makefile po/Makefile.in plugins/Makefile plugins/text/Makefile plugins/bitmap/Makefile plugins/uistd/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile src/docview/Makefile src/sys/Makefile src/tools/Makefile src/ui/Makefile src/ui/dialog/Makefile src/uistd/Makefile src/widgets/Makefile src/widgets/wxscintilla/Makefile plugins/Makefile plugins/text/Makefile plugins/bitmap/Makefile share/Makefile share/xrc/Makefile po/Makefile.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -20656,18 +20745,20 @@
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+ "src/docview/Makefile") CONFIG_FILES="$CONFIG_FILES src/docview/Makefile" ;;
+ "src/sys/Makefile") CONFIG_FILES="$CONFIG_FILES src/sys/Makefile" ;;
+ "src/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/Makefile" ;;
"src/ui/Makefile") CONFIG_FILES="$CONFIG_FILES src/ui/Makefile" ;;
"src/ui/dialog/Makefile") CONFIG_FILES="$CONFIG_FILES src/ui/dialog/Makefile" ;;
- "src/sys/Makefile") CONFIG_FILES="$CONFIG_FILES src/sys/Makefile" ;;
- "src/docview/Makefile") CONFIG_FILES="$CONFIG_FILES src/docview/Makefile" ;;
- "src/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/Makefile" ;;
+ "src/uistd/Makefile") CONFIG_FILES="$CONFIG_FILES src/uistd/Makefile" ;;
+ "src/widgets/Makefile") CONFIG_FILES="$CONFIG_FILES src/widgets/Makefile" ;;
+ "src/widgets/wxscintilla/Makefile") CONFIG_FILES="$CONFIG_FILES src/widgets/wxscintilla/Makefile" ;;
+ "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
+ "plugins/text/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/text/Makefile" ;;
+ "plugins/bitmap/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/bitmap/Makefile" ;;
"share/Makefile") CONFIG_FILES="$CONFIG_FILES share/Makefile" ;;
"share/xrc/Makefile") CONFIG_FILES="$CONFIG_FILES share/xrc/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
- "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;;
- "plugins/text/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/text/Makefile" ;;
- "plugins/bitmap/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/bitmap/Makefile" ;;
- "plugins/uistd/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/uistd/Makefile" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -21324,27 +21415,28 @@
case $ac_file$ac_mode in
- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
-# are listed without --file. Let's play safe and only enable the eval
-# if we detect the quoting.
-case $CONFIG_FILES in
-*\'*) eval set x "$CONFIG_FILES" ;;
-*) set x $CONFIG_FILES ;;
-esac
-shift
-for mf
-do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
- # some people rename them; so instead we look at the file content.
- # Grep'ing the first line is not enough: some people post-process
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # are listed without --file. Let's play safe and only enable the eval
+ # if we detect the quoting.
+ case $CONFIG_FILES in
+ *\'*) eval set x "$CONFIG_FILES" ;;
+ *) set x $CONFIG_FILES ;;
+ esac
+ shift
+ for mf
+ do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
@@ -21367,28 +21459,28 @@
q
}
s/.*/./; q'`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
- test -z "$DEPDIR" && continue
- am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
- # Find all dependency output files, they are included files with
- # $(DEPDIR) in their names. We invoke sed twice because it is the
- # simplest approach to changing $(DEPDIR) to its actual value in the
- # expansion.
- for file in `sed -n "
- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`$as_dirname -- "$file" ||
+ else
+ continue
+ fi
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n 's/^U = //p' < "$mf"`
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`$as_dirname -- "$file" ||
$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
@@ -21411,7 +21503,7 @@
q
}
s/.*/./; q'`
- { as_dir=$dirpart/$fdir
+ { as_dir=$dirpart/$fdir
case $as_dir in #(
-*) as_dir=./$as_dir;;
esac
@@ -21452,10 +21544,11 @@
} || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
done
-done
+}
;;
"default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
@@ -22263,7 +22356,7 @@
;;
"po/stamp-it":C)
- if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" ; then
+ if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
{ { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
{ (exit 1); exit 1; }; }
Modified: trunk/wxdevcenter/configure.ac
===================================================================
--- trunk/wxdevcenter/configure.ac 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/configure.ac 2009-12-15 17:50:46 UTC (rev 62)
@@ -29,7 +29,7 @@
AC_MSG_RESULT([not found])
AC_MSG_ERROR([wxWidgets is required. Try --with-wx-config.])
fi
-WXLIBS="xrc,stc,aui,html,qa,adv,core,xml,net,base"
+WXLIBS="xrc,aui,html,qa,adv,core,xml,net,base"
WX_CPPFLAGS="`$WXCONFIG --cppflags $WXLIBS`"
WX_CXXFLAGS="`$WXCONFIG --cxxflags $WXLIBS`"
WX_LIBS="`$WXCONFIG --libs $WXLIBS`"
@@ -76,16 +76,18 @@
AC_OUTPUT([
Makefile
src/Makefile
+src/docview/Makefile
+src/sys/Makefile
+src/tools/Makefile
src/ui/Makefile
src/ui/dialog/Makefile
-src/sys/Makefile
-src/docview/Makefile
-src/tools/Makefile
+src/uistd/Makefile
+src/widgets/Makefile
+src/widgets/wxscintilla/Makefile
+plugins/Makefile
+plugins/text/Makefile
+plugins/bitmap/Makefile
share/Makefile
share/xrc/Makefile
po/Makefile.in
-plugins/Makefile
-plugins/text/Makefile
-plugins/bitmap/Makefile
-plugins/uistd/Makefile
])
Modified: trunk/wxdevcenter/ltmain.sh
===================================================================
--- trunk/wxdevcenter/ltmain.sh 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/ltmain.sh 2009-12-15 17:50:46 UTC (rev 62)
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6
+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -73,7 +73,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.2.6
+VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
TIMESTAMP=""
package_revision=1.3012
@@ -116,15 +116,15 @@
: ${CP="cp -f"}
: ${ECHO="echo"}
-: ${EGREP="/usr/bin/grep -E"}
-: ${FGREP="/usr/bin/grep -F"}
-: ${GREP="/usr/bin/grep"}
+: ${EGREP="/bin/grep -E"}
+: ${FGREP="/bin/grep -F"}
+: ${GREP="/bin/grep"}
: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
-: ${SED="/opt/local/bin/gsed"}
+: ${SED="/bin/sed"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"}
@@ -5033,7 +5033,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6206,6 +6209,9 @@
revision="$number_minor"
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+ ;;
esac
;;
no)
Modified: trunk/wxdevcenter/plugins/Makefile.am
===================================================================
--- trunk/wxdevcenter/plugins/Makefile.am 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/plugins/Makefile.am 2009-12-15 17:50:46 UTC (rev 62)
@@ -1,4 +1,4 @@
## File created by the gnome-build tools
-SUBDIRS = text bitmap uistd
+SUBDIRS = text bitmap
Modified: trunk/wxdevcenter/plugins/Makefile.in
===================================================================
--- trunk/wxdevcenter/plugins/Makefile.in 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/plugins/Makefile.in 2009-12-15 17:50:46 UTC (rev 62)
@@ -97,29 +97,10 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
@@ -221,7 +202,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = text bitmap uistd
+SUBDIRS = text bitmap
all: all-recursive
.SUFFIXES:
Modified: trunk/wxdevcenter/plugins/bitmap/Makefile.in
===================================================================
--- trunk/wxdevcenter/plugins/bitmap/Makefile.in 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/plugins/bitmap/Makefile.in 2009-12-15 17:50:46 UTC (rev 62)
@@ -125,29 +125,10 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
Modified: trunk/wxdevcenter/plugins/text/Makefile.am
===================================================================
--- trunk/wxdevcenter/plugins/text/Makefile.am 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/plugins/text/Makefile.am 2009-12-15 17:50:46 UTC (rev 62)
@@ -8,14 +8,14 @@
plugin_LTLIBRARIES = libdctext.la
libdctext_la_SOURCES = \
+ editctrl.hpp \
+ editctrl.cpp \
text.hpp \
text.cpp \
view.hpp \
view.cpp \
prefs.hpp \
prefs.cpp \
- editctrl.hpp \
- editctrl.cpp \
bookmark.hpp \
bookmark.cpp \
text-search.hpp \
@@ -27,7 +27,7 @@
-I$(top_srcdir)/src
libdctext_la_INCLUDES = -I$(top_srcdir)/src
-libdctext_la_LDFLAGS = -L$(top_srcdir)/src
-libdctext_la_LIBADD = $(WX_LIBS)
+libdctext_la_LDFLAGS = -L$(top_srcdir)/src -L$(top_srcdir)/src/widgets
+libdctext_la_LIBADD = $(WX_LIBS) -lwxdcwidgets
#-l$(top_srcdir)/src/wxdevcenter
Modified: trunk/wxdevcenter/plugins/text/Makefile.in
===================================================================
--- trunk/wxdevcenter/plugins/text/Makefile.in 2009-12-05 12:46:52 UTC (rev 61)
+++ trunk/wxdevcenter/plugins/text/Makefile.in 2009-12-15 17:50:46 UTC (rev 62)
@@ -52,9 +52,10 @@
LTLIBRARIES = $(plugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
libdctext_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libdctext_la_OBJECTS = libdctext_la-text.lo libdctext_la-view.lo \
- libdctext_la-prefs.lo libdctext_la-editctrl.lo \
- libdctext_la-bookmark.lo libdctext_la-text-search.lo
+am_libdctext_la_OBJECTS = libdctext_la-editctrl.lo \
+ libdctext_la-text.lo libdctext_la-view.lo \
+ libdctext_la-prefs.lo libdctext_la-bookmark.lo \
+ libdctext_la-text-search.lo
libdctext_la_OBJECTS = $(am_libdctext_la_OBJECTS)
libdctext_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libdctext_la_CXXFLAGS) \
@@ -127,29 +128,10 @@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INSTOBJEXT = @INSTOBJEXT@
INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_...
[truncated message content] |
|
From: <cur...@us...> - 2009-12-05 12:47:01
|
Revision: 61
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=61&view=rev
Author: cursorstar
Date: 2009-12-05 12:46:52 +0000 (Sat, 05 Dec 2009)
Log Message:
-----------
Plugins have moved to root directory
Removed Paths:
-------------
trunk/wxdevcenter/src/plugins/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2009-12-05 12:43:03
|
Revision: 60
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=60&view=rev
Author: cursorstar
Date: 2009-12-05 12:42:53 +0000 (Sat, 05 Dec 2009)
Log Message:
-----------
Switch to wx29 : wxDC is not compatible with wx28 or less anymore.
Caution : wxDC actually dont run because of lake of exported symbole for internal of wxStyledTextCtrl.
Modified Paths:
--------------
trunk/wxdevcenter/configure
trunk/wxdevcenter/configure.ac
trunk/wxdevcenter/src/docview/document.cpp
trunk/wxdevcenter/src/ui/workbar.cpp
trunk/wxdevcenter/src/ui/workbar.hpp
Modified: trunk/wxdevcenter/configure
===================================================================
--- trunk/wxdevcenter/configure 2009-11-15 07:59:07 UTC (rev 59)
+++ trunk/wxdevcenter/configure 2009-12-05 12:42:53 UTC (rev 60)
@@ -5937,22 +5937,6 @@
fi
-#AM_OPTIONS_WXCONFIG
-#reqwx=2.8.8
-#AM_PATH_WXCONFIG($reqwx, wxWin=1)
-#if test "$wxWin" != 1; then
-# AC_MSG_ERROR([
-# wxWidgets must be installed on your system.
-#
-# Please check that wx-config is in path, the directory
-# where wxWidgets libraries are installed (returned by
-# 'wx-config --libs' or 'wx-config --static --libs' command)
-# is in LD_LIBRARY_PATH or equivalent variable and
-# wxWidgets version is $reqwx or above.
-# ])
-#fi
-
-
WXCONFIG="wx-config"
# Check whether --with-wx-config was given.
@@ -5976,7 +5960,6 @@
$as_echo "$as_me: error: wxWidgets is required. Try --with-wx-config." >&2;}
{ (exit 1); exit 1; }; }
fi
-
WXLIBS="xrc,stc,aui,html,qa,adv,core,xml,net,base"
WX_CPPFLAGS="`$WXCONFIG --cppflags $WXLIBS`"
WX_CXXFLAGS="`$WXCONFIG --cxxflags $WXLIBS`"
@@ -9544,13 +9527,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:9547: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:9530: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:9550: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:9533: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:9553: output\"" >&5)
+ (eval echo "\"\$as_me:9536: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -10755,7 +10738,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 10758 "configure"' > conftest.$ac_ext
+ echo '#line 10741 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -12839,11 +12822,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12842: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12825: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12846: \$? = $ac_status" >&5
+ echo "$as_me:12829: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13178,11 +13161,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13181: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13164: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13185: \$? = $ac_status" >&5
+ echo "$as_me:13168: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13283,11 +13266,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13286: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13269: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13290: \$? = $ac_status" >&5
+ echo "$as_me:13273: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13338,11 +13321,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13341: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13324: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13345: \$? = $ac_status" >&5
+ echo "$as_me:13328: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16151,7 +16134,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 16154 "configure"
+#line 16137 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16247,7 +16230,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 16250 "configure"
+#line 16233 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18267,11 +18250,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18270: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18253: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18274: \$? = $ac_status" >&5
+ echo "$as_me:18257: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18366,11 +18349,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18369: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18352: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18373: \$? = $ac_status" >&5
+ echo "$as_me:18356: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18418,11 +18401,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18421: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18404: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18425: \$? = $ac_status" >&5
+ echo "$as_me:18408: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
Modified: trunk/wxdevcenter/configure.ac
===================================================================
--- trunk/wxdevcenter/configure.ac 2009-11-15 07:59:07 UTC (rev 59)
+++ trunk/wxdevcenter/configure.ac 2009-12-05 12:42:53 UTC (rev 60)
@@ -12,22 +12,6 @@
AM_PROG_CC_STDC
AC_HEADER_STDC
-#AM_OPTIONS_WXCONFIG
-#reqwx=2.8.8
-#AM_PATH_WXCONFIG($reqwx, wxWin=1)
-#if test "$wxWin" != 1; then
-# AC_MSG_ERROR([
-# wxWidgets must be installed on your system.
-#
-# Please check that wx-config is in path, the directory
-# where wxWidgets libraries are installed (returned by
-# 'wx-config --libs' or 'wx-config --static --libs' command)
-# is in LD_LIBRARY_PATH or equivalent variable and
-# wxWidgets version is $reqwx or above.
-# ])
-#fi
-
-
WXCONFIG="wx-config"
AC_ARG_WITH(wx-config,
[[ --with-wx-config=FILE
@@ -45,7 +29,6 @@
AC_MSG_RESULT([not found])
AC_MSG_ERROR([wxWidgets is required. Try --with-wx-config.])
fi
-
WXLIBS="xrc,stc,aui,html,qa,adv,core,xml,net,base"
WX_CPPFLAGS="`$WXCONFIG --cppflags $WXLIBS`"
WX_CXXFLAGS="`$WXCONFIG --cxxflags $WXLIBS`"
Modified: trunk/wxdevcenter/src/docview/document.cpp
===================================================================
--- trunk/wxdevcenter/src/docview/document.cpp 2009-11-15 07:59:07 UTC (rev 59)
+++ trunk/wxdevcenter/src/docview/document.cpp 2009-12-05 12:42:53 UTC (rev 60)
@@ -14,8 +14,8 @@
#include <wx/choicdlg.h>
#include <wx/filename.h>
#include <wx/mimetype.h>
+#include <wx/filefn.h>
-
// ----------------------------------------------------------------------------
// local functions
// ----------------------------------------------------------------------------
@@ -23,7 +23,7 @@
static wxString FindExtension(const wxChar *path)
{
wxString ext;
- wxSplitPath(path, NULL, NULL, &ext);
+ wxFileName::SplitPath(path, NULL, NULL, NULL, &ext);
// VZ: extensions are considered not case sensitive - is this really a good
// idea?
@@ -841,7 +841,7 @@
{
wxString fileName(tmp);
wxString path, name, ext;
- wxSplitPath(fileName, & path, & name, & ext);
+ wxFileName::SplitPath(fileName, NULL, &path, &name, &ext);
if (ext.empty())
{
fileName += wxT(".");
Modified: trunk/wxdevcenter/src/ui/workbar.cpp
===================================================================
--- trunk/wxdevcenter/src/ui/workbar.cpp 2009-11-15 07:59:07 UTC (rev 59)
+++ trunk/wxdevcenter/src/ui/workbar.cpp 2009-12-05 12:42:53 UTC (rev 60)
@@ -61,11 +61,12 @@
dcWorkBarTemplate::dcWorkBarTemplate(const wxString& typeName, const wxString& descr,
wxClassInfo *classInfo, wxEvtHandler* target,
- wxSize defSize,int orient):
+ wxSize defSize,int orient/*, int flags*/):
Template<dcWorkBar>(classInfo, typeName, descr),
m_target(target),
m_defSize(defSize),
m_orient(orient)
+//m_flags(flags)
{
if(orient==0 && m_defSize!=wxDefaultSize)
{
@@ -157,6 +158,11 @@
bool dcWorkBarManager::Initialize()
{
+ m_actions = new dcActionGroupEntry(this, wxID_ANY, wxdcACTION_GROUP_ENTRY_VIEW, wxT(""), wxT(""), wxT(""), wxdcACTION_GROUP_PRIORITY_VIEW);
+ dcActionManager::Register(m_actions);
+
+
+
return true;
}
Modified: trunk/wxdevcenter/src/ui/workbar.hpp
===================================================================
--- trunk/wxdevcenter/src/ui/workbar.hpp 2009-11-15 07:59:07 UTC (rev 59)
+++ trunk/wxdevcenter/src/ui/workbar.hpp 2009-12-05 12:42:53 UTC (rev 60)
@@ -42,6 +42,13 @@
virtual wxSize DoGetBestSize() const;
};
+/**
+ * WorkBar template flags.
+ */
+enum WorkBarTemplateFlags{
+ dcWBTF_NONE = 0,
+ dcWBTF_INITIALLY_HIDDEN = 1
+};
/**
* WorkBar template
@@ -56,13 +63,16 @@
wxEvtHandler* m_target;
wxSize m_defSize;
int m_orient;
+// int m_flags;
public:
dcWorkBarTemplate(const wxString& typeName,
const wxString& descr,
wxClassInfo* classInfo = NULL,
wxEvtHandler* target = NULL,
wxSize defSize = wxDefaultSize,
- int orient = 0 /** Can be wxHORIZONTAL or wxVERTICAL or 0 for autodef*/);
+ int orient = 0 /** Can be wxHORIZONTAL or wxVERTICAL or 0 for autodef*/
+// int flags = 0 /** Can be */
+ );
virtual ~dcWorkBarTemplate(){}
virtual dcWorkBar* GetWorkBar(dcTopFrame* frame);
@@ -97,6 +107,10 @@
friend class dcWorkBarModule;
private:
static dcWorkBarManager* s_manager;
+
+protected:
+ dcActionGroupEntry* m_actions;
+
public:
static dcWorkBarManager& GetManager(){return *s_manager;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2009-11-15 07:59:16
|
Revision: 59
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=59&view=rev
Author: cursorstar
Date: 2009-11-15 07:59:07 +0000 (Sun, 15 Nov 2009)
Log Message:
-----------
Move plugin directory to prepare extenalization
Modified Paths:
--------------
trunk/wxdevcenter/Makefile.am
trunk/wxdevcenter/Makefile.in
trunk/wxdevcenter/aclocal.m4
trunk/wxdevcenter/config.h.in
trunk/wxdevcenter/configure
trunk/wxdevcenter/configure.ac
trunk/wxdevcenter/ltmain.sh
trunk/wxdevcenter/share/Makefile.in
trunk/wxdevcenter/share/xrc/Makefile.in
trunk/wxdevcenter/src/Makefile.am
trunk/wxdevcenter/src/Makefile.in
trunk/wxdevcenter/src/application.cpp
trunk/wxdevcenter/src/docview/Makefile.in
trunk/wxdevcenter/src/sys/Makefile.in
trunk/wxdevcenter/src/sys/action.cpp
trunk/wxdevcenter/src/sys/config.cpp
trunk/wxdevcenter/src/tools/Makefile.in
trunk/wxdevcenter/src/ui/Makefile.am
trunk/wxdevcenter/src/ui/Makefile.in
trunk/wxdevcenter/src/ui/dialog/Makefile.in
Added Paths:
-----------
trunk/wxdevcenter/plugins/
trunk/wxdevcenter/plugins/Makefile.am
trunk/wxdevcenter/plugins/Makefile.in
trunk/wxdevcenter/plugins/bitmap/
trunk/wxdevcenter/plugins/bitmap/Makefile.am
trunk/wxdevcenter/plugins/bitmap/Makefile.in
trunk/wxdevcenter/plugins/bitmap/bitmap.cpp
trunk/wxdevcenter/plugins/bitmap/bitmap.hpp
trunk/wxdevcenter/plugins/text/
trunk/wxdevcenter/plugins/text/Makefile.am
trunk/wxdevcenter/plugins/text/Makefile.in
trunk/wxdevcenter/plugins/text/bookmark.cpp
trunk/wxdevcenter/plugins/text/bookmark.hpp
trunk/wxdevcenter/plugins/text/editctrl.cpp
trunk/wxdevcenter/plugins/text/editctrl.hpp
trunk/wxdevcenter/plugins/text/prefs.cpp
trunk/wxdevcenter/plugins/text/prefs.hpp
trunk/wxdevcenter/plugins/text/scintilla/
trunk/wxdevcenter/plugins/text/scintilla/README.txt
trunk/wxdevcenter/plugins/text/scintilla/include/
trunk/wxdevcenter/plugins/text/scintilla/include/Accessor.h
trunk/wxdevcenter/plugins/text/scintilla/include/KeyWords.h
trunk/wxdevcenter/plugins/text/scintilla/include/Platform.h
trunk/wxdevcenter/plugins/text/scintilla/include/PropSet.h
trunk/wxdevcenter/plugins/text/scintilla/include/SString.h
trunk/wxdevcenter/plugins/text/scintilla/include/SciLexer.h
trunk/wxdevcenter/plugins/text/scintilla/include/Scintilla.h
trunk/wxdevcenter/plugins/text/scintilla/include/ScintillaWidget.h
trunk/wxdevcenter/plugins/text/scintilla/include/WindowAccessor.h
trunk/wxdevcenter/plugins/text/scintilla/src/
trunk/wxdevcenter/plugins/text/scintilla/src/AutoComplete.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/AutoComplete.h
trunk/wxdevcenter/plugins/text/scintilla/src/CallTip.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/CallTip.h
trunk/wxdevcenter/plugins/text/scintilla/src/CellBuffer.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/CellBuffer.h
trunk/wxdevcenter/plugins/text/scintilla/src/CharClassify.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/CharClassify.h
trunk/wxdevcenter/plugins/text/scintilla/src/ContractionState.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/ContractionState.h
trunk/wxdevcenter/plugins/text/scintilla/src/Document.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/Document.h
trunk/wxdevcenter/plugins/text/scintilla/src/DocumentAccessor.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/DocumentAccessor.h
trunk/wxdevcenter/plugins/text/scintilla/src/Editor.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/Editor.h
trunk/wxdevcenter/plugins/text/scintilla/src/ExternalLexer.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/ExternalLexer.h
trunk/wxdevcenter/plugins/text/scintilla/src/Indicator.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/Indicator.h
trunk/wxdevcenter/plugins/text/scintilla/src/KeyMap.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/KeyMap.h
trunk/wxdevcenter/plugins/text/scintilla/src/KeyWords.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexAPDL.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexAU3.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexAVE.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexAda.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexAsm.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexAsn1.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexBaan.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexBash.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexBasic.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexBullant.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexCLW.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexCPP.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexCSS.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexCaml.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexConf.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexCrontab.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexCsound.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexEScript.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexEiffel.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexErlang.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexFlagship.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexForth.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexFortran.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexGui4Cli.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexHTML.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexHaskell.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexInno.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexKix.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexLisp.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexLout.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexLua.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexMMIXAL.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexMPT.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexMSSQL.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexMatlab.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexMetapost.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexNsis.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexOpal.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexOthers.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexPB.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexPOV.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexPS.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexPascal.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexPerl.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexPython.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexRebol.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexRuby.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexSQL.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexScriptol.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexSmalltalk.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexSpecman.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexSpice.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexTADS3.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexTCL.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexTeX.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexVB.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexVHDL.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexVerilog.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LexYAML.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LineMarker.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/LineMarker.h
trunk/wxdevcenter/plugins/text/scintilla/src/PropSet.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/RESearch.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/RESearch.h
trunk/wxdevcenter/plugins/text/scintilla/src/SVector.h
trunk/wxdevcenter/plugins/text/scintilla/src/ScintillaBase.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/ScintillaBase.h
trunk/wxdevcenter/plugins/text/scintilla/src/Style.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/Style.h
trunk/wxdevcenter/plugins/text/scintilla/src/StyleContext.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/StyleContext.h
trunk/wxdevcenter/plugins/text/scintilla/src/UniConversion.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/UniConversion.h
trunk/wxdevcenter/plugins/text/scintilla/src/ViewStyle.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/ViewStyle.h
trunk/wxdevcenter/plugins/text/scintilla/src/WindowAccessor.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/XPM.cxx
trunk/wxdevcenter/plugins/text/scintilla/src/XPM.h
trunk/wxdevcenter/plugins/text/text-search.cpp
trunk/wxdevcenter/plugins/text/text-search.hpp
trunk/wxdevcenter/plugins/text/text.conf
trunk/wxdevcenter/plugins/text/text.cpp
trunk/wxdevcenter/plugins/text/text.hpp
trunk/wxdevcenter/plugins/text/view.cpp
trunk/wxdevcenter/plugins/text/view.hpp
trunk/wxdevcenter/plugins/uistd/
trunk/wxdevcenter/plugins/uistd/Makefile.am
trunk/wxdevcenter/plugins/uistd/Makefile.in
trunk/wxdevcenter/plugins/uistd/fsworkbar.cpp
trunk/wxdevcenter/plugins/uistd/fsworkbar.hpp
trunk/wxdevcenter/plugins/uistd/stdconfig.cpp
trunk/wxdevcenter/plugins/uistd/stdconfig.hpp
trunk/wxdevcenter/plugins/uistd/stdframe.cpp
trunk/wxdevcenter/plugins/uistd/stdframe.hpp
Modified: trunk/wxdevcenter/Makefile.am
===================================================================
--- trunk/wxdevcenter/Makefile.am 2009-09-11 06:10:29 UTC (rev 58)
+++ trunk/wxdevcenter/Makefile.am 2009-11-15 07:59:07 UTC (rev 59)
@@ -1,8 +1,7 @@
## Process this file with automake to produce Makefile.in
## Created by Anjuta
-SUBDIRS = . src po \
- share
+SUBDIRS = . src po share plugins
wxdevcenterdocdir = ${prefix}/doc/wxdevcenter
wxdevcenterdoc_DATA = \
Modified: trunk/wxdevcenter/Makefile.in
===================================================================
--- trunk/wxdevcenter/Makefile.in 2009-09-11 06:10:29 UTC (rev 58)
+++ trunk/wxdevcenter/Makefile.in 2009-11-15 07:59:07 UTC (rev 59)
@@ -105,14 +105,13 @@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
@@ -147,10 +146,12 @@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@@ -160,8 +161,12 @@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
+NM = @NM@
NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -195,7 +200,7 @@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -226,6 +231,7 @@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -241,9 +247,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = . src po \
- share
-
+SUBDIRS = . src po share plugins
wxdevcenterdocdir = ${prefix}/doc/wxdevcenter
wxdevcenterdoc_DATA = \
README\
Modified: trunk/wxdevcenter/aclocal.m4
===================================================================
--- trunk/wxdevcenter/aclocal.m4 2009-09-11 06:10:29 UTC (rev 58)
+++ trunk/wxdevcenter/aclocal.m4 2009-11-15 07:59:07 UTC (rev 59)
@@ -631,102 +631,188 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+# 2006, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
-# serial 52 AC_PROG_LIBTOOL
+m4_define([_LT_COPYING], [dnl
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+# 2006, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gordon Matzigkeit, 1996
+#
+# This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING. If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+# serial 56 LT_INIT
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
- [],
- [m4_define([AC_PROVIDE_IFELSE],
- [m4_ifdef([AC_PROVIDE_$1],
- [$2], [$3])])])
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+ [m4_default([$3],
+ [m4_fatal([Libtool version $1 or higher is required],
+ 63)])],
+ [$2])])
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
- AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [AC_LIBTOOL_CXX],
- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
- ])])
-dnl And a similar setup for Fortran 77 support
- AC_PROVIDE_IFELSE([AC_PROG_F77],
- [AC_LIBTOOL_F77],
- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [ifdef([AC_PROG_GCJ],
- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([A][M_PROG_GCJ],
- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([LT_AC_PROG_GCJ],
- [define([LT_AC_PROG_GCJ],
- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+ *\ * | *\ *)
+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="$ltmain"
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
AC_SUBST(LIBTOOL)dnl
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
+_LT_SETUP
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+ case $cc_temp in
+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
dnl
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+fi
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+_LT_PROG_ECHO_BACKSLASH
+
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
@@ -741,159 +827,653 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
# Sed substitution to delay expansion of an escaped shell variable in a
# double_quote_subst'ed string.
delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
# Sed substitution to avoid accidental globbing in evaled expressions
no_glob_subst='s/\*/\\\*/g'
-# Constants:
-rm="rm -f"
-
# Global variables:
-default_ofile=libtool
+ofile=libtool
can_build_shared=yes
# All known linkers require a `.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
+
with_gnu_ld="$lt_cv_prog_gnu_ld"
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
old_CC="$CC"
old_CFLAGS="$CFLAGS"
# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
- ;;
- *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
_LT_CC_BASENAME([$compiler])
# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- AC_PATH_MAGIC
+ _LT_PATH_MAGIC
fi
;;
esac
-_LT_REQUIRED_DARWIN_CHECKS
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-AC_ARG_ENABLE([libtool-lock],
- [AC_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
-AC_ARG_WITH([pic],
- [AC_HELP_STRING([--with-pic],
- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [pic_mode="$withval"],
- [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+ [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+ [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+ [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME. Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+ [m4_ifval([$1], [$1], [$2])])
+ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+ m4_ifval([$4],
+ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+ lt_dict_add_subkey([lt_decl_dict], [$2],
+ [tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+ [0], [m4_fatal([$0: too few arguments: $#])],
+ [1], [m4_fatal([$0: too few arguments: $#: $1])],
+ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+ [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+ m4_if([$2], [],
+ m4_quote(lt_decl_varnames),
+ m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'. VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly. In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
#
-# Note: This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
-# We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
-# calls AC_LIBTOOL_CONFIG and creates libtool.
+# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
#
-_LT_VERSION_CHECK
+# # Some comment about what VAR is for.
+# visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+ [description])))[]dnl
+m4_pushdef([_libtool_name],
+ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+ [0], [_libtool_name=[$]$1],
+ [1], [_libtool_name=$lt_[]$1],
+ [2], [_libtool_name=$lt_[]$1],
+ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-# _LT_VERSION_CHECK
-# -----------------
-AC_DEFUN([_LT_VERSION_CHECK],
-[AC_MSG_CHECKING([for correct ltmain.sh version])
-if test "x$ltmain" = "x" ; then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([
-*** @<:@Gentoo@:>@ sanity check failed! ***
-*** \$ltmain is not defined, please check the patch for consistency! ***
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'. Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+ dnl If the libtool generation code has been placed in $CONFIG_LT,
+ dnl instead of duplicating it all over again into config.status,
+ dnl then we will have config.status run $CONFIG_LT later, so it
+ dnl needs to know what name is stored there:
+ [AC_CONFIG_COMMANDS([libtool],
+ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+ dnl If the libtool generation code is destined for config.status,
+ dnl expand the accumulated commands and init code now:
+ [AC_CONFIG_COMMANDS([libtool],
+ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[[\\\\\\\`\\"\\\$]]*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+# Fix-up fallback echo if it was mangled by the above quoting rules.
+case \$lt_ECHO in
+*'\\\[$]0 --fallback-echo"')dnl "
+ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
+ ;;
+esac
+
+_LT_OUTPUT_LIBTOOL_INIT
])
+
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+cat >"$CONFIG_LT" <<_LTEOF
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate a libtool stub with the current configuration.
+
+lt_cl_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AS_SHELL_SANITIZE
+_AS_PREPARE
+
+exec AS_MESSAGE_FD>&1
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+ echo
+ AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+ -h, --help print this help, then exit
+ -V, --version print version number, then exit
+ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+
+Report bugs to <bug...@gn...>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2008 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+ case $[1] in
+ --version | --v* | -V )
+ echo "$lt_cl_version"; exit 0 ;;
+ --help | --h* | -h )
+ echo "$lt_cl_help"; exit 0 ;;
+ --debug | --d* | -d )
+ debug=: ;;
+ --quiet | --q* | --silent | --s* | -q )
+ lt_cl_silent=: ;;
+
+ -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+ *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+ esac
+ shift
+done
+
+if $lt_cl_silent; then
+ exec AS_MESSAGE_FD>/dev/null
fi
-gentoo_lt_version="1.5.26"
-gentoo_ltmain_version=`sed -n '/^[[ ]]*VERSION=/{s/^[[ ]]*VERSION=//;p;q;}' "$ltmain"`
-if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([
+_LTEOF
-*** @<:@Gentoo@:>@ sanity check failed! ***
-*** libtool.m4 and ltmain.sh have a version mismatch! ***
-*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
-Please run:
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
- libtoolize --copy --force
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure. Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+if test "$no_create" != yes; then
+ lt_cl_success=:
+ test "$silent" = yes &&
+ lt_config_lt_args="$lt_config_lt_args --quiet"
+ exec AS_MESSAGE_LOG_FD>/dev/null
+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+ exec AS_MESSAGE_LOG_FD>>config.log
+ $lt_cl_success || AS_EXIT(1)
+fi
+])# LT_OUTPUT
-if appropriate, please contact the maintainer of this
-package (or your distribution) for help.
-])
-else
- AC_MSG_RESULT(yes)
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars. Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+ m4_if(_LT_TAG, [C], [
+ # See if we are running on zsh, and set the options which allow our
+ # commands through without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+ fi
+
+ cfgfile="${ofile}T"
+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+ $RM "$cfgfile"
+
+ cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+ case $host_os in
+ aix3*)
+ cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program. For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
fi
-])# _LT_VERSION_CHECK
+_LT_EOF
+ ;;
+ esac
+ _LT_PROG_LTMAIN
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
+ # We use sed instead of cat because bash on DJGPP gets confused if
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
+ # text mode, it properly converts lines to CR/LF. This bash problem
+ # is reportedly fixed, but why not run on old versions too?
+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ _LT_PROG_XSI_SHELLFNS
+
+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ mv -f "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+ PACKAGE='$PACKAGE'
+ VERSION='$VERSION'
+ TIMESTAMP='$TIMESTAMP'
+ RM='$RM'
+ ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+# autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+ [C], [_LT_LANG(C)],
+ [C++], [_LT_LANG(CXX)],
+ [Java], [_LT_LANG(GCJ)],
+ [Fortran 77], [_LT_LANG(F77)],
+ [Fortran], [_LT_LANG(FC)],
+ [Windows Resource], [_LT_LANG(RC)],
+ [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+ [_LT_LANG($1)],
+ [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+ [LT_SUPPORTED_TAG([$1])dnl
+ m4_append([_LT_TAGS], [$1 ])dnl
+ m4_define([_LT_LANG_]$1[_enabled], [])dnl
+ _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ [LT_LANG(CXX)],
+ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+ [LT_LANG(F77)],
+ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+ [LT_LANG(FC)],
+ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+ [LT_LANG(GCJ)],
+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+ [LT_LANG(GCJ)],
+ [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+ [LT_LANG(GCJ)],
+ [m4_ifdef([AC_PROG_GCJ],
+ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+ m4_ifdef([A][M_PROG_GCJ],
+ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+ m4_ifdef([LT_PROG_GCJ],
+ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+ [LT_LANG(RC)],
+ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
[AC_REQUIRE([AC_PROG_CC])dnl
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
# If no C compiler was specified, use CC.
LTCC=${LTCC-"$CC"}
@@ -902,36 +1482,20 @@
# Allow CC to be a program name with arguments.
compiler=$CC
-])# _LT_AC_SYS_COMPILER
+])# _LT_TAG_COMPILER
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
# _LT_COMPILER_BOILERPLATE
# ------------------------
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" >conftest.$ac_ext
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
+$RM conftest*
])# _LT_COMPILER_BOILERPLATE
@@ -939,39 +1503,57 @@
# ----------------------
# Check for linker boilerplate output or warnings with
# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
ac_outfile=conftest.$ac_objext
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
+$RM -r conftest*
])# _LT_LINKER_BOILERPLATE
# _LT_REQUIRED_DARWIN_CHECKS
-# --------------------------
-# Check for some things on darwin
-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
case $host_os in
rhapsody* | darwin*)
AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+ AC_CHECK_TOOL([LIPO], [lipo], [:])
+ AC_CHECK_TOOL([OTOOL], [otool], [:])
+ AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+ _LT_DECL([], [DSYMUTIL], [1],
+ [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+ _LT_DECL([], [NMEDIT], [1],
+ [Tool to change global to local symbols on Mac OS X])
+ _LT_DECL([], [LIPO], [1],
+ [Tool to manipulate fat objects and archives on Mac OS X])
+ _LT_DECL([], [OTOOL], [1],
+ [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+ _LT_DECL([], [OTOOL64], [1],
+ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
[lt_cv_apple_cc_single_mod=no
if test -z "${LT_MULTI_MODULE}"; then
- # By default we will add the -single_module flag. You can override
- # by either setting the environment variable LT_MULTI_MODULE
- # non-empty at configure time, or by adding -multi_module to the
- # link flags.
- echo "int foo(void){return 1;}" > conftest.c
- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
- -dynamiclib ${wl}-single_module conftest.c
- if test -f libconftest.dylib; then
- lt_cv_apple_cc_single_mod=yes
- rm -rf libconftest.dylib*
- fi
- rm conftest.c
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ rm -rf libconftest.dylib*
+ echo "int foo(void){return 1;}" > conftest.c
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+ _lt_result=$?
+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+ fi
+ rm -rf libconftest.dylib*
+ rm -f conftest.*
fi])
AC_CACHE_CHECK([for -exported_symbols_list linker flag],
[lt_cv_ld_exported_symbols_list],
@@ -980,26 +1562,26 @@
echo "_main" > conftest.sym
LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [lt_cv_ld_exported_symbols_list=yes],
- [lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
+ [lt_cv_ld_exported_symbols_list=yes],
+ [lt_cv_ld_exported_symbols_list=no])
+ LDFLAGS="$save_LDFLAGS"
])
case $host_os in
- rhapsody* | darwin1.[[0123]])
+ rhapsody* | darwin1.[[012]])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]]*)
+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
@@ -1009,10 +1591,10 @@
if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
_lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
else
- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
if test "$DSYMUTIL" != ":"; then
- _lt_dsymutil="~$DSYMUTIL \$lib || :"
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
fi
@@ -1020,16 +1602,51 @@
esac
])
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
+
+# _LT_DARWIN_LINKER_FEATURES
+# --------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+ m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ case $cc_basename in
+ ifort*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+ output_verbose_link_cmd=echo
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ m4_if([$1], [CXX],
+[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+],[])
+ else
+ _LT_TAGVAR(ld_shlibs, $1)=no
+ fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX
+# -----------------------
# Links a minimal program and checks the executable
# for the system default hardcoded library path. In most cases,
# this is /usr/lib:/lib, but when the MPI compilers are used
# the location of the communication and MPI libs are included too.
# If we don't find anything, use the default library path according
# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
AC_LINK_IFELSE(AC_LANG_PROGRAM,[
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
@@ -1044,45 +1661,45 @@
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi],[])
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
+])# _LT_SYS_MODULE_PATH_AIX
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
[ifdef([AC_DIVERSION_NOTICE],
[AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
[AC_DIVERT_PUSH(NOTICE)])
$1
AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
+])# _LT_SHELL_INIT
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
# Add some code to the start of the generated configure script which
# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[_LT_SHELL_INIT([
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-case X$ECHO in
+case X$lt_ECHO in
X*--fallback-echo)
# Remove one level of quotation (which was required for Make).
- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
;;
esac
-echo=${ECHO-echo}
+ECHO=${lt_ECHO-echo}
if test "X[$]1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
shift
elif test "X[$]1" = X--fallback-echo; then
# Avoid inline document here, it may be left over
:
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
- # Yippee, $echo works!
+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
+ # Yippee, $ECHO works!
:
else
# Restart under the correct shell.
@@ -1092,9 +1709,9 @@
if test "X[$]1" = X--fallback-echo; then
# used as fallback echo
shift
- cat <<EOF
+ cat <<_LT_EOF
[$]*
-EOF
+_LT_EOF
exit 0
fi
@@ -1102,124 +1719,127 @@
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if (echo_test_string=`eval $cmd`) 2>/dev/null &&
- echo_test_string=`eval $cmd` &&
- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
- then
- break
- fi
- done
-fi
+if test -z "$lt_ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
+ then
+ break
+ fi
+ done
+ fi
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
-else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ :
+ else
+ # The Solaris, AIX, and Digital Unix default echo programs unquote
+ # backslashes. This makes it impossible to quote backslashes using
+ # echo "$something" | sed 's/\\/\\\\/g'
+ #
+ # So, first we look for a working echo in the user's PATH.
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ for dir in $PATH /usr/ucb; do
+ IFS="$lt_save_ifs"
+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+ test "X$echo_testing_string" = "X$echo_test_string"; then
+ ECHO="$dir/echo"
+ break
+ fi
+ done
IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
- if test "X$echo" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- echo='print -r'
- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
- else
- # Try using printf.
- echo='printf %s\n'
- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+ if test "X$ECHO" = Xecho; then
+ # We didn't find a better echo, so look...
[truncated message content] |
|
From: <cur...@us...> - 2009-09-11 06:10:37
|
Revision: 58
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=58&view=rev
Author: cursorstar
Date: 2009-09-11 06:10:29 +0000 (Fri, 11 Sep 2009)
Log Message:
-----------
Simplify build.
Modified Paths:
--------------
trunk/wxdevcenter/src/Makefile.am
trunk/wxdevcenter/src/Makefile.in
trunk/wxdevcenter/src/docview/Makefile.am
trunk/wxdevcenter/src/docview/Makefile.in
trunk/wxdevcenter/src/sys/Makefile.am
trunk/wxdevcenter/src/sys/Makefile.in
trunk/wxdevcenter/src/tools/Makefile
trunk/wxdevcenter/src/tools/Makefile.am
trunk/wxdevcenter/src/tools/Makefile.in
trunk/wxdevcenter/src/ui/Makefile.am
trunk/wxdevcenter/src/ui/Makefile.in
trunk/wxdevcenter/src/ui/dialog/Makefile.am
trunk/wxdevcenter/src/ui/dialog/Makefile.in
Modified: trunk/wxdevcenter/src/Makefile.am
===================================================================
--- trunk/wxdevcenter/src/Makefile.am 2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/Makefile.am 2009-09-11 06:10:29 UTC (rev 58)
@@ -25,18 +25,51 @@
lib_LTLIBRARIES = \
libwxdevcenter.la
-libwxdevcenter_la_SOURCES =
+libwxdevcenter_la_SOURCES = \
+ sys/iterator.hpp \
+ sys/action.hpp \
+ sys/action.cpp \
+ sys/manager.hpp \
+ sys/manager.cpp \
+ sys/plugin.hpp \
+ sys/plugin.cpp \
+ sys/config.hpp \
+ sys/config.cpp \
+ sys/task.hpp \
+ sys/task.cpp \
+ sys/bookmark.hpp \
+ sys/bookmark.cpp \
+ sys/search.hpp \
+ sys/search.cpp \
+ tools/bitvector.hpp \
+ tools/bitvector.cpp \
+ docview/document.hpp \
+ docview/document.cpp \
+ docview/view.hpp \
+ docview/view.cpp \
+ docview/project.hpp \
+ docview/project.cpp \
+ docview/workspace.hpp \
+ docview/workspace.cpp \
+ ui/dialog/newdocument.hpp \
+ ui/dialog/newdocument.cpp \
+ ui/dialog/opendocument.hpp \
+ ui/dialog/opendocument.cpp \
+ ui/frame.hpp \
+ ui/frame.cpp \
+ ui/perspective.hpp \
+ ui/perspective.cpp \
+ ui/workbar.hpp \
+ ui/workbar.cpp \
+ ui/configui.hpp \
+ ui/configui.cpp \
+ ui/art.hpp \
+ ui/art.cpp
+
libwxdevcenter_la_LIBADD = \
- ui/libui.la \
- ui/libuistd.la \
- ui/dialog/libuidialog.la \
- sys/libsys.la \
- tools/libtools.la \
- docview/libdocview.la
+ ui/libuistd.la
-
-
bin_PROGRAMS = wxdevcenter
wxdevcenter_SOURCES = \
Modified: trunk/wxdevcenter/src/Makefile.in
===================================================================
--- trunk/wxdevcenter/src/Makefile.in 2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/Makefile.in 2009-09-11 06:10:29 UTC (rev 58)
@@ -52,10 +52,12 @@
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
-libwxdevcenter_la_DEPENDENCIES = ui/libui.la ui/libuistd.la \
- ui/dialog/libuidialog.la sys/libsys.la tools/libtools.la \
- docview/libdocview.la
-am_libwxdevcenter_la_OBJECTS =
+libwxdevcenter_la_DEPENDENCIES = ui/libuistd.la
+am_libwxdevcenter_la_OBJECTS = action.lo manager.lo plugin.lo \
+ config.lo task.lo bookmark.lo search.lo bitvector.lo \
+ document.lo view.lo project.lo workspace.lo newdocument.lo \
+ opendocument.lo frame.lo perspective.lo workbar.lo configui.lo \
+ art.lo
libwxdevcenter_la_OBJECTS = $(am_libwxdevcenter_la_OBJECTS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
@@ -285,14 +287,49 @@
lib_LTLIBRARIES = \
libwxdevcenter.la
-libwxdevcenter_la_SOURCES =
+libwxdevcenter_la_SOURCES = \
+ sys/iterator.hpp \
+ sys/action.hpp \
+ sys/action.cpp \
+ sys/manager.hpp \
+ sys/manager.cpp \
+ sys/plugin.hpp \
+ sys/plugin.cpp \
+ sys/config.hpp \
+ sys/config.cpp \
+ sys/task.hpp \
+ sys/task.cpp \
+ sys/bookmark.hpp \
+ sys/bookmark.cpp \
+ sys/search.hpp \
+ sys/search.cpp \
+ tools/bitvector.hpp \
+ tools/bitvector.cpp \
+ docview/document.hpp \
+ docview/document.cpp \
+ docview/view.hpp \
+ docview/view.cpp \
+ docview/project.hpp \
+ docview/project.cpp \
+ docview/workspace.hpp \
+ docview/workspace.cpp \
+ ui/dialog/newdocument.hpp \
+ ui/dialog/newdocument.cpp \
+ ui/dialog/opendocument.hpp \
+ ui/dialog/opendocument.cpp \
+ ui/frame.hpp \
+ ui/frame.cpp \
+ ui/perspective.hpp \
+ ui/perspective.cpp \
+ ui/workbar.hpp \
+ ui/workbar.cpp \
+ ui/configui.hpp \
+ ui/configui.cpp \
+ ui/art.hpp \
+ ui/art.cpp
+
libwxdevcenter_la_LIBADD = \
- ui/libui.la \
- ui/libuistd.la \
- ui/dialog/libuidialog.la \
- sys/libsys.la \
- tools/libtools.la \
- docview/libdocview.la
+ ui/libuistd.la
wxdevcenter_SOURCES = \
application.cpp \
@@ -366,7 +403,7 @@
rm -f "$${dir}/so_locations"; \
done
libwxdevcenter.la: $(libwxdevcenter_la_OBJECTS) $(libwxdevcenter_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libwxdevcenter_la_OBJECTS) $(libwxdevcenter_la_LIBADD) $(LIBS)
+ $(CXXLINK) -rpath $(libdir) $(libwxdevcenter_la_OBJECTS) $(libwxdevcenter_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -405,7 +442,26 @@
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/action.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/application.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/art.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitvector.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bookmark.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configui.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/document.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/frame.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newdocument.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opendocument.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perspective.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/project.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workbar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workspace.Plo@am__quote@
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -428,6 +484,139 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+action.lo: sys/action.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT action.lo -MD -MP -MF $(DEPDIR)/action.Tpo -c -o action.lo `test -f 'sys/action.cpp' || echo '$(srcdir)/'`sys/action.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/action.Tpo $(DEPDIR)/action.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sys/action.cpp' object='action.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o action.lo `test -f 'sys/action.cpp' || echo '$(srcdir)/'`sys/action.cpp
+
+manager.lo: sys/manager.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT manager.lo -MD -MP -MF $(DEPDIR)/manager.Tpo -c -o manager.lo `test -f 'sys/manager.cpp' || echo '$(srcdir)/'`sys/manager.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/manager.Tpo $(DEPDIR)/manager.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sys/manager.cpp' object='manager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o manager.lo `test -f 'sys/manager.cpp' || echo '$(srcdir)/'`sys/manager.cpp
+
+plugin.lo: sys/plugin.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT plugin.lo -MD -MP -MF $(DEPDIR)/plugin.Tpo -c -o plugin.lo `test -f 'sys/plugin.cpp' || echo '$(srcdir)/'`sys/plugin.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/plugin.Tpo $(DEPDIR)/plugin.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sys/plugin.cpp' object='plugin.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o plugin.lo `test -f 'sys/plugin.cpp' || echo '$(srcdir)/'`sys/plugin.cpp
+
+config.lo: sys/config.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT config.lo -MD -MP -MF $(DEPDIR)/config.Tpo -c -o config.lo `test -f 'sys/config.cpp' || echo '$(srcdir)/'`sys/config.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/config.Tpo $(DEPDIR)/config.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sys/config.cpp' object='config.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o config.lo `test -f 'sys/config.cpp' || echo '$(srcdir)/'`sys/config.cpp
+
+task.lo: sys/task.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT task.lo -MD -MP -MF $(DEPDIR)/task.Tpo -c -o task.lo `test -f 'sys/task.cpp' || echo '$(srcdir)/'`sys/task.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/task.Tpo $(DEPDIR)/task.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sys/task.cpp' object='task.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o task.lo `test -f 'sys/task.cpp' || echo '$(srcdir)/'`sys/task.cpp
+
+bookmark.lo: sys/bookmark.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bookmark.lo -MD -MP -MF $(DEPDIR)/bookmark.Tpo -c -o bookmark.lo `test -f 'sys/bookmark.cpp' || echo '$(srcdir)/'`sys/bookmark.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/bookmark.Tpo $(DEPDIR)/bookmark.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sys/bookmark.cpp' object='bookmark.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bookmark.lo `test -f 'sys/bookmark.cpp' || echo '$(srcdir)/'`sys/bookmark.cpp
+
+search.lo: sys/search.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT search.lo -MD -MP -MF $(DEPDIR)/search.Tpo -c -o search.lo `test -f 'sys/search.cpp' || echo '$(srcdir)/'`sys/search.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/search.Tpo $(DEPDIR)/search.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='sys/search.cpp' object='search.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o search.lo `test -f 'sys/search.cpp' || echo '$(srcdir)/'`sys/search.cpp
+
+bitvector.lo: tools/bitvector.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bitvector.lo -MD -MP -MF $(DEPDIR)/bitvector.Tpo -c -o bitvector.lo `test -f 'tools/bitvector.cpp' || echo '$(srcdir)/'`tools/bitvector.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/bitvector.Tpo $(DEPDIR)/bitvector.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='tools/bitvector.cpp' object='bitvector.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bitvector.lo `test -f 'tools/bitvector.cpp' || echo '$(srcdir)/'`tools/bitvector.cpp
+
+document.lo: docview/document.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT document.lo -MD -MP -MF $(DEPDIR)/document.Tpo -c -o document.lo `test -f 'docview/document.cpp' || echo '$(srcdir)/'`docview/document.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/document.Tpo $(DEPDIR)/document.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='docview/document.cpp' object='document.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o document.lo `test -f 'docview/document.cpp' || echo '$(srcdir)/'`docview/document.cpp
+
+view.lo: docview/view.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT view.lo -MD -MP -MF $(DEPDIR)/view.Tpo -c -o view.lo `test -f 'docview/view.cpp' || echo '$(srcdir)/'`docview/view.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/view.Tpo $(DEPDIR)/view.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='docview/view.cpp' object='view.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o view.lo `test -f 'docview/view.cpp' || echo '$(srcdir)/'`docview/view.cpp
+
+project.lo: docview/project.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT project.lo -MD -MP -MF $(DEPDIR)/project.Tpo -c -o project.lo `test -f 'docview/project.cpp' || echo '$(srcdir)/'`docview/project.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/project.Tpo $(DEPDIR)/project.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='docview/project.cpp' object='project.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o project.lo `test -f 'docview/project.cpp' || echo '$(srcdir)/'`docview/project.cpp
+
+workspace.lo: docview/workspace.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT workspace.lo -MD -MP -MF $(DEPDIR)/workspace.Tpo -c -o workspace.lo `test -f 'docview/workspace.cpp' || echo '$(srcdir)/'`docview/workspace.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/workspace.Tpo $(DEPDIR)/workspace.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='docview/workspace.cpp' object='workspace.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o workspace.lo `test -f 'docview/workspace.cpp' || echo '$(srcdir)/'`docview/workspace.cpp
+
+newdocument.lo: ui/dialog/newdocument.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT newdocument.lo -MD -MP -MF $(DEPDIR)/newdocument.Tpo -c -o newdocument.lo `test -f 'ui/dialog/newdocument.cpp' || echo '$(srcdir)/'`ui/dialog/newdocument.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/newdocument.Tpo $(DEPDIR)/newdocument.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ui/dialog/newdocument.cpp' object='newdocument.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o newdocument.lo `test -f 'ui/dialog/newdocument.cpp' || echo '$(srcdir)/'`ui/dialog/newdocument.cpp
+
+opendocument.lo: ui/dialog/opendocument.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT opendocument.lo -MD -MP -MF $(DEPDIR)/opendocument.Tpo -c -o opendocument.lo `test -f 'ui/dialog/opendocument.cpp' || echo '$(srcdir)/'`ui/dialog/opendocument.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/opendocument.Tpo $(DEPDIR)/opendocument.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ui/dialog/opendocument.cpp' object='opendocument.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o opendocument.lo `test -f 'ui/dialog/opendocument.cpp' || echo '$(srcdir)/'`ui/dialog/opendocument.cpp
+
+frame.lo: ui/frame.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT frame.lo -MD -MP -MF $(DEPDIR)/frame.Tpo -c -o frame.lo `test -f 'ui/frame.cpp' || echo '$(srcdir)/'`ui/frame.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/frame.Tpo $(DEPDIR)/frame.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ui/frame.cpp' object='frame.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o frame.lo `test -f 'ui/frame.cpp' || echo '$(srcdir)/'`ui/frame.cpp
+
+perspective.lo: ui/perspective.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT perspective.lo -MD -MP -MF $(DEPDIR)/perspective.Tpo -c -o perspective.lo `test -f 'ui/perspective.cpp' || echo '$(srcdir)/'`ui/perspective.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/perspective.Tpo $(DEPDIR)/perspective.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ui/perspective.cpp' object='perspective.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o perspective.lo `test -f 'ui/perspective.cpp' || echo '$(srcdir)/'`ui/perspective.cpp
+
+workbar.lo: ui/workbar.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT workbar.lo -MD -MP -MF $(DEPDIR)/workbar.Tpo -c -o workbar.lo `test -f 'ui/workbar.cpp' || echo '$(srcdir)/'`ui/workbar.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/workbar.Tpo $(DEPDIR)/workbar.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ui/workbar.cpp' object='workbar.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o workbar.lo `test -f 'ui/workbar.cpp' || echo '$(srcdir)/'`ui/workbar.cpp
+
+configui.lo: ui/configui.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT configui.lo -MD -MP -MF $(DEPDIR)/configui.Tpo -c -o configui.lo `test -f 'ui/configui.cpp' || echo '$(srcdir)/'`ui/configui.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/configui.Tpo $(DEPDIR)/configui.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ui/configui.cpp' object='configui.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o configui.lo `test -f 'ui/configui.cpp' || echo '$(srcdir)/'`ui/configui.cpp
+
+art.lo: ui/art.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT art.lo -MD -MP -MF $(DEPDIR)/art.Tpo -c -o art.lo `test -f 'ui/art.cpp' || echo '$(srcdir)/'`ui/art.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/art.Tpo $(DEPDIR)/art.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='ui/art.cpp' object='art.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o art.lo `test -f 'ui/art.cpp' || echo '$(srcdir)/'`ui/art.cpp
+
mostlyclean-libtool:
-rm -f *.lo
Modified: trunk/wxdevcenter/src/docview/Makefile.am
===================================================================
--- trunk/wxdevcenter/src/docview/Makefile.am 2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/docview/Makefile.am 2009-09-11 06:10:29 UTC (rev 58)
@@ -1,19 +1,5 @@
-INCLUDES = \
- $(WX_CXXFLAGS)
-noinst_LTLIBRARIES = libdocview.la
-libdocview_la_SOURCES = \
- document.hpp \
- document.cpp \
- view.hpp \
- view.cpp \
- project.hpp \
- project.cpp \
- workspace.hpp \
- workspace.cpp
-
-
## File created by the gnome-build tools
Modified: trunk/wxdevcenter/src/docview/Makefile.in
===================================================================
--- trunk/wxdevcenter/src/docview/Makefile.in 2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/docview/Makefile.in 2009-09-11 06:10:29 UTC (rev 58)
@@ -13,7 +13,6 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -41,35 +40,8 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libdocview_la_LIBADD =
-am_libdocview_la_OBJECTS = document.lo view.lo project.lo workspace.lo
-libdocview_la_OBJECTS = $(am_libdocview_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(libdocview_la_SOURCES)
-DIST_SOURCES = $(libdocview_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
+SOURCES =
+DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -231,24 +203,9 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = \
- $(WX_CXXFLAGS)
-
-noinst_LTLIBRARIES = libdocview.la
-libdocview_la_SOURCES = \
- document.hpp \
- document.cpp \
- view.hpp \
- view.cpp \
- project.hpp \
- project.cpp \
- workspace.hpp \
- workspace.cpp
-
all: all-am
.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -279,102 +236,18 @@
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-libdocview.la: $(libdocview_la_OBJECTS) $(libdocview_la_DEPENDENCIES)
- $(CXXLINK) $(libdocview_la_OBJECTS) $(libdocview_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/document.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/project.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/workspace.Plo@am__quote@
-
-.cpp.o:
-@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
tags: TAGS
+TAGS:
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+CTAGS:
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -403,7 +276,7 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile
installdirs:
install: install-am
install-exec: install-exec-am
@@ -431,14 +304,11 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
- mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -469,14 +339,12 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-am
@@ -490,18 +358,16 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: trunk/wxdevcenter/src/sys/Makefile.am
===================================================================
--- trunk/wxdevcenter/src/sys/Makefile.am 2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/sys/Makefile.am 2009-09-11 06:10:29 UTC (rev 58)
@@ -1,31 +1,4 @@
-INCLUDES = \
- $(WX_CXXFLAGS)
-
-noinst_LTLIBRARIES = libsys.la
-
-libsys_la_SOURCES = \
- iterator.hpp \
- action.hpp \
- action.cpp \
- manager.hpp \
- manager.cpp \
- plugin.hpp \
- plugin.cpp \
- config.hpp \
- config.cpp \
- task.hpp \
- task.cpp \
- bookmark.hpp \
- bookmark.cpp \
- search.hpp \
- search.cpp
-
-libsys_la_CXXFLAGS = \
- -DPLUGIN_LIBDIR="\"$(PLUGIN_LIBDIR)\"" \
- -DPLUGIN_DATADIR="\"$(PLUGIN_DATADIR)\"" \
- -DDATADIR="\"$(datadir)\""
-
## File created by the gnome-build tools
Modified: trunk/wxdevcenter/src/sys/Makefile.in
===================================================================
--- trunk/wxdevcenter/src/sys/Makefile.in 2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/sys/Makefile.in 2009-09-11 06:10:29 UTC (rev 58)
@@ -13,7 +13,6 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -41,40 +40,8 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libsys_la_LIBADD =
-am_libsys_la_OBJECTS = libsys_la-action.lo libsys_la-manager.lo \
- libsys_la-plugin.lo libsys_la-config.lo libsys_la-task.lo \
- libsys_la-bookmark.lo libsys_la-search.lo
-libsys_la_OBJECTS = $(am_libsys_la_OBJECTS)
-libsys_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libsys_la_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(libsys_la_SOURCES)
-DIST_SOURCES = $(libsys_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
+SOURCES =
+DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
@@ -236,36 +203,9 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-INCLUDES = \
- $(WX_CXXFLAGS)
-
-noinst_LTLIBRARIES = libsys.la
-libsys_la_SOURCES = \
- iterator.hpp \
- action.hpp \
- action.cpp \
- manager.hpp \
- manager.cpp \
- plugin.hpp \
- plugin.cpp \
- config.hpp \
- config.cpp \
- task.hpp \
- task.cpp \
- bookmark.hpp \
- bookmark.cpp \
- search.hpp \
- search.cpp
-
-libsys_la_CXXFLAGS = \
- -DPLUGIN_LIBDIR="\"$(PLUGIN_LIBDIR)\"" \
- -DPLUGIN_DATADIR="\"$(PLUGIN_DATADIR)\"" \
- -DDATADIR="\"$(datadir)\""
-
all: all-am
.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -296,154 +236,18 @@
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-libsys.la: $(libsys_la_OBJECTS) $(libsys_la_DEPENDENCIES)
- $(libsys_la_LINK) $(libsys_la_OBJECTS) $(libsys_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-action.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-bookmark.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-plugin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-search.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-task.Plo@am__quote@
-
-.cpp.o:
-@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
-libsys_la-action.lo: action.cpp
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-action.lo -MD -MP -MF $(DEPDIR)/libsys_la-action.Tpo -c -o libsys_la-action.lo `test -f 'action.cpp' || echo '$(srcdir)/'`action.cpp
-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libsys_la-action.Tpo $(DEPDIR)/libsys_la-action.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='action.cpp' object='libsys_la-action.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-action.lo `test -f 'action.cpp' || echo '$(srcdir)/'`action.cpp
-
-libsys_la-manager.lo: manager.cpp
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-manager.lo -MD -MP -MF $(DEPDIR)/libsys_la-manager.Tpo -c -o libsys_la-manager.lo `test -f 'manager.cpp' || echo '$(srcdir)/'`manager.cpp
-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libsys_la-manager.Tpo $(DEPDIR)/libsys_la-manager.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='manager.cpp' object='libsys_la-manager.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-manager.lo `test -f 'manager.cpp' || echo '$(srcdir)/'`manager.cpp
-
-libsys_la-plugin.lo: plugin.cpp
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-plugin.lo -MD -MP -MF $(DEPDIR)/libsys_la-plugin.Tpo -c -o libsys_la-plugin.lo `test -f 'plugin.cpp' || echo '$(srcdir)/'`plugin.cpp
-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libsys_la-plugin.Tpo $(DEPDIR)/libsys_la-plugin.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='plugin.cpp' object='libsys_la-plugin.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-plugin.lo `test -f 'plugin.cpp' || echo '$(srcdir)/'`plugin.cpp
-
-libsys_la-config.lo: config.cpp
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-config.lo -MD -MP -MF $(DEPDIR)/libsys_la-config.Tpo -c -o libsys_la-config.lo `test -f 'config.cpp' || echo '$(srcdir)/'`config.cpp
-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libsys_la-config.Tpo $(DEPDIR)/libsys_la-config.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='config.cpp' object='libsys_la-config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-config.lo `test -f 'config.cpp' || echo '$(srcdir)/'`config.cpp
-
-libsys_la-task.lo: task.cpp
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-task.lo -MD -MP -MF $(DEPDIR)/libsys_la-task.Tpo -c -o libsys_la-task.lo `test -f 'task.cpp' || echo '$(srcdir)/'`task.cpp
-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libsys_la-task.Tpo $(DEPDIR)/libsys_la-task.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='task.cpp' object='libsys_la-task.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-task.lo `test -f 'task.cpp' || echo '$(srcdir)/'`task.cpp
-
-libsys_la-bookmark.lo: bookmark.cpp
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-bookmark.lo -MD -MP -MF $(DEPDIR)/libsys_la-bookmark.Tpo -c -o libsys_la-bookmark.lo `test -f 'bookmark.cpp' || echo '$(srcdir)/'`bookmark.cpp
-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libsys_la-bookmark.Tpo $(DEPDIR)/libsys_la-bookmark.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='bookmark.cpp' object='libsys_la-bookmark.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-bookmark.lo `test -f 'bookmark.cpp' || echo '$(srcdir)/'`bookmark.cpp
-
-libsys_la-search.lo: search.cpp
-@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-search.lo -MD -MP -MF $(DEPDIR)/libsys_la-search.Tpo -c -o libsys_la-search.lo `test -f 'search.cpp' || echo '$(srcdir)/'`search.cpp
-@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libsys_la-search.Tpo $(DEPDIR)/libsys_la-search.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='search.cpp' object='libsys_la-search.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-search.lo `test -f 'search.cpp' || echo '$(srcdir)/'`search.cpp
-
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
tags: TAGS
+TAGS:
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+CTAGS:
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -472,7 +276,7 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile
installdirs:
install: install-am
install-exec: install-exec-am
@@ -500,14 +304,11 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
- mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -538,14 +339,12 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-am
@@ -559,18 +358,16 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: trunk/wxdevcenter/src/tools/Makefile
===================================================================
--- trunk/wxdevcenter/src/tools/Makefile 2009-09-10 15:20:49 UTC (rev 57)
+++ trunk/wxdevcenter/src/tools/Makefile 2009-09-11 06:10:29 UTC (rev 58)
@@ -14,7 +14,6 @@
-
pkgdatadir = $(datadir)/wxdevcenter
pkglibdir = $(libdir)/wxdevcenter
pkgincludedir = $(includedir)/wxdevcenter
@@ -41,38 +40,8 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libtools_la_LIBADD =
-am_libtools_la_OBJECTS = libtools_la-bitvector.lo
-libtools_la_OBJECTS = $(am_libtools_la_OBJECTS)
-libtools_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libtools_la_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(libtools_la_SOURCES)
-DIST_SOURCES = $(libtools_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
+SOURCES =
+DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /home/mimile/Projects/wxdevcenter/missing --run aclocal-1.10
ALL_LINGUAS =
@@ -234,25 +203,9 @@
top_build_prefix = ../../
top_builddir = ../..
top_srcdir = ../..
-INCLUDES = \
- $(WX_CXXFLAGS)
-
-noinst_LTLIBRARIES = \
- libtools.la
-
-libtools_la_SOURCES = \
- bitvector.hpp\
- bitvector.cpp
-
-libtools_la_CXXFLAGS = \
- -DPLUGIN_LIBDIR="\"$(PLUGIN_LIBDIR)\"" \
- -DPLUGIN_DATADIR="\"$(PLUGIN_DATADIR)\"" \
- -DDATADIR="\"$(datadir)\""
-
all: all-am
.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -283,106 +236,18 @@
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-libtools.la: $(libtools_la_OBJECTS) $(libtools_la_DEPENDENCIES)
- $(libtools_la_LINK) $(libtools_la_OBJECTS) $(libtools_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-include ./$(DEPDIR)/libtools_la-bitvector.Plo
-
-.cpp.o:
- $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-# source='$<' object='$@' libtool=no \
-# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-# $(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
- $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-# source='$<' object='$@' libtool=no \
-# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
- $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-# source='$<' object='$@' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-# $(LTCXXCOMPILE) -c -o $@ $<
-
-libtools_la-bitvector.lo: bitvector.cpp
- $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtools_la_CXXFLAGS) $(CXXFLAGS) -MT libtools_la-bitvector.lo -MD -MP -MF $(DEPDIR)/libtools_la-bitvector.Tpo -c -o libtools_la-bitvector.lo `test -f 'bitvector.cpp' || echo '$(srcdir)/'`bitvector.cpp
- mv -f $(DEPDIR)/libtools_la-bitvector.Tpo $(DEPDIR)/libtools_la-bitvector.Plo
-# source='bitvector.cpp' object='libtools_la-bitvector.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtools_la_CXXFLAGS) $(CXXFLAGS) -c -o libtools_la-bitvector.lo `test -f 'bitvector.cpp' || echo '$(srcdir)/'`bitvector.cpp
-
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
tags: TAGS
+TAGS:
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+CTAGS:
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -411,7 +276,7 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile
installdirs:
install: install-am
install-exec: install-exec-am
@@ -439,14 +304,11 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
- mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
+distclean-am: clean-am distclean-generic
dvi: dvi-am
@@ -477,14 +339,12 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-am
@@ -498,18 +358,16 @@
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am
+.PHONY: all all-am ...
[truncated message content] |
|
From: <cur...@us...> - 2009-09-10 15:21:06
|
Revision: 57
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=57&view=rev
Author: cursorstar
Date: 2009-09-10 15:20:49 +0000 (Thu, 10 Sep 2009)
Log Message:
-----------
Intend to add pch
Modified Paths:
--------------
trunk/wxdevcenter/Makefile.am
trunk/wxdevcenter/Makefile.in
trunk/wxdevcenter/src/Makefile.am
trunk/wxdevcenter/src/Makefile.in
trunk/wxdevcenter/src/plugins/text/bookmark.cpp
trunk/wxdevcenter/src/plugins/text/bookmark.hpp
trunk/wxdevcenter/src/plugins/text/text.cpp
trunk/wxdevcenter/src/plugins/text/view.cpp
trunk/wxdevcenter/src/sys/action.hpp
trunk/wxdevcenter/src/sys/bookmark.hpp
trunk/wxdevcenter/src/sys/search.hpp
trunk/wxdevcenter/src/wxdevcenter.hpp
Modified: trunk/wxdevcenter/Makefile.am
===================================================================
--- trunk/wxdevcenter/Makefile.am 2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/Makefile.am 2009-09-10 15:20:49 UTC (rev 57)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
## Created by Anjuta
-SUBDIRS = src po \
+SUBDIRS = . src po \
share
wxdevcenterdocdir = ${prefix}/doc/wxdevcenter
@@ -23,3 +23,9 @@
fi \
done
+
+# overide default process to create pch
+all-local: src/wxdevcenter.hpp.gch
+
+src/wxdevcenter.hpp.gch:
+ cd src && $(MAKE) $(AM_MAKEFLAGS) wxdevcenter.hpp.gch
Modified: trunk/wxdevcenter/Makefile.in
===================================================================
--- trunk/wxdevcenter/Makefile.in 2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/Makefile.in 2009-09-10 15:20:49 UTC (rev 57)
@@ -241,7 +241,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = src po \
+SUBDIRS = . src po \
share
wxdevcenterdocdir = ${prefix}/doc/wxdevcenter
@@ -618,7 +618,7 @@
exit 1; } >&2
check-am: all-am
check: check-recursive
-all-am: Makefile $(DATA) config.h
+all-am: Makefile $(DATA) config.h all-local
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(wxdevcenterdocdir)"; do \
@@ -710,21 +710,22 @@
install-strip
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
- distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip install-wxdevcenterdocDATA installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-wxdevcenterdocDATA
+ all all-am all-local am--refresh check check-am clean \
+ clean-generic clean-libtool ctags ctags-recursive dist \
+ dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \
+ dist-tarZ dist-zip distcheck distclean distclean-generic \
+ distclean-hdr distclean-libtool distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-data install-data-am \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip install-wxdevcenterdocDATA \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am \
+ uninstall-wxdevcenterdocDATA
# Copy all the spec files. Of cource, only one is actually used.
@@ -734,6 +735,12 @@
cp -p $$specfile $(distdir); \
fi \
done
+
+# overide default process to create pch
+all-local: src/wxdevcenter.hpp.gch
+
+src/wxdevcenter.hpp.gch:
+ cd src && $(MAKE) $(AM_MAKEFLAGS) wxdevcenter.hpp.gch
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: trunk/wxdevcenter/src/Makefile.am
===================================================================
--- trunk/wxdevcenter/src/Makefile.am 2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/Makefile.am 2009-09-10 15:20:49 UTC (rev 57)
@@ -50,5 +50,7 @@
$(WXDEVCENTER_LIBS) \
$(WX_LIBS)
+CLEANFILES = wxdevcenter.hpp.gch
-
+wxdevcenter.hpp.gch: wxdevcenter.hpp
+ $(CXXCOMPILE) -Winvalid-pch -c wxdevcenter.hpp -o wxdevcenter.hpp.gch
Modified: trunk/wxdevcenter/src/Makefile.in
===================================================================
--- trunk/wxdevcenter/src/Makefile.in 2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/Makefile.in 2009-09-10 15:20:49 UTC (rev 57)
@@ -304,6 +304,7 @@
$(WXDEVCENTER_LIBS) \
$(WX_LIBS)
+CLEANFILES = wxdevcenter.hpp.gch
all: all-recursive
.SUFFIXES:
@@ -633,6 +634,7 @@
mostlyclean-generic:
clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -719,6 +721,9 @@
tags tags-recursive uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-libLTLIBRARIES
+
+wxdevcenter.hpp.gch: wxdevcenter.hpp
+ $(CXXCOMPILE) -Winvalid-pch -c wxdevcenter.hpp -o wxdevcenter.hpp.gch
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: trunk/wxdevcenter/src/plugins/text/bookmark.cpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/bookmark.cpp 2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/plugins/text/bookmark.cpp 2009-09-10 15:20:49 UTC (rev 57)
@@ -32,7 +32,7 @@
// dcBookmarkList
//==========================================================================
-void dcBookmarkList::insert(const dcBookmark& bm)
+void dcBookmarkList::insert(const dcTextBookmark& bm)
{
for(iterator it=begin(); it!=end(); it++)
{
@@ -48,7 +48,7 @@
void dcBookmarkList::Insert(int line, const wxString& name)
{
- dcBookmark bm = {line, name};
+ dcTextBookmark bm = {line, name};
insert(bm);
}
@@ -114,7 +114,7 @@
bool modified = false;
for(iterator iter=begin(); iter!=end(); iter++)
{
- dcBookmark& bm = *iter;
+ dcTextBookmark& bm = *iter;
if(bm.line>=pos)
{
bm.line += nb;
@@ -170,7 +170,7 @@
else if(list!=NULL)
{
wxString num = line.BeforeFirst(wxT(':'));
- dcBookmark bm;
+ dcTextBookmark bm;
bm.line = 0;
num.ToLong(&bm.line);
if(bm.line>0)
@@ -204,7 +204,7 @@
for(dcBookmarkList::iterator it=list.begin(); it!=list.end(); it++)
{
- const dcBookmark& bm = *it;
+ const dcTextBookmark& bm = *it;
text.Write32(bm.line);
text.WriteString(wxT(" : ") + bm.name + wxT("\n"));
}
Modified: trunk/wxdevcenter/src/plugins/text/bookmark.hpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/bookmark.hpp 2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/plugins/text/bookmark.hpp 2009-09-10 15:20:49 UTC (rev 57)
@@ -17,8 +17,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _BOOKMARK_HPP_
-#define _BOOKMARK_HPP_
+#ifndef _TEXTBOOKMARK_HPP_
+#define _TEXTBOOKMARK_HPP_
#include <map>
#include <list>
@@ -26,19 +26,19 @@
class wxListCtrl;
class dcTextView;
-struct dcBookmark
+struct dcTextBookmark
{
long line;
wxString name;
- bool operator<(const dcBookmark& bm)const{return line<bm.line;}
+ bool operator<(const dcTextBookmark& bm)const{return line<bm.line;}
};
-class dcBookmarkList : public std::list<dcBookmark>
+class dcBookmarkList : public std::list<dcTextBookmark>
{
- typedef std::list<dcBookmark> List;
+ typedef std::list<dcTextBookmark> List;
public:
- void insert(const dcBookmark& bm);
+ void insert(const dcTextBookmark& bm);
void Insert(int line, const wxString& name);
void Remove(int line);
@@ -83,5 +83,5 @@
dcTextView* m_view;
};
-#endif // _BOOKMARK_HPP_
+#endif // _TEXTBOOKMARK_HPP_
Modified: trunk/wxdevcenter/src/plugins/text/text.cpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/text.cpp 2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/plugins/text/text.cpp 2009-09-10 15:20:49 UTC (rev 57)
@@ -4,6 +4,7 @@
* @author Emilien KIA
*/
#include "../../wxdevcenter.hpp"
+
#include "text.hpp"
#include "view.hpp"
Modified: trunk/wxdevcenter/src/plugins/text/view.cpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/view.cpp 2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/plugins/text/view.cpp 2009-09-10 15:20:49 UTC (rev 57)
@@ -524,7 +524,7 @@
if(!name.IsEmpty())
{
dcBookmarkList& list = dcBookmarkProvider::Get(GetDocument()->GetFilename());
- dcBookmark bm = {line, name};
+ dcTextBookmark bm = {line, name};
list.insert(bm);
UpdateBookmarkWorkBar();
Modified: trunk/wxdevcenter/src/sys/action.hpp
===================================================================
--- trunk/wxdevcenter/src/sys/action.hpp 2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/sys/action.hpp 2009-09-10 15:20:49 UTC (rev 57)
@@ -22,6 +22,7 @@
#include <set>
#include <map>
+#include "../ui/perspective.hpp"
/**
* Action combo key descriptor.
Modified: trunk/wxdevcenter/src/sys/bookmark.hpp
===================================================================
--- trunk/wxdevcenter/src/sys/bookmark.hpp 2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/sys/bookmark.hpp 2009-09-10 15:20:49 UTC (rev 57)
@@ -20,6 +20,8 @@
#ifndef _BOOKMARK_HPP_
#define _BOOKMARK_HPP_
+#include <wx/uri.h>
+
/**
* dcBookmark
*/
Modified: trunk/wxdevcenter/src/sys/search.hpp
===================================================================
--- trunk/wxdevcenter/src/sys/search.hpp 2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/sys/search.hpp 2009-09-10 15:20:49 UTC (rev 57)
@@ -21,6 +21,7 @@
#define _SEARCH_HPP_
#include "bookmark.hpp"
+#include "../ui/workbar.hpp"
#include <set>
#include <list>
Modified: trunk/wxdevcenter/src/wxdevcenter.hpp
===================================================================
--- trunk/wxdevcenter/src/wxdevcenter.hpp 2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/wxdevcenter.hpp 2009-09-10 15:20:49 UTC (rev 57)
@@ -107,16 +107,26 @@
/*
* Global inclusions :
*/
+#include "sys/action.hpp"
+#include "sys/bookmark.hpp"
+#include "sys/config.hpp"
+#include "sys/iterator.hpp"
#include "sys/manager.hpp"
-#include "ui/perspective.hpp"
-#include "sys/action.hpp"
+#include "sys/plugin.hpp"
+#include "sys/search.hpp"
+#include "sys/task.hpp"
#include "docview/workspace.hpp"
#include "docview/project.hpp"
#include "docview/document.hpp"
#include "docview/view.hpp"
+#include "tools/bitvector.hpp"
+
+#include "ui/art.hpp"
+#include "ui/configui.hpp"
#include "ui/frame.hpp"
+#include "ui/perspective.hpp"
#include "ui/workbar.hpp"
#endif /*WXDEVCENTER_H_*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2009-09-10 11:28:19
|
Revision: 56
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=56&view=rev
Author: cursorstar
Date: 2009-09-10 11:28:12 +0000 (Thu, 10 Sep 2009)
Log Message:
-----------
Cleanup
Removed Paths:
-------------
trunk/wxdevcenter/src/tools/.deps/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2009-09-10 11:25:34
|
Revision: 55
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=55&view=rev
Author: cursorstar
Date: 2009-09-10 11:25:22 +0000 (Thu, 10 Sep 2009)
Log Message:
-----------
Add begin of search text in files.
Add bookmark raising.
Added Paths:
-----------
trunk/wxdevcenter/src/tools/
trunk/wxdevcenter/src/tools/.deps/
trunk/wxdevcenter/src/tools/.deps/bitvector.Plo
trunk/wxdevcenter/src/tools/.deps/libtools_la-bitvector.Plo
trunk/wxdevcenter/src/tools/.deps/libtools_la-uri.Plo
trunk/wxdevcenter/src/tools/Makefile
trunk/wxdevcenter/src/tools/Makefile.am
trunk/wxdevcenter/src/tools/Makefile.am.bak
trunk/wxdevcenter/src/tools/Makefile.in
trunk/wxdevcenter/src/tools/bitvector.cpp
trunk/wxdevcenter/src/tools/bitvector.hpp
Added: trunk/wxdevcenter/src/tools/.deps/bitvector.Plo
===================================================================
--- trunk/wxdevcenter/src/tools/.deps/bitvector.Plo (rev 0)
+++ trunk/wxdevcenter/src/tools/.deps/bitvector.Plo 2009-09-10 11:25:22 UTC (rev 55)
@@ -0,0 +1,103 @@
+bitvector.lo: bitvector.cpp bitvector.hpp \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/vector \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_algobase.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++config.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/os_defines.h \
+ /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+ /usr/include/gnu/stubs-32.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/cpu_defines.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cstddef \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/stddef.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/functexcept.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/exception_defines.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/cpp_type_traits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/type_traits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/numeric_traits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_pair.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_move.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/concept_check.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator_base_types.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator_base_funcs.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/debug/debug.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/allocator.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++allocator.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/new_allocator.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/new \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/exception \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_construct.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_uninitialized.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_vector.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_bvector.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/vector.tcc
+
+bitvector.hpp:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/vector:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_algobase.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++config.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/os_defines.h:
+
+/usr/include/features.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/bits/wordsize.h:
+
+/usr/include/gnu/stubs.h:
+
+/usr/include/gnu/stubs-32.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/cpu_defines.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cstddef:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/stddef.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/functexcept.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/exception_defines.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/cpp_type_traits.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/type_traits.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/numeric_traits.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_pair.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_move.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/concept_check.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator_base_types.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator_base_funcs.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/debug/debug.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/allocator.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++allocator.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/new_allocator.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/new:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/exception:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_construct.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_uninitialized.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_vector.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_bvector.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/vector.tcc:
Added: trunk/wxdevcenter/src/tools/.deps/libtools_la-bitvector.Plo
===================================================================
--- trunk/wxdevcenter/src/tools/.deps/libtools_la-bitvector.Plo (rev 0)
+++ trunk/wxdevcenter/src/tools/.deps/libtools_la-bitvector.Plo 2009-09-10 11:25:22 UTC (rev 55)
@@ -0,0 +1,103 @@
+libtools_la-bitvector.lo: bitvector.cpp bitvector.hpp \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/vector \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_algobase.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++config.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/os_defines.h \
+ /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+ /usr/include/gnu/stubs-32.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/cpu_defines.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cstddef \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/stddef.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/functexcept.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/exception_defines.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/cpp_type_traits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/type_traits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/numeric_traits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_pair.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_move.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/concept_check.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator_base_types.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator_base_funcs.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/debug/debug.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/allocator.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++allocator.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/new_allocator.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/new \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/exception \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_construct.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_uninitialized.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_vector.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_bvector.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/vector.tcc
+
+bitvector.hpp:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/vector:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_algobase.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++config.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/os_defines.h:
+
+/usr/include/features.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/bits/wordsize.h:
+
+/usr/include/gnu/stubs.h:
+
+/usr/include/gnu/stubs-32.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/cpu_defines.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cstddef:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/stddef.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/functexcept.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/exception_defines.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/cpp_type_traits.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/type_traits.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/numeric_traits.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_pair.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_move.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/concept_check.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator_base_types.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator_base_funcs.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/debug/debug.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/allocator.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++allocator.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/new_allocator.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/new:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/exception:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_construct.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_uninitialized.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_vector.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_bvector.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/vector.tcc:
Added: trunk/wxdevcenter/src/tools/.deps/libtools_la-uri.Plo
===================================================================
--- trunk/wxdevcenter/src/tools/.deps/libtools_la-uri.Plo (rev 0)
+++ trunk/wxdevcenter/src/tools/.deps/libtools_la-uri.Plo 2009-09-10 11:25:22 UTC (rev 55)
@@ -0,0 +1,1068 @@
+libtools_la-uri.lo: uri.cpp ../wxdevcenter.hpp \
+ /usr/include/wx-2.9/wx/wxprec.h /usr/include/wx-2.9/wx/defs.h \
+ /usr/include/wx-2.9/wx/platform.h \
+ /usr/lib/wx/include/gtk2-unicode-release-2.9/wx/setup.h \
+ /usr/include/wx-2.9/wx/chkconf.h /usr/include/wx-2.9/wx/gtk/chkconf.h \
+ /usr/include/wx-2.9/wx/unix/chkconf.h /usr/include/wx-2.9/wx/version.h \
+ /usr/include/wx-2.9/wx/cpp.h /usr/include/wx-2.9/wx/dlimpexp.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/stddef.h \
+ /usr/include/wx-2.9/wx/debug.h /usr/include/assert.h \
+ /usr/include/features.h /usr/include/sys/cdefs.h \
+ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+ /usr/include/gnu/stubs-32.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include-fixed/limits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include-fixed/syslimits.h \
+ /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+ /usr/include/bits/posix2_lim.h /usr/include/bits/xopen_lim.h \
+ /usr/include/bits/stdio_lim.h /usr/include/wx-2.9/wx/chartype.h \
+ /usr/include/wchar.h /usr/include/stdio.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/stdarg.h \
+ /usr/include/bits/wchar.h /usr/include/xlocale.h \
+ /usr/include/sys/types.h /usr/include/bits/types.h \
+ /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/bits/byteswap.h \
+ /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/sigset.h /usr/include/bits/time.h \
+ /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
+ /usr/include/wx-2.9/wx/windowid.h /usr/include/wx-2.9/wx/features.h \
+ /usr/include/wx-2.9/wx/wx.h /usr/include/wx-2.9/wx/object.h \
+ /usr/include/wx-2.9/wx/memory.h /usr/include/wx-2.9/wx/string.h \
+ /usr/include/string.h /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \
+ /usr/include/stdlib.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/alloca.h \
+ /usr/include/wx-2.9/wx/wxcrtbase.h /usr/include/ctype.h \
+ /usr/include/wctype.h /usr/include/wx-2.9/wx/strvararg.h \
+ /usr/include/wx-2.9/wx/strconv.h /usr/include/wx-2.9/wx/buffer.h \
+ /usr/include/wx-2.9/wx/fontenc.h /usr/include/wx-2.9/wx/unichar.h \
+ /usr/include/wx-2.9/wx/stringimpl.h /usr/include/wx-2.9/wx/beforestd.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/string \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++config.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/os_defines.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/cpu_defines.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stringfwd.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/char_traits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_algobase.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cstddef \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/stddef.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/functexcept.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/exception_defines.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/cpp_type_traits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/type_traits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/numeric_traits.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_pair.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_move.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/concept_check.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator_base_types.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator_base_funcs.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/debug/debug.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/postypes.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cwchar \
+ /usr/include/wchar.h /usr/include/stdint.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cstdio \
+ /usr/include/stdio.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/allocator.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++allocator.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/new_allocator.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/new \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/exception \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/localefwd.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++locale.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/clocale \
+ /usr/include/locale.h /usr/include/bits/locale.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/iosfwd \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cctype \
+ /usr/include/ctype.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/ostream_insert.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cxxabi-forced.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_function.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/backward/binders.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/basic_string.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/atomicity.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/gthr.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/gthr-default.h \
+ /usr/include/pthread.h /usr/include/sched.h /usr/include/bits/sched.h \
+ /usr/include/signal.h /usr/include/bits/setjmp.h /usr/include/unistd.h \
+ /usr/include/bits/posix_opt.h /usr/include/bits/environments.h \
+ /usr/include/bits/confname.h /usr/include/getopt.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/atomic_word.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/basic_string.tcc \
+ /usr/include/wx-2.9/wx/afterstd.h /usr/include/wx-2.9/wx/stringops.h \
+ /usr/include/wx-2.9/wx/tls.h /usr/include/wx-2.9/wx/iosfwrap.h \
+ /usr/include/wx-2.9/wx/crt.h /usr/include/wx-2.9/wx/wxcrt.h \
+ /usr/include/wx-2.9/wx/wxcrtvararg.h /usr/include/wx-2.9/wx/msgout.h \
+ /usr/include/wx-2.9/wx/dynarray.h /usr/include/wx-2.9/wx/list.h \
+ /usr/include/wx-2.9/wx/hash.h /usr/include/wx-2.9/wx/hashmap.h \
+ /usr/include/wx-2.9/wx/arrstr.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/iterator \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ostream \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ios \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/ios_base.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/locale_classes.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/locale_classes.tcc \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/streambuf \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/streambuf.tcc \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/basic_ios.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/locale_facets.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cwctype \
+ /usr/include/wctype.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/ctype_base.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/streambuf_iterator.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/ctype_inline.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/locale_facets.tcc \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/basic_ios.tcc \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/ostream.tcc \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/istream \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/istream.tcc \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stream_iterator.h \
+ /usr/include/wx-2.9/wx/intl.h /usr/include/wx-2.9/wx/log.h \
+ /usr/include/wx-2.9/wx/generic/logg.h /usr/include/wx-2.9/wx/event.h \
+ /usr/include/wx-2.9/wx/clntdata.h /usr/include/wx-2.9/wx/gdicmn.h \
+ /usr/include/wx-2.9/wx/math.h /usr/include/math.h \
+ /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \
+ /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
+ /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
+ /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h \
+ /usr/include/wx-2.9/wx/cursor.h /usr/include/wx-2.9/wx/gtk/cursor.h \
+ /usr/include/wx-2.9/wx/gdiobj.h /usr/include/wx-2.9/wx/utils.h \
+ /usr/include/wx-2.9/wx/filefn.h /usr/include/sys/stat.h \
+ /usr/include/bits/stat.h /usr/include/dirent.h \
+ /usr/include/bits/dirent.h /usr/include/fcntl.h \
+ /usr/include/bits/fcntl.h /usr/include/bits/uio.h \
+ /usr/include/wx-2.9/wx/mousestate.h /usr/include/wx-2.9/wx/kbdstate.h \
+ /usr/include/wx-2.9/wx/longlong.h /usr/include/wx-2.9/wx/platinfo.h \
+ /usr/include/wx-2.9/wx/thread.h /usr/include/wx-2.9/wx/tracker.h \
+ /usr/include/wx-2.9/wx/meta/convertible.h /usr/include/wx-2.9/wx/app.h \
+ /usr/include/wx-2.9/wx/build.h /usr/include/wx-2.9/wx/cmdargs.h \
+ /usr/include/wx-2.9/wx/init.h /usr/include/wx-2.9/wx/unix/app.h \
+ /usr/include/bits/signum.h /usr/include/bits/siginfo.h \
+ /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
+ /usr/include/asm/sigcontext.h /usr/include/asm/types.h \
+ /usr/include/asm-generic/int-ll64.h /usr/include/bits/sigstack.h \
+ /usr/include/sys/ucontext.h /usr/include/bits/sigthread.h \
+ /usr/include/wx-2.9/wx/gtk/app.h /usr/include/wx-2.9/wx/stream.h \
+ /usr/include/wx-2.9/wx/stopwatch.h /usr/include/wx-2.9/wx/timer.h \
+ /usr/include/wx-2.9/wx/module.h /usr/include/wx-2.9/wx/window.h \
+ /usr/include/wx-2.9/wx/font.h /usr/include/wx-2.9/wx/gtk/font.h \
+ /usr/include/wx-2.9/wx/colour.h /usr/include/wx-2.9/wx/variant.h \
+ /usr/include/wx-2.9/wx/datetime.h /usr/include/wx-2.9/wx/anystr.h \
+ /usr/include/wx-2.9/wx/gtk/colour.h /usr/include/wx-2.9/wx/region.h \
+ /usr/include/wx-2.9/wx/gtk/region.h /usr/include/wx-2.9/wx/validate.h \
+ /usr/include/wx-2.9/wx/palette.h \
+ /usr/include/wx-2.9/wx/generic/paletteg.h \
+ /usr/include/wx-2.9/wx/accel.h /usr/include/wx-2.9/wx/gtk/accel.h \
+ /usr/include/wx-2.9/wx/generic/accel.h \
+ /usr/include/wx-2.9/wx/gtk/window.h /usr/include/wx-2.9/wx/containr.h \
+ /usr/include/wx-2.9/wx/panel.h /usr/include/wx-2.9/wx/generic/panelg.h \
+ /usr/include/wx-2.9/wx/toplevel.h /usr/include/wx-2.9/wx/nonownedwnd.h \
+ /usr/include/wx-2.9/wx/iconbndl.h /usr/include/wx-2.9/wx/icon.h \
+ /usr/include/wx-2.9/wx/iconloc.h /usr/include/wx-2.9/wx/generic/icon.h \
+ /usr/include/wx-2.9/wx/bitmap.h /usr/include/wx-2.9/wx/gtk/bitmap.h \
+ /usr/include/wx-2.9/wx/weakref.h /usr/include/wx-2.9/wx/meta/int2type.h \
+ /usr/include/wx-2.9/wx/gtk/toplevel.h /usr/include/wx-2.9/wx/frame.h \
+ /usr/include/wx-2.9/wx/gtk/frame.h /usr/include/wx-2.9/wx/image.h \
+ /usr/include/wx-2.9/wx/imagbmp.h /usr/include/wx-2.9/wx/imagpng.h \
+ /usr/include/wx-2.9/wx/imaggif.h /usr/include/wx-2.9/wx/imagpcx.h \
+ /usr/include/wx-2.9/wx/imagjpeg.h /usr/include/wx-2.9/wx/imagtga.h \
+ /usr/include/wx-2.9/wx/imagtiff.h /usr/include/wx-2.9/wx/imagpnm.h \
+ /usr/include/wx-2.9/wx/imagxpm.h /usr/include/wx-2.9/wx/imagiff.h \
+ /usr/include/wx-2.9/wx/dc.h /usr/include/wx-2.9/wx/brush.h \
+ /usr/include/wx-2.9/wx/gtk/brush.h /usr/include/wx-2.9/wx/pen.h \
+ /usr/include/wx-2.9/wx/gtk/pen.h /usr/include/wx-2.9/wx/cmndata.h \
+ /usr/include/wx-2.9/wx/encinfo.h /usr/include/wx-2.9/wx/dcclient.h \
+ /usr/include/wx-2.9/wx/dcmemory.h /usr/include/wx-2.9/wx/dcprint.h \
+ /usr/include/wx-2.9/wx/dcscreen.h /usr/include/wx-2.9/wx/button.h \
+ /usr/include/wx-2.9/wx/control.h /usr/include/wx-2.9/wx/gtk/control.h \
+ /usr/include/wx-2.9/wx/gtk/button.h /usr/include/wx-2.9/wx/menuitem.h \
+ /usr/include/wx-2.9/wx/gtk/menuitem.h /usr/include/wx-2.9/wx/menu.h \
+ /usr/include/wx-2.9/wx/gtk/menu.h /usr/include/wx-2.9/wx/dialog.h \
+ /usr/include/wx-2.9/wx/gtk/dialog.h /usr/include/wx-2.9/wx/settings.h \
+ /usr/include/wx-2.9/wx/msgdlg.h /usr/include/wx-2.9/wx/stockitem.h \
+ /usr/include/wx-2.9/wx/gtk/msgdlg.h /usr/include/wx-2.9/wx/dataobj.h \
+ /usr/include/wx-2.9/wx/gtk/dataform.h \
+ /usr/include/wx-2.9/wx/gtk/dataobj.h \
+ /usr/include/wx-2.9/wx/gtk/dataobj2.h /usr/include/wx-2.9/wx/ctrlsub.h \
+ /usr/include/wx-2.9/wx/bmpbuttn.h /usr/include/wx-2.9/wx/gtk/bmpbuttn.h \
+ /usr/include/wx-2.9/wx/checkbox.h /usr/include/wx-2.9/wx/gtk/checkbox.h \
+ /usr/include/wx-2.9/wx/checklst.h /usr/include/wx-2.9/wx/listbox.h \
+ /usr/include/wx-2.9/wx/gtk/listbox.h \
+ /usr/include/wx-2.9/wx/gtk/checklst.h /usr/include/wx-2.9/wx/choice.h \
+ /usr/include/wx-2.9/wx/gtk/choice.h /usr/include/wx-2.9/wx/scrolbar.h \
+ /usr/include/wx-2.9/wx/gtk/scrolbar.h /usr/include/wx-2.9/wx/stattext.h \
+ /usr/include/wx-2.9/wx/gtk/stattext.h /usr/include/wx-2.9/wx/statbmp.h \
+ /usr/include/wx-2.9/wx/gtk/statbmp.h /usr/include/wx-2.9/wx/statbox.h \
+ /usr/include/wx-2.9/wx/gtk/statbox.h /usr/include/wx-2.9/wx/radiobox.h \
+ /usr/include/wx-2.9/wx/gtk/radiobox.h /usr/include/wx-2.9/wx/radiobut.h \
+ /usr/include/wx-2.9/wx/gtk/radiobut.h /usr/include/wx-2.9/wx/textctrl.h \
+ /usr/include/wx-2.9/wx/textentry.h \
+ /usr/include/wx-2.9/wx/gtk/textentry.h /usr/include/wx-2.9/wx/ioswrap.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/iostream \
+ /usr/include/wx-2.9/wx/gtk/textctrl.h /usr/include/wx-2.9/wx/slider.h \
+ /usr/include/wx-2.9/wx/gtk/slider.h /usr/include/wx-2.9/wx/gauge.h \
+ /usr/include/wx-2.9/wx/gtk/gauge.h /usr/include/wx-2.9/wx/scrolwin.h \
+ /usr/include/wx-2.9/wx/gtk/scrolwin.h /usr/include/wx-2.9/wx/dirdlg.h \
+ /usr/include/wx-2.9/wx/gtk/dirdlg.h /usr/include/wx-2.9/wx/toolbar.h \
+ /usr/include/wx-2.9/wx/tbarbase.h /usr/include/wx-2.9/wx/gtk/tbargtk.h \
+ /usr/include/wx-2.9/wx/combobox.h /usr/include/wx-2.9/wx/gtk/combobox.h \
+ /usr/include/wx-2.9/wx/layout.h /usr/include/wx-2.9/wx/sizer.h \
+ /usr/include/wx-2.9/wx/statusbr.h \
+ /usr/include/wx-2.9/wx/generic/statusbr.h \
+ /usr/include/wx-2.9/wx/choicdlg.h \
+ /usr/include/wx-2.9/wx/generic/choicdgg.h \
+ /usr/include/wx-2.9/wx/textdlg.h \
+ /usr/include/wx-2.9/wx/generic/textdlgg.h \
+ /usr/include/wx-2.9/wx/valtext.h /usr/include/wx-2.9/wx/filedlg.h \
+ /usr/include/wx-2.9/wx/gtk/filedlg.h \
+ /usr/include/wx-2.9/wx/gtk/filectrl.h /usr/include/wx-2.9/wx/filectrl.h \
+ /usr/include/wx-2.9/wx/mdi.h /usr/include/wx-2.9/wx/gtk/mdi.h \
+ /usr/include/wx-2.9/wx/docmdi.h /usr/include/wx-2.9/wx/docview.h \
+ /usr/include/wx-2.9/wx/print.h /usr/include/wx-2.9/wx/generic/printps.h \
+ /usr/include/wx-2.9/wx/prntbase.h /usr/include/wx-2.9/wx/aui/aui.h \
+ /usr/include/wx-2.9/wx/aui/framemanager.h \
+ /usr/include/wx-2.9/wx/aui/dockart.h \
+ /usr/include/wx-2.9/wx/aui/floatpane.h \
+ /usr/include/wx-2.9/wx/minifram.h /usr/include/wx-2.9/wx/gtk/minifram.h \
+ /usr/include/wx-2.9/wx/aui/auibar.h \
+ /usr/include/wx-2.9/wx/aui/auibook.h \
+ /usr/include/wx-2.9/wx/aui/tabmdi.h /usr/include/wx-2.9/wx/notebook.h \
+ /usr/include/wx-2.9/wx/bookctrl.h /usr/include/wx-2.9/wx/gtk/notebook.h \
+ /usr/include/wx-2.9/wx/artprov.h ../../config.h ../sys/manager.hpp \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/typeinfo \
+ ../sys/iterator.hpp \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/set \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_tree.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_set.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_multiset.h \
+ ../ui/perspective.hpp ../sys/action.hpp \
+ /usr/include/wx-2.9/wx/xrc/xmlres.h /usr/include/wx-2.9/wx/filesys.h \
+ /usr/include/wx-2.9/wx/filename.h /usr/include/wx-2.9/wx/file.h \
+ /usr/include/wx-2.9/wx/animate.h /usr/include/wx-2.9/wx/animdecod.h \
+ /usr/include/wx-2.9/wx/gtk/animate.h /usr/include/wx-2.9/wx/vector.h \
+ /usr/include/wx-2.9/wx/scopeguard.h /usr/include/wx-2.9/wx/except.h \
+ /usr/include/wx-2.9/wx/meta/movable.h /usr/include/wx-2.9/wx/meta/if.h \
+ /usr/include/wx-2.9/wx/xml/xml.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/list \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_list.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/list.tcc \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/map \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_map.h \
+ /usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_multimap.h \
+ ../docview/workspace.hpp ../docview/project.hpp ../docview/document.hpp \
+ /usr/include/wx-2.9/wx/cmdproc.h /usr/include/wx-2.9/wx/uri.h \
+ ../docview/view.hpp ../ui/frame.hpp ../ui/workbar.hpp uri.hpp
+
+../wxdevcenter.hpp:
+
+/usr/include/wx-2.9/wx/wxprec.h:
+
+/usr/include/wx-2.9/wx/defs.h:
+
+/usr/include/wx-2.9/wx/platform.h:
+
+/usr/lib/wx/include/gtk2-unicode-release-2.9/wx/setup.h:
+
+/usr/include/wx-2.9/wx/chkconf.h:
+
+/usr/include/wx-2.9/wx/gtk/chkconf.h:
+
+/usr/include/wx-2.9/wx/unix/chkconf.h:
+
+/usr/include/wx-2.9/wx/version.h:
+
+/usr/include/wx-2.9/wx/cpp.h:
+
+/usr/include/wx-2.9/wx/dlimpexp.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/stddef.h:
+
+/usr/include/wx-2.9/wx/debug.h:
+
+/usr/include/assert.h:
+
+/usr/include/features.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/bits/wordsize.h:
+
+/usr/include/gnu/stubs.h:
+
+/usr/include/gnu/stubs-32.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include-fixed/limits.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include-fixed/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/bits/posix1_lim.h:
+
+/usr/include/bits/local_lim.h:
+
+/usr/include/linux/limits.h:
+
+/usr/include/bits/posix2_lim.h:
+
+/usr/include/bits/xopen_lim.h:
+
+/usr/include/bits/stdio_lim.h:
+
+/usr/include/wx-2.9/wx/chartype.h:
+
+/usr/include/wchar.h:
+
+/usr/include/stdio.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/stdarg.h:
+
+/usr/include/bits/wchar.h:
+
+/usr/include/xlocale.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/bits/types.h:
+
+/usr/include/bits/typesizes.h:
+
+/usr/include/time.h:
+
+/usr/include/endian.h:
+
+/usr/include/bits/endian.h:
+
+/usr/include/bits/byteswap.h:
+
+/usr/include/sys/select.h:
+
+/usr/include/bits/select.h:
+
+/usr/include/bits/sigset.h:
+
+/usr/include/bits/time.h:
+
+/usr/include/sys/sysmacros.h:
+
+/usr/include/bits/pthreadtypes.h:
+
+/usr/include/wx-2.9/wx/windowid.h:
+
+/usr/include/wx-2.9/wx/features.h:
+
+/usr/include/wx-2.9/wx/wx.h:
+
+/usr/include/wx-2.9/wx/object.h:
+
+/usr/include/wx-2.9/wx/memory.h:
+
+/usr/include/wx-2.9/wx/string.h:
+
+/usr/include/string.h:
+
+/usr/include/libio.h:
+
+/usr/include/_G_config.h:
+
+/usr/include/bits/sys_errlist.h:
+
+/usr/include/bits/stdio.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/bits/waitflags.h:
+
+/usr/include/bits/waitstatus.h:
+
+/usr/include/alloca.h:
+
+/usr/include/wx-2.9/wx/wxcrtbase.h:
+
+/usr/include/ctype.h:
+
+/usr/include/wctype.h:
+
+/usr/include/wx-2.9/wx/strvararg.h:
+
+/usr/include/wx-2.9/wx/strconv.h:
+
+/usr/include/wx-2.9/wx/buffer.h:
+
+/usr/include/wx-2.9/wx/fontenc.h:
+
+/usr/include/wx-2.9/wx/unichar.h:
+
+/usr/include/wx-2.9/wx/stringimpl.h:
+
+/usr/include/wx-2.9/wx/beforestd.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/string:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++config.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/os_defines.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/cpu_defines.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stringfwd.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/char_traits.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_algobase.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cstddef:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/stddef.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/functexcept.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/exception_defines.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/cpp_type_traits.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/type_traits.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/numeric_traits.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_pair.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_move.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/concept_check.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator_base_types.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator_base_funcs.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_iterator.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/debug/debug.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/postypes.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cwchar:
+
+/usr/include/wchar.h:
+
+/usr/include/stdint.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cstdio:
+
+/usr/include/stdio.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/allocator.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++allocator.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/new_allocator.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/new:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/exception:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/localefwd.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/c++locale.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/clocale:
+
+/usr/include/locale.h:
+
+/usr/include/bits/locale.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/iosfwd:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cctype:
+
+/usr/include/ctype.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/ostream_insert.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cxxabi-forced.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_function.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/backward/binders.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/basic_string.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ext/atomicity.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/gthr.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/gthr-default.h:
+
+/usr/include/pthread.h:
+
+/usr/include/sched.h:
+
+/usr/include/bits/sched.h:
+
+/usr/include/signal.h:
+
+/usr/include/bits/setjmp.h:
+
+/usr/include/unistd.h:
+
+/usr/include/bits/posix_opt.h:
+
+/usr/include/bits/environments.h:
+
+/usr/include/bits/confname.h:
+
+/usr/include/getopt.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/atomic_word.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/basic_string.tcc:
+
+/usr/include/wx-2.9/wx/afterstd.h:
+
+/usr/include/wx-2.9/wx/stringops.h:
+
+/usr/include/wx-2.9/wx/tls.h:
+
+/usr/include/wx-2.9/wx/iosfwrap.h:
+
+/usr/include/wx-2.9/wx/crt.h:
+
+/usr/include/wx-2.9/wx/wxcrt.h:
+
+/usr/include/wx-2.9/wx/wxcrtvararg.h:
+
+/usr/include/wx-2.9/wx/msgout.h:
+
+/usr/include/wx-2.9/wx/dynarray.h:
+
+/usr/include/wx-2.9/wx/list.h:
+
+/usr/include/wx-2.9/wx/hash.h:
+
+/usr/include/wx-2.9/wx/hashmap.h:
+
+/usr/include/wx-2.9/wx/arrstr.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/iterator:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ostream:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/ios:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/ios_base.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/locale_classes.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/locale_classes.tcc:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/streambuf:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/streambuf.tcc:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/basic_ios.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/locale_facets.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/cwctype:
+
+/usr/include/wctype.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/ctype_base.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/streambuf_iterator.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/i686-pc-linux-gnu/bits/ctype_inline.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/locale_facets.tcc:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/basic_ios.tcc:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/ostream.tcc:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/istream:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/istream.tcc:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stream_iterator.h:
+
+/usr/include/wx-2.9/wx/intl.h:
+
+/usr/include/wx-2.9/wx/log.h:
+
+/usr/include/wx-2.9/wx/generic/logg.h:
+
+/usr/include/wx-2.9/wx/event.h:
+
+/usr/include/wx-2.9/wx/clntdata.h:
+
+/usr/include/wx-2.9/wx/gdicmn.h:
+
+/usr/include/wx-2.9/wx/math.h:
+
+/usr/include/math.h:
+
+/usr/include/bits/huge_val.h:
+
+/usr/include/bits/huge_valf.h:
+
+/usr/include/bits/huge_vall.h:
+
+/usr/include/bits/inf.h:
+
+/usr/include/bits/nan.h:
+
+/usr/include/bits/mathdef.h:
+
+/usr/include/bits/mathcalls.h:
+
+/usr/include/bits/mathinline.h:
+
+/usr/include/wx-2.9/wx/cursor.h:
+
+/usr/include/wx-2.9/wx/gtk/cursor.h:
+
+/usr/include/wx-2.9/wx/gdiobj.h:
+
+/usr/include/wx-2.9/wx/utils.h:
+
+/usr/include/wx-2.9/wx/filefn.h:
+
+/usr/include/sys/stat.h:
+
+/usr/include/bits/stat.h:
+
+/usr/include/dirent.h:
+
+/usr/include/bits/dirent.h:
+
+/usr/include/fcntl.h:
+
+/usr/include/bits/fcntl.h:
+
+/usr/include/bits/uio.h:
+
+/usr/include/wx-2.9/wx/mousestate.h:
+
+/usr/include/wx-2.9/wx/kbdstate.h:
+
+/usr/include/wx-2.9/wx/longlong.h:
+
+/usr/include/wx-2.9/wx/platinfo.h:
+
+/usr/include/wx-2.9/wx/thread.h:
+
+/usr/include/wx-2.9/wx/tracker.h:
+
+/usr/include/wx-2.9/wx/meta/convertible.h:
+
+/usr/include/wx-2.9/wx/app.h:
+
+/usr/include/wx-2.9/wx/build.h:
+
+/usr/include/wx-2.9/wx/cmdargs.h:
+
+/usr/include/wx-2.9/wx/init.h:
+
+/usr/include/wx-2.9/wx/unix/app.h:
+
+/usr/include/bits/signum.h:
+
+/usr/include/bits/siginfo.h:
+
+/usr/include/bits/sigaction.h:
+
+/usr/include/bits/sigcontext.h:
+
+/usr/include/asm/sigcontext.h:
+
+/usr/include/asm/types.h:
+
+/usr/include/asm-generic/int-ll64.h:
+
+/usr/include/bits/sigstack.h:
+
+/usr/include/sys/ucontext.h:
+
+/usr/include/bits/sigthread.h:
+
+/usr/include/wx-2.9/wx/gtk/app.h:
+
+/usr/include/wx-2.9/wx/stream.h:
+
+/usr/include/wx-2.9/wx/stopwatch.h:
+
+/usr/include/wx-2.9/wx/timer.h:
+
+/usr/include/wx-2.9/wx/module.h:
+
+/usr/include/wx-2.9/wx/window.h:
+
+/usr/include/wx-2.9/wx/font.h:
+
+/usr/include/wx-2.9/wx/gtk/font.h:
+
+/usr/include/wx-2.9/wx/colour.h:
+
+/usr/include/wx-2.9/wx/variant.h:
+
+/usr/include/wx-2.9/wx/datetime.h:
+
+/usr/include/wx-2.9/wx/anystr.h:
+
+/usr/include/wx-2.9/wx/gtk/colour.h:
+
+/usr/include/wx-2.9/wx/region.h:
+
+/usr/include/wx-2.9/wx/gtk/region.h:
+
+/usr/include/wx-2.9/wx/validate.h:
+
+/usr/include/wx-2.9/wx/palette.h:
+
+/usr/include/wx-2.9/wx/generic/paletteg.h:
+
+/usr/include/wx-2.9/wx/accel.h:
+
+/usr/include/wx-2.9/wx/gtk/accel.h:
+
+/usr/include/wx-2.9/wx/generic/accel.h:
+
+/usr/include/wx-2.9/wx/gtk/window.h:
+
+/usr/include/wx-2.9/wx/containr.h:
+
+/usr/include/wx-2.9/wx/panel.h:
+
+/usr/include/wx-2.9/wx/generic/panelg.h:
+
+/usr/include/wx-2.9/wx/toplevel.h:
+
+/usr/include/wx-2.9/wx/nonownedwnd.h:
+
+/usr/include/wx-2.9/wx/iconbndl.h:
+
+/usr/include/wx-2.9/wx/icon.h:
+
+/usr/include/wx-2.9/wx/iconloc.h:
+
+/usr/include/wx-2.9/wx/generic/icon.h:
+
+/usr/include/wx-2.9/wx/bitmap.h:
+
+/usr/include/wx-2.9/wx/gtk/bitmap.h:
+
+/usr/include/wx-2.9/wx/weakref.h:
+
+/usr/include/wx-2.9/wx/meta/int2type.h:
+
+/usr/include/wx-2.9/wx/gtk/toplevel.h:
+
+/usr/include/wx-2.9/wx/frame.h:
+
+/usr/include/wx-2.9/wx/gtk/frame.h:
+
+/usr/include/wx-2.9/wx/image.h:
+
+/usr/include/wx-2.9/wx/imagbmp.h:
+
+/usr/include/wx-2.9/wx/imagpng.h:
+
+/usr/include/wx-2.9/wx/imaggif.h:
+
+/usr/include/wx-2.9/wx/imagpcx.h:
+
+/usr/include/wx-2.9/wx/imagjpeg.h:
+
+/usr/include/wx-2.9/wx/imagtga.h:
+
+/usr/include/wx-2.9/wx/imagtiff.h:
+
+/usr/include/wx-2.9/wx/imagpnm.h:
+
+/usr/include/wx-2.9/wx/imagxpm.h:
+
+/usr/include/wx-2.9/wx/imagiff.h:
+
+/usr/include/wx-2.9/wx/dc.h:
+
+/usr/include/wx-2.9/wx/brush.h:
+
+/usr/include/wx-2.9/wx/gtk/brush.h:
+
+/usr/include/wx-2.9/wx/pen.h:
+
+/usr/include/wx-2.9/wx/gtk/pen.h:
+
+/usr/include/wx-2.9/wx/cmndata.h:
+
+/usr/include/wx-2.9/wx/encinfo.h:
+
+/usr/include/wx-2.9/wx/dcclient.h:
+
+/usr/include/wx-2.9/wx/dcmemory.h:
+
+/usr/include/wx-2.9/wx/dcprint.h:
+
+/usr/include/wx-2.9/wx/dcscreen.h:
+
+/usr/include/wx-2.9/wx/button.h:
+
+/usr/include/wx-2.9/wx/control.h:
+
+/usr/include/wx-2.9/wx/gtk/control.h:
+
+/usr/include/wx-2.9/wx/gtk/button.h:
+
+/usr/include/wx-2.9/wx/menuitem.h:
+
+/usr/include/wx-2.9/wx/gtk/menuitem.h:
+
+/usr/include/wx-2.9/wx/menu.h:
+
+/usr/include/wx-2.9/wx/gtk/menu.h:
+
+/usr/include/wx-2.9/wx/dialog.h:
+
+/usr/include/wx-2.9/wx/gtk/dialog.h:
+
+/usr/include/wx-2.9/wx/settings.h:
+
+/usr/include/wx-2.9/wx/msgdlg.h:
+
+/usr/include/wx-2.9/wx/stockitem.h:
+
+/usr/include/wx-2.9/wx/gtk/msgdlg.h:
+
+/usr/include/wx-2.9/wx/dataobj.h:
+
+/usr/include/wx-2.9/wx/gtk/dataform.h:
+
+/usr/include/wx-2.9/wx/gtk/dataobj.h:
+
+/usr/include/wx-2.9/wx/gtk/dataobj2.h:
+
+/usr/include/wx-2.9/wx/ctrlsub.h:
+
+/usr/include/wx-2.9/wx/bmpbuttn.h:
+
+/usr/include/wx-2.9/wx/gtk/bmpbuttn.h:
+
+/usr/include/wx-2.9/wx/checkbox.h:
+
+/usr/include/wx-2.9/wx/gtk/checkbox.h:
+
+/usr/include/wx-2.9/wx/checklst.h:
+
+/usr/include/wx-2.9/wx/listbox.h:
+
+/usr/include/wx-2.9/wx/gtk/listbox.h:
+
+/usr/include/wx-2.9/wx/gtk/checklst.h:
+
+/usr/include/wx-2.9/wx/choice.h:
+
+/usr/include/wx-2.9/wx/gtk/choice.h:
+
+/usr/include/wx-2.9/wx/scrolbar.h:
+
+/usr/include/wx-2.9/wx/gtk/scrolbar.h:
+
+/usr/include/wx-2.9/wx/stattext.h:
+
+/usr/include/wx-2.9/wx/gtk/stattext.h:
+
+/usr/include/wx-2.9/wx/statbmp.h:
+
+/usr/include/wx-2.9/wx/gtk/statbmp.h:
+
+/usr/include/wx-2.9/wx/statbox.h:
+
+/usr/include/wx-2.9/wx/gtk/statbox.h:
+
+/usr/include/wx-2.9/wx/radiobox.h:
+
+/usr/include/wx-2.9/wx/gtk/radiobox.h:
+
+/usr/include/wx-2.9/wx/radiobut.h:
+
+/usr/include/wx-2.9/wx/gtk/radiobut.h:
+
+/usr/include/wx-2.9/wx/textctrl.h:
+
+/usr/include/wx-2.9/wx/textentry.h:
+
+/usr/include/wx-2.9/wx/gtk/textentry.h:
+
+/usr/include/wx-2.9/wx/ioswrap.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/iostream:
+
+/usr/include/wx-2.9/wx/gtk/textctrl.h:
+
+/usr/include/wx-2.9/wx/slider.h:
+
+/usr/include/wx-2.9/wx/gtk/slider.h:
+
+/usr/include/wx-2.9/wx/gauge.h:
+
+/usr/include/wx-2.9/wx/gtk/gauge.h:
+
+/usr/include/wx-2.9/wx/scrolwin.h:
+
+/usr/include/wx-2.9/wx/gtk/scrolwin.h:
+
+/usr/include/wx-2.9/wx/dirdlg.h:
+
+/usr/include/wx-2.9/wx/gtk/dirdlg.h:
+
+/usr/include/wx-2.9/wx/toolbar.h:
+
+/usr/include/wx-2.9/wx/tbarbase.h:
+
+/usr/include/wx-2.9/wx/gtk/tbargtk.h:
+
+/usr/include/wx-2.9/wx/combobox.h:
+
+/usr/include/wx-2.9/wx/gtk/combobox.h:
+
+/usr/include/wx-2.9/wx/layout.h:
+
+/usr/include/wx-2.9/wx/sizer.h:
+
+/usr/include/wx-2.9/wx/statusbr.h:
+
+/usr/include/wx-2.9/wx/generic/statusbr.h:
+
+/usr/include/wx-2.9/wx/choicdlg.h:
+
+/usr/include/wx-2.9/wx/generic/choicdgg.h:
+
+/usr/include/wx-2.9/wx/textdlg.h:
+
+/usr/include/wx-2.9/wx/generic/textdlgg.h:
+
+/usr/include/wx-2.9/wx/valtext.h:
+
+/usr/include/wx-2.9/wx/filedlg.h:
+
+/usr/include/wx-2.9/wx/gtk/filedlg.h:
+
+/usr/include/wx-2.9/wx/gtk/filectrl.h:
+
+/usr/include/wx-2.9/wx/filectrl.h:
+
+/usr/include/wx-2.9/wx/mdi.h:
+
+/usr/include/wx-2.9/wx/gtk/mdi.h:
+
+/usr/include/wx-2.9/wx/docmdi.h:
+
+/usr/include/wx-2.9/wx/docview.h:
+
+/usr/include/wx-2.9/wx/print.h:
+
+/usr/include/wx-2.9/wx/generic/printps.h:
+
+/usr/include/wx-2.9/wx/prntbase.h:
+
+/usr/include/wx-2.9/wx/aui/aui.h:
+
+/usr/include/wx-2.9/wx/aui/framemanager.h:
+
+/usr/include/wx-2.9/wx/aui/dockart.h:
+
+/usr/include/wx-2.9/wx/aui/floatpane.h:
+
+/usr/include/wx-2.9/wx/minifram.h:
+
+/usr/include/wx-2.9/wx/gtk/minifram.h:
+
+/usr/include/wx-2.9/wx/aui/auibar.h:
+
+/usr/include/wx-2.9/wx/aui/auibook.h:
+
+/usr/include/wx-2.9/wx/aui/tabmdi.h:
+
+/usr/include/wx-2.9/wx/notebook.h:
+
+/usr/include/wx-2.9/wx/bookctrl.h:
+
+/usr/include/wx-2.9/wx/gtk/notebook.h:
+
+/usr/include/wx-2.9/wx/artprov.h:
+
+../../config.h:
+
+../sys/manager.hpp:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/typeinfo:
+
+../sys/iterator.hpp:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/set:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_tree.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_set.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_multiset.h:
+
+../ui/perspective.hpp:
+
+../sys/action.hpp:
+
+/usr/include/wx-2.9/wx/xrc/xmlres.h:
+
+/usr/include/wx-2.9/wx/filesys.h:
+
+/usr/include/wx-2.9/wx/filename.h:
+
+/usr/include/wx-2.9/wx/file.h:
+
+/usr/include/wx-2.9/wx/animate.h:
+
+/usr/include/wx-2.9/wx/animdecod.h:
+
+/usr/include/wx-2.9/wx/gtk/animate.h:
+
+/usr/include/wx-2.9/wx/vector.h:
+
+/usr/include/wx-2.9/wx/scopeguard.h:
+
+/usr/include/wx-2.9/wx/except.h:
+
+/usr/include/wx-2.9/wx/meta/movable.h:
+
+/usr/include/wx-2.9/wx/meta/if.h:
+
+/usr/include/wx-2.9/wx/xml/xml.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/list:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_list.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/list.tcc:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/map:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_map.h:
+
+/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/include/g++-v4/bits/stl_multimap.h:
+
+../docview/workspace.hpp:
+
+../docview/project.hpp:
+
+../docview/document.hpp:
+
+/usr/include/wx-2.9/wx/cmdproc.h:
+
+/usr/include/wx-2.9/wx/uri.h:
+
+../docview/view.hpp:
+
+../ui/frame.hpp:
+
+../ui/workbar.hpp:
+
+uri.hpp:
Added: trunk/wxdevcenter/src/tools/Makefile
===================================================================
--- trunk/wxdevcenter/src/tools/Makefile (rev 0)
+++ trunk/wxdevcenter/src/tools/Makefile 2009-09-10 11:25:22 UTC (rev 55)
@@ -0,0 +1,516 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# src/tools/Makefile. Generated from Makefile.in by configure.
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+
+
+pkgdatadir = $(datadir)/wxdevcenter
+pkglibdir = $(libdir)/wxdevcenter
+pkgincludedir = $(includedir)/wxdevcenter
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = i686-pc-linux-gnu
+host_triplet = i686-pc-linux-gnu
+subdir = src/tools
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libtools_la_LIBADD =
+am_libtools_la_OBJECTS = libtools_la-bitvector.lo
+libtools_la_OBJECTS = $(am_libtools_la_OBJECTS)
+libtools_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libtools_la_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I. -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+SOURCES = $(libtools_la_SOURCES)
+DIST_SOURCES = $(libtools_la_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = ${SHELL} /home/mimile/Projects/wxdevcenter/missing --run aclocal-1.10
+ALL_LINGUAS =
+AMTAR = ${SHELL} /home/mimile/Projects/wxdevcenter/missing --run tar
+AR = ar
+AUTOCONF = ${SHELL} /home/mimile/Projects/wxdevcenter/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/mimile/Projects/wxdevcenter/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/mimile/Projects/wxdevcenter/missing --run automake-1.10
+AWK = gawk
+CATALOGS =
+CATOBJEXT = .gmo
+CC = gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2
+CPP = gcc -E
+CPPFLAGS =
+CXX = g++
+CXXCPP = g++ -E
+CXXDEPMODE = depmode=gcc3
+CXXFLAGS = -g -O2
+CYGPATH_W = echo
+DATADIRNAME = share
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+DSYMUTIL =
+ECHO = echo
+ECHO_C =
+ECHO_N = -n
+ECHO_T =
+EGREP = /bin/grep -E
+EXEEXT =
+F77 = gfortran
+FFLAGS = -g -O2
+GETTEXT_PACKAGE = wxdevcenter
+GMOFILES =
+GMSGFMT = /usr/bin/gmsgfmt
+GREP = /bin/grep
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
+INSTOBJEXT = .mo
+INTLLIBS =
+INTLTOOL_CAVES_RULE = %.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_DESKTOP_RULE = %.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_DIRECTORY_RULE = %.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_EXTRACT = /usr/bin/intltool-extract
+INTLTOOL_KBD_RULE = %.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_KEYS_RULE = %.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_MERGE = /usr/bin/intltool-merge
+INTLTOOL_OAF_RULE = %.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@
+INTLTOOL_PERL = /usr/bin/perl
+INTLTOOL_POLICY_RULE = %.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_PONG_RULE = %.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_PROP_RULE = %.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_SCHEMAS_RULE = %.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_SERVER_RULE = %.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_SERVICE_RULE = %.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_SHEET_RULE = %.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_SOUNDLIST_RULE = %.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_THEME_RULE = %.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_UI_RULE = %.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_UPDATE = /usr/bin/intltool-update
+INTLTOOL_XAM_RULE = %.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+INTLTOOL_XML_NOMERGE_RULE = %.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
+INTLTOOL_XML_RULE = %.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+LDFLAGS =
+LIBOBJS =
+LIBS =
+LIBTOOL = $(SHELL) $(top_builddir)/libtool
+LN_S = ln -s
+LTLIBOBJS =
+MAINT =
+MAKEINFO = ${SHELL} /home/mimile/Projects/wxdevcenter/missing --run makeinfo
+MKDIR_P = /bin/mkdir -p
+MKINSTALLDIRS = ./mkinstalldirs
+MSGFMT = /usr/bin/msgfmt
+MSGFMT_OPTS = -c
+MSGMERGE = /usr/bin/msgmerge
+NMEDIT =
+OBJEXT = o
+PACKAGE = wxdevcenter
+PACKAGE_BUGREPORT =
+PACKAGE_NAME = wxdevcenter
+PACKAGE_STRING = wxdevcenter 0.1
+PACKAGE_TARNAME = wxdevcenter
+PACKAGE_VERSION = 0.1
+PATH_SEPARATOR = :
+PKG_CONFIG = /usr/bin/pkg-config
+PLUGIN_DATADIR = ${datarootdir}/wxdevcenter/plugins
+PLUGIN_LIBDIR = ${exec_prefix}/lib/wxdevcenter/plugins
+POFILES =
+POSUB = po
+PO_IN_DATADIR_FALSE =
+PO_IN_DATADIR_TRUE =
+RANLIB = ranlib
+SED = /bin/sed
+SET_MAKE =
+SHELL = /bin/sh
+STRIP = strip
+USE_NLS = yes
+VERSION = 0.1
+WXDEVCENTER_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/libglade-2.0 -I/usr/include/libxml2
+WXDEVCENTER_LIBS = -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lglib-2.0
+WX_CPPFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_IODBC_ -D__WXGTK__
+WX_CXXFLAGS = -I/usr/lib/wx/include/gtk2-unicode-release-2.8 -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_IODBC_ -D__WXGTK__ -pthread
+WX_LIBS = -pthread -Wl,-O1 -L/usr/X11R6/lib -lwx_gtk2u_xrc-2.8 -lwx_gtk2u_stc-2.8 -lwx_gtk2u_aui-2.8 -lwx_gtk2u_html-2.8 -lwx_gtk2u_qa-2.8 -lwx_gtk2u_adv-2.8 -lwx_gtk2u_core-2.8 -lwx_baseu_xml-2.8 -lwx_baseu_net-2.8 -lwx_baseu-2.8
+XGETTEXT = /usr/bin/xgettext
+abs_builddir = /home/mimile/Projects/wxdevcenter/src/tools
+abs_srcdir = /home/mimile/Projects/wxdevcenter/src/tools
+abs_top_builddir = /home/mimile/Projects/wxdevcenter
+abs_top_srcdir = /home/mimile/Projects/wxdevcenter
+ac_ct_CC = gcc
+ac_ct_CXX = g++
+ac_ct_F77 = gfortran
+am__include = include
+am__leading_dot = .
+am__quote =
+am__tar = ${AMTAR} chof - "$$tardir"
+am__untar = ${AMTAR} xf -
+bindir = ${exec_prefix}/bin
+build = i686-pc-linux-gnu
+build_alias =
+build_cpu = i686
+build_os = linux-gnu
+build_vendor = pc
+builddir = .
+datadir = ${datarootdir}
+datarootdir = ${prefix}/share
+docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
+dvidir = ${docdir}
+exec_prefix = ${prefix}
+host = i686-pc-linux-gnu
+host_alias =
+host_cpu = i686
+host_os = linux-gnu
+host_vendor = pc
+htmldir = ${docdir}
+includedir = ${prefix}/include
+infodir = ${datarootdir}/info
+install_sh = $(SHELL) /home/mimile/Projects/wxdevcenter/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localedir = ${datarootdir}/locale
+localstatedir = ${prefix}/var
+mandir = ${datarootdir}/man
+mkdir_p = /bin/mkdir -p
+oldincludedir = /usr/include
+pdfdir = ${docdir}
+prefix = /usr/local
+program_transform_name = s,x,x,
+psdir = ${docdir}
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+srcdir = .
+sysconfdir = ${prefix}/etc
+target_alias =
+top_build_prefix = ../../
+top_builddir = ../..
+top_srcdir = ../..
+INCLUDES = \
+ $(WX_CXXFLAGS)
+
+noinst_LTLIBRARIES = \
+ libtools.la
+
+libtools_la_SOURCES = \
+ bitvector.hpp\
+ bitvector.cpp
+
+libtools_la_CXXFLAGS = \
+ -DPLUGIN_LIBDIR="\"$(PLUGIN_LIBDIR)\"" \
+ -DPLUGIN_DATADIR="\"$(PLUGIN_DATADIR)\"" \
+ -DDATADIR="\"$(datadir)\""
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/tools/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/tools/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libtools.la: $(libtools_la_OBJECTS) $(libtools_la_DEPENDENCIES)
+ $(libtools_la_LINK) $(libtools_la_OBJECTS) $(libtools_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+include ./$(DEPDIR)/libtools_la-bitvector.Plo
+
+.cpp.o:
+ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+# source='$<' object='$@' libtool=no \
+# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
+# $(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+# source='$<' object='$@' libtool=no \
+# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
+# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+# source='$<' object='$@...
[truncated message content] |
|
From: <cur...@us...> - 2009-09-10 11:22:19
|
Revision: 54
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=54&view=rev
Author: cursorstar
Date: 2009-09-10 11:22:10 +0000 (Thu, 10 Sep 2009)
Log Message:
-----------
Add begin of search text in files.
Add bookmark raising.
Added Paths:
-----------
trunk/wxdevcenter/src/plugins/text/text-search.cpp
trunk/wxdevcenter/src/plugins/text/text-search.hpp
trunk/wxdevcenter/src/sys/search.cpp
trunk/wxdevcenter/src/sys/search.hpp
Added: trunk/wxdevcenter/src/plugins/text/text-search.cpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/text-search.cpp (rev 0)
+++ trunk/wxdevcenter/src/plugins/text/text-search.cpp 2009-09-10 11:22:10 UTC (rev 54)
@@ -0,0 +1,535 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * wxdevcenter
+ * Copyright (C) Emilien KIA 2009 <emi...@fr...>
+ *
+ * wxdevcenter is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wxdevcenter is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "../../wxdevcenter.hpp"
+#include "text-search.hpp"
+#include "../../sys/config.hpp"
+#include "../../sys/task.hpp"
+#include "../../tools/bitvector.hpp"
+
+#include <wx/stdpaths.h>
+
+#include <algorithm>
+
+
+#define Config_group wxT("/search")
+#define Config_arrTexts wxT("texts")
+#define Config_arrWilds wxT("wilds")
+#define Config_arrFiles wxT("files")
+#define Config_arrMaxCount 20
+
+//==========================================================================
+// dcTextSearchQueryStruct
+//==========================================================================
+class dcTextSearchQueryStruct : public dcSearchQueryStruct
+{
+public:
+ virtual ~dcTextSearchQueryStruct(){}
+ wxString text, wildcard, files;
+ bool casesense, regexp;
+
+ virtual dcTextSearchQueryStruct* clone()const{
+ dcTextSearchQueryStruct* st = new dcTextSearchQueryStruct();
+ st->module = module;
+ st->text = text;
+ st->wildcard = wildcard;
+ st->files = files;
+ st->casesense = casesense;
+ st->regexp = regexp;
+ return st;
+ }
+ virtual wxString getName()const
+ {
+ return text + wxT(" | ") + files + wxT(" | ") + wildcard;
+ }
+};
+
+//==========================================================================
+// dcTextSearchPanel
+//==========================================================================
+class dcTextSearchPanel : public dcSearchPanel
+{
+ DECLARE_ABSTRACT_CLASS(dcTextSearchPanel)
+ DECLARE_EVENT_TABLE()
+public:
+ dcTextSearchPanel(wxWindow* parent, wxWindowID id, const dcTextSearchModule* module):
+ module(module)
+ {
+ Create(parent, id);
+ Initialize();
+ }
+ virtual ~dcTextSearchPanel(){SaveLists();}
+ virtual dcTextSearchQueryStruct* getSearchQueryStruct()const;
+protected:
+ const dcTextSearchModule* module;
+ wxComboBox *comboText, *comboWild, *comboFile;
+ wxCheckBox *cbCase, *cbRegEx;
+
+ wxArrayString arrText, arrWild, arrFile;
+private:
+ void Initialize();
+ void LoadLists();
+ void SaveLists();
+
+ void onChooseWildcard(wxCommandEvent& event);
+ void onChooseFiles(wxCommandEvent& event);
+};
+
+IMPLEMENT_ABSTRACT_CLASS(dcTextSearchPanel, dcSearchPanel);
+
+BEGIN_EVENT_TABLE(dcTextSearchPanel, dcSearchPanel)
+ EVT_BUTTON(XRCID("ChooseWildcard"), dcTextSearchPanel::onChooseWildcard)
+ EVT_BUTTON(XRCID("ChooseFiles"), dcTextSearchPanel::onChooseFiles)
+END_EVENT_TABLE()
+
+dcTextSearchQueryStruct* dcTextSearchPanel::getSearchQueryStruct()const
+{
+ dcTextSearchQueryStruct* st = new dcTextSearchQueryStruct;
+ st->module = module;
+ st->text = comboText->GetValue();
+ st->wildcard = comboWild->GetValue();
+ st->files = comboFile->GetValue();
+ st->casesense = cbCase->GetValue();
+ st->regexp = cbRegEx->GetValue();
+ return st;
+}
+
+void dcTextSearchPanel::Initialize()
+{
+ wxSizer* sz;
+ wxFlexGridSizer* topSz = new wxFlexGridSizer(2, 4, 4);
+
+ topSz->Add(new wxStaticText(this, wxID_ANY, _("Containing text:")), wxALL, 4);
+ topSz->AddStretchSpacer();
+ sz = new wxBoxSizer(wxHORIZONTAL);
+ sz->Add(comboText = new wxComboBox(this, wxID_ANY, _("")), 1, wxALIGN_CENTRE_VERTICAL);
+ topSz->Add(sz, 1, wxEXPAND|wxALL, 4);
+ sz = new wxBoxSizer(wxVERTICAL);
+ sz->Add(cbCase = new wxCheckBox(this, wxID_ANY, _("Case sensitive")), 0, wxEXPAND);
+ sz->Add(cbRegEx = new wxCheckBox(this, wxID_ANY, _("Regular expression")), 0, wxEXPAND);
+ cbRegEx->Disable(); // TODO
+ topSz->Add(sz, 0, wxALIGN_CENTRE_VERTICAL|wxALL, 4);
+
+ topSz->Add(new wxStaticText(this, wxID_ANY, _("File name pattern:")), wxALL, 4);
+ topSz->AddStretchSpacer();
+ sz = new wxBoxSizer(wxHORIZONTAL);
+ sz->Add(comboWild = new wxComboBox(this, wxID_ANY, _("")), 1, wxALIGN_CENTRE_VERTICAL);
+ topSz->Add(sz, 1, wxEXPAND|wxALL, 4);
+ topSz->Add(new wxButton(this, XRCID("ChooseWildcard"), _T("Choose...")), 0, wxALIGN_CENTRE|wxALL, 4);
+
+ topSz->Add(new wxStaticText(this, wxID_ANY, _("Scope:")), wxALL, 4);
+ topSz->AddStretchSpacer();
+ sz = new wxBoxSizer(wxHORIZONTAL);
+ sz->Add(comboFile = new wxComboBox(this, wxID_ANY, _("")), 1, wxALIGN_CENTRE_VERTICAL);
+ topSz->Add(sz, 1, wxEXPAND|wxALL, 4);
+ topSz->Add(new wxButton(this, XRCID("ChooseFiles"), _T("Choose...")), 0, wxALIGN_CENTRE|wxALL, 4);
+
+ topSz->AddGrowableCol(0, 1);
+ SetSizer(topSz);
+ LoadLists();
+}
+
+void dcTextSearchPanel::onChooseWildcard(wxCommandEvent& event)
+{
+ // TODO
+ wxMessageBox(_("Not implemented yet"));
+}
+
+void dcTextSearchPanel::onChooseFiles(wxCommandEvent& event)
+{
+ // TODO
+ wxMessageBox(_("Not implemented yet"));
+}
+
+static wxArrayString DecodeList(wxString str){
+ wxArrayString arr;
+ wxString s;
+ bool esc = false;
+ for(int i=0; i<str.Length(); i++)
+ {
+ wxChar c = str[i];
+ if(esc)
+ {
+ if(c==wxT('\\') || c==wxT('|'))
+ s.Append(c);
+ else
+ {
+ s.Append('\\');
+ s.Append(c);
+ }
+ esc=false;
+ }
+ else
+ {
+ if(c==wxT('\\'))
+ esc = true;
+ else if(c==wxT('|') && !s.IsEmpty())
+ {
+ arr.Add(s);
+ s.Empty();
+ }
+ else
+ s.Append(c);
+ }
+ }
+ if(!s.IsEmpty())
+ arr.Add(s);
+ return arr;
+}
+
+static wxString EncodeList(wxArrayString arr){
+ wxString str;
+ for(int i=0; i<arr.GetCount(); i++)
+ {
+ if(!arr[i].IsEmpty())
+ {
+ wxString s = arr[i];
+ s.Replace(wxT("\\"), wxT("\\\\"));
+ s.Replace(wxT("|"), wxT("\\|"));
+ str += s;
+ str += wxT("|");
+ }
+ }
+ if(!str.IsEmpty())
+ {
+ if(str.Last()==wxT('|'))
+ str.RemoveLast();
+ }
+ return str;
+}
+
+void dcTextSearchPanel::LoadLists()
+{
+ wxConfigBase& config = dcConfig::Plugin(wxT("text"));
+ config.SetPath(Config_group);
+ arrText = DecodeList(config.Read(Config_arrTexts, wxT("")));
+ arrWild = DecodeList(config.Read(Config_arrWilds, wxT("")));
+ arrFile = DecodeList(config.Read(Config_arrFiles, wxT("")));
+ comboText->Append(arrText);
+ comboWild->Append(arrWild);
+ comboFile->Append(arrFile);
+}
+
+void dcTextSearchPanel::SaveLists()
+{
+ wxString str, texts, wilds, files;
+ int i;
+
+ str = comboText->GetValue();
+ if(!str.IsEmpty()){
+ i = arrText.Index(str);
+ if(i!=wxNOT_FOUND)
+ arrText.RemoveAt(i);
+ arrText.Insert(str, 0);
+ }
+ i = arrText.GetCount();
+ if(i>Config_arrMaxCount)
+ arrText.RemoveAt(Config_arrMaxCount, arrText.GetCount()-Config_arrMaxCount);
+
+ str = comboWild->GetValue();
+ if(!str.IsEmpty()){
+ i = arrWild.Index(str);
+ if(i!=wxNOT_FOUND)
+ arrWild.RemoveAt(i);
+ arrWild.Insert(str, 0);
+ }
+ i = arrWild.GetCount();
+ if(i>Config_arrMaxCount)
+ arrWild.RemoveAt(Config_arrMaxCount, arrWild.GetCount()-Config_arrMaxCount);
+
+ str = comboFile->GetValue();
+ if(!str.IsEmpty()){
+ i = arrFile.Index(str);
+ if(i!=wxNOT_FOUND)
+ arrFile.RemoveAt(i);
+ arrFile.Insert(str, 0);
+ }
+ i = arrFile.GetCount();
+ if(i>Config_arrMaxCount)
+ arrFile.RemoveAt(Config_arrMaxCount, arrFile.GetCount()-Config_arrMaxCount);
+
+ wxConfigBase& config = dcConfig::Plugin(wxT("text"));
+ config.SetPath(Config_group);
+ config.Write(Config_arrTexts, EncodeList(arrText));
+ config.Write(Config_arrWilds, EncodeList(arrWild));
+ config.Write(Config_arrFiles, EncodeList(arrFile));
+}
+
+//==========================================================================
+// dcTextSearchTask
+//==========================================================================
+class dcTextSearchTask : public dcAsynchronousTask
+{
+public:
+ dcTextSearchTask(dcTextSearchQueryStruct* query):
+ dcAsynchronousTask(_("Search text in files"), wxT("Find"), 0, 1),
+ query(query){}
+
+ virtual bool execute();
+protected:
+ dcTextSearchQueryStruct* query;
+
+ wxArrayString files;
+private:
+ void doListFiles(wxFileSystem& fs);
+ void doListDirs(wxFileSystem& fs);
+
+ void lookAtCaseSensitiveText(wxFileSystem& fs);
+ void lookAtCaseUnsensitiveText(wxFileSystem& fs);
+ void lookAtRegularExpression(wxFileSystem& fs);
+
+ void doAddBookmark(const wxString& file, size_t pos, size_t len);
+};
+
+void dcTextSearchTask::doAddBookmark(const wxString& file, size_t pos, size_t len)
+{
+ wxString str = file + wxT("#");
+ str << pos << wxT('-') << pos+len;
+ dcSearchManager::getInstance().addSearchResult(query, new dcBookmark(str));
+}
+
+bool dcTextSearchTask::execute()
+{
+ if(query==NULL)
+ return false;
+
+ // List files
+ setComment(_("Listing files ..."));
+ wxFileSystem fs;
+ wxString path = query->files;
+ if(!wxFileSystem::HasHandlerForPath(path))
+ {
+ setComment(_("Cannot browse file system"));
+ return false;
+ }
+ fs.ChangePathTo(path, true);
+ doListFiles(fs);
+ doListDirs(fs);
+
+ setMax(files.GetCount());
+
+ dcSearchManager::getInstance().addSearch(query);
+
+ // Look in files
+ if(query->regexp)
+ lookAtRegularExpression(fs);
+ else if(query->casesense)
+ lookAtCaseSensitiveText(fs);
+ else
+ lookAtCaseUnsensitiveText(fs);
+
+ setComment(_("Done"));
+
+ return true;
+}
+
+void dcTextSearchTask::lookAtCaseSensitiveText(wxFileSystem& fs)
+{
+ wxWX2MBbuf str = query->text.mb_str(wxConvUTF8);
+ size_t size = strlen(str);
+ bitvector<> state(size+1);
+ char* txt = new char[size+1];
+ memcpy(txt, (const char*)str, size);
+ txt[size] = 0;
+
+ for(int i=0; i<files.GetCount(); i++)
+ {
+ wxFSFile* file = fs.OpenFile(files[i]);
+ if(file!=NULL)
+ {
+ wxInputStream* stm = file->GetStream();
+ if(stm!=NULL)
+ {
+ setComment(file->GetLocation());
+ state.reset();
+ size_t pos = 0;
+ while(true)
+ {
+ char c = stm->GetC();
+ if(stm->Eof())
+ break;
+ if(state.any())
+ {
+ for(size_t idx=std::min(size-1, pos); ((int)idx)>=0; idx--)
+ {
+ if(state.get(idx))
+ {
+ state.set(idx, false);
+ if(txt[idx+1]==c)
+ {
+ state.set(idx+1, true);
+ }
+ }
+ }
+ }
+ if(state.get(size-1))
+ {
+ state.set(size-1, false);
+ doAddBookmark(file->GetLocation(), pos-size, size);
+ }
+ if(txt[0]==c)
+ state.set(0, true);
+ pos++;
+ }
+ delete stm;
+ }
+ }
+ setPos(i);
+ }
+ setPos(files.GetCount());
+ delete txt;
+}
+
+static inline bool testNonCaseChar(char c1, char c2){
+ if(c1>='a' && c1<='z')
+ return c1 + ('A' - 'a') == c2;
+ else
+ return c1==c2;
+}
+
+void dcTextSearchTask::lookAtCaseUnsensitiveText(wxFileSystem& fs)
+{
+ wxWX2MBbuf str = query->text.Upper().mb_str(wxConvUTF8);
+ size_t size = strlen(str);
+ bitvector<> state(size+1);
+ char* txt = new char[size+1];
+ memcpy(txt, (const char*)str, size);
+ txt[size] = 0;
+
+ for(int i=0; i<files.GetCount(); i++)
+ {
+ wxFSFile* file = fs.OpenFile(files[i]);
+ if(file!=NULL)
+ {
+ wxInputStream* stm = file->GetStream();
+ if(stm!=NULL)
+ {
+ setComment(file->GetLocation());
+ state.reset();
+ size_t pos = 0;
+ while(true)
+ {
+ char c = stm->GetC();
+ if(stm->Eof())
+ break;
+ if(state.any())
+ {
+ for(size_t idx=std::min(size-1, pos); ((int)idx)>=0; idx--)
+ {
+ if(state.get(idx))
+ {
+ state.set(idx, false);
+ if(testNonCaseChar(txt[idx+1], c))
+ {
+ state.set(idx+1, true);
+ }
+ }
+ }
+ }
+ if(state.get(size-1))
+ {
+ state.set(size-1, false);
+ doAddBookmark(file->GetLocation(), pos-size, size);
+ }
+ if(testNonCaseChar(txt[0], c))
+ state.set(0, true);
+ pos++;
+ }
+ delete stm;
+ }
+ }
+ setPos(i);
+ }
+ setPos(files.GetCount());
+ delete txt;
+}
+
+void dcTextSearchTask::lookAtRegularExpression(wxFileSystem& fs)
+{
+ // TODO
+}
+
+void dcTextSearchTask::doListFiles(wxFileSystem& fs)
+{
+ wxString name = fs.FindFirst(query->wildcard, wxFILE);
+ while(!name.IsEmpty())
+ {
+ files.Add(name);
+ name = fs.FindNext();
+ }
+}
+
+void dcTextSearchTask::doListDirs(wxFileSystem& fs)
+{
+ wxString name = fs.FindFirst(wxT("*"), wxDIR);
+ wxArrayString dirs;
+ while(!name.IsEmpty())
+ {
+ dirs.Add(name);
+ name = fs.FindNext();
+ }
+
+ for(int i=0; i<dirs.GetCount(); i++)
+ {
+ fs.ChangePathTo(dirs[i], true);
+ doListFiles(fs);
+ doListDirs(fs);
+ fs.ChangePathTo(wxT(".."), true);
+ }
+}
+
+//==========================================================================
+// dcTextSearchModule
+//==========================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(dcTextSearchModule, dcSearchModule)
+
+dcTextSearchModule::dcTextSearchModule()
+{
+ AddDependency(CLASSINFO(dcSearchModule));
+}
+
+dcSearchPanel* dcTextSearchModule::CreatePanel(wxWindow* parent, wxWindowID id)const
+{
+ return new dcTextSearchPanel(parent, id, this);
+}
+
+wxString dcTextSearchModule::getModuleName()
+{
+ return _("Text in files");
+}
+
+bool dcTextSearchModule::OnInit()
+{
+ dcSearchManager::getInstance().registerModule(this);
+ return true;
+}
+
+void dcTextSearchModule::OnExit()
+{
+ dcSearchManager::getInstance().unregister(this);
+}
+
+void dcTextSearchModule::doSearch(dcSearchQueryStruct* st)const
+{
+ dcTextSearchQueryStruct* query = dynamic_cast<dcTextSearchQueryStruct*>(st);
+ if(query!=NULL)
+ {
+ dcAsynchronousTaskManager::getInstance().add(new dcTextSearchTask(query));
+ }
+}
\ No newline at end of file
Added: trunk/wxdevcenter/src/plugins/text/text-search.hpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/text-search.hpp (rev 0)
+++ trunk/wxdevcenter/src/plugins/text/text-search.hpp 2009-09-10 11:22:10 UTC (rev 54)
@@ -0,0 +1,40 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * wxdevcenter
+ * Copyright (C) Emilien KIA 2009 <emi...@fr...>
+ *
+ * wxdevcenter is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wxdevcenter is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _TEXT_SEARCH_HPP_
+#define _TEXT_SEARCH_HPP_
+
+#include "../../sys/search.hpp"
+
+class dcTextSearchModule: public dcSearchModule
+{
+ DECLARE_DYNAMIC_CLASS(dcTextSearchModule)
+public:
+ dcTextSearchModule();
+
+ virtual dcSearchPanel* CreatePanel(wxWindow* parent, wxWindowID id)const;
+ virtual wxString getModuleName();
+
+ virtual void doSearch(dcSearchQueryStruct* st)const;
+
+ virtual bool OnInit();
+ virtual void OnExit();
+};
+
+#endif // _TEXT_SEARCH_HPP_
Added: trunk/wxdevcenter/src/sys/search.cpp
===================================================================
--- trunk/wxdevcenter/src/sys/search.cpp (rev 0)
+++ trunk/wxdevcenter/src/sys/search.cpp 2009-09-10 11:22:10 UTC (rev 54)
@@ -0,0 +1,485 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * wxdevcenter
+ * Copyright (C) Emilien KIA 2009 <emi...@fr...>
+ *
+ * wxdevcenter is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wxdevcenter is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "../wxdevcenter.hpp"
+#include "../application.hpp"
+#include "search.hpp"
+
+#include <algorithm>
+
+
+#define wxGUIACQUIRE {if(!wxThread::IsMain())wxMutexGuiEnter();}
+#define wxGUIRELEASE {if(!wxThread::IsMain())wxMutexGuiLeave();}
+
+
+//==========================================================================
+// dcSearchModule
+//==========================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(dcSearchModule, wxModule)
+
+dcSearchModule::dcSearchModule()
+{
+}
+
+bool dcSearchModule::OnInit()
+{
+ // USED TO INITIALIZE SEARCH MANAGER
+ // DONT CALL IT EXPLICITLY
+ return dcSearchManager::getInstance().initialize();
+}
+
+void dcSearchModule::OnExit()
+{
+}
+
+//==========================================================================
+// dcSearchPanel
+//==========================================================================
+IMPLEMENT_ABSTRACT_CLASS(dcSearchPanel, wxPanel)
+
+//==========================================================================
+// dcSearchDialogBox
+//==========================================================================
+
+dcSearchDialogBox::dcSearchDialogBox():
+wxDialog(NULL, wxID_ANY, _("Search ..."), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
+{
+ wxSizer *topSz = new wxBoxSizer(wxVERTICAL),
+ *btnSz = new wxBoxSizer(wxHORIZONTAL);
+
+ notebook = new wxNotebook(this, wxID_ANY);
+
+ btnSz->AddStretchSpacer();
+ btnSz->Add(new wxButton(this, wxID_CANCEL), 0, wxEXPAND|wxALL, 4);
+ btnSz->Add(new wxButton(this, wxID_FIND, _("Search")), 0, wxEXPAND|wxALL, 4);
+
+ topSz->Add(notebook, 1, wxEXPAND|wxALL, 4);
+ topSz->Add(btnSz, 0, wxEXPAND|wxALL, 4);
+
+ SetSizer(topSz);
+ SetAffirmativeId(wxID_FIND);
+
+ dcSearchManager::getInstance().fillDialog(*this);
+}
+
+wxWindow* dcSearchDialogBox::getSearchPanelParent()const
+{
+ return notebook;
+}
+
+void dcSearchDialogBox::addSearchPanel(dcSearchPanel* panel, const wxString& moduleName)
+{
+ notebook->AddPage(panel, moduleName);
+}
+
+dcSearchQueryStruct* dcSearchDialogBox::getSearchQueryStruct()const
+{
+ if(notebook==NULL)
+ return NULL;
+ dcSearchPanel* panel = dynamic_cast<dcSearchPanel*>(notebook->GetCurrentPage());
+ return panel->getSearchQueryStruct();
+}
+
+//==========================================================================
+// dcSearchResultWorkBar
+//==========================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(dcSearchResultWorkBar, dcWorkBar)
+
+BEGIN_EVENT_TABLE(dcSearchResultWorkBar, dcWorkBar)
+ EVT_CHOICE(wxID_ANY, dcSearchResultWorkBar::onChoice)
+ EVT_BUTTON(wxID_FIND, dcSearchResultWorkBar::onSearch)
+ EVT_BUTTON(wxID_DELETE, dcSearchResultWorkBar::onRemove)
+ EVT_UPDATE_UI(wxID_FIND, dcSearchResultWorkBar::onUpdateUIHasSearch)
+ EVT_UPDATE_UI(wxID_DELETE, dcSearchResultWorkBar::onUpdateUIHasSearch)
+ EVT_LISTBOX_DCLICK(wxID_ANY, dcSearchResultWorkBar::onListDblClicked)
+END_EVENT_TABLE()
+
+dcSearchResultWorkBar::dcSearchResultWorkBar():
+dcWorkBar()
+{
+}
+
+bool dcSearchResultWorkBar::Create(wxWindow* parent, wxWindowID id)
+{
+ if(!dcWorkBar::Create(parent, id))
+ return false;
+
+ wxSizer *topSz = new wxBoxSizer(wxVERTICAL),
+ *toolSz = new wxBoxSizer(wxHORIZONTAL);
+ toolSz->Add(searchChoice = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL), 1, wxEXPAND);
+ toolSz->Add(new wxButton(this, wxID_FIND, wxT("")), 0, wxEXPAND);
+ toolSz->AddSpacer(4);
+ toolSz->Add(new wxButton(this, wxID_DELETE, wxT("")), 0, wxEXPAND);
+
+ topSz->Add(toolSz, 0, wxEXPAND);
+ topSz->Add(resultList = new wxListBox(this, wxID_ANY), 1, wxEXPAND);
+
+ SetSizer(topSz);
+
+ dcSearchManager::getInstance().addListner(this);
+ return true;
+}
+
+bool dcSearchResultWorkBar::Destroy()
+{
+ dcSearchManager::getInstance().remListner(this);
+ return dcWorkBar::Destroy();
+}
+
+void dcSearchResultWorkBar::onChoice(wxCommandEvent& event)
+{
+ updateResultList();
+}
+
+void dcSearchResultWorkBar::onListDblClicked(wxCommandEvent& event)
+{
+ dcBookmark* bm = getCurrentBookmark();
+ if(bm!=NULL)
+ {
+ dcBookmarkModule::open(bm);
+ }
+}
+
+void dcSearchResultWorkBar::onSearch(wxCommandEvent& event)
+{
+ dcSearchQueryStruct* st = getCurrentSearch(), *st2;
+ if(st!=NULL)
+ {
+ st2 = st->clone();
+ if(st2!=NULL)
+ {
+ dcSearchManager::getInstance().remSearch(st);
+ dcSearchManager::getInstance().search(st2);
+ }
+ }
+}
+
+void dcSearchResultWorkBar::onRemove(wxCommandEvent& event)
+{
+ int idx = searchChoice->GetSelection();
+ if(idx!=wxNOT_FOUND)
+ {
+ dcSearchQueryStruct* st = dynamic_cast<dcSearchQueryStruct*>((dcSearchQueryStruct*)searchChoice->GetClientData(idx));
+ if(st!=NULL)
+ {
+ dcSearchManager::getInstance().remSearch(st);
+ }
+ }
+}
+
+void dcSearchResultWorkBar::onUpdateUIHasSearch(wxUpdateUIEvent& event)
+{
+ event.Enable(searchChoice->GetCount()>0);
+}
+
+
+int dcSearchResultWorkBar::findSearch(const dcSearchQueryStruct* st)
+{
+ int idx = searchChoice->FindString(st->getName());
+ if(idx!=wxNOT_FOUND)
+ if(searchChoice->GetClientData(idx)==st)
+ return idx;
+ return wxNOT_FOUND;
+}
+
+int dcSearchResultWorkBar::findList(const dcBookmark* bm)
+{
+ int idx = resultList->FindString(bm->getLocation());
+ if(idx!=wxNOT_FOUND)
+ if(resultList->GetClientData(idx)==bm)
+ return idx;
+ return wxNOT_FOUND;
+}
+
+dcSearchQueryStruct* dcSearchResultWorkBar::getCurrentSearch()const
+{
+ int idx = searchChoice->GetSelection();
+ if(idx!=wxNOT_FOUND)
+ return (dcSearchQueryStruct*)searchChoice->GetClientData(idx);
+ else
+ return NULL;
+}
+
+dcBookmark* dcSearchResultWorkBar::getCurrentBookmark()const
+{
+ int idx = resultList->GetSelection();
+ if(idx!=wxNOT_FOUND)
+ return (dcBookmark*)resultList->GetClientData(idx);
+ else
+ return NULL;
+}
+
+void dcSearchResultWorkBar::updateResultList()
+{
+ resultList->Clear();
+ const dcSearchQueryStruct* st = getCurrentSearch();
+ const std::list<const dcBookmark*>* list = dcSearchManager::getInstance().getSearchResults(st);
+ if(list!=NULL)
+ {
+ for(std::list<const dcBookmark*>::const_iterator it=list->begin(); it!=list->end(); it++)
+ {
+ const dcBookmark* bm = *it;
+ if(bm!=NULL)
+ resultList->Append(bm->getLocation(), const_cast<dcBookmark*>(bm));
+ }
+ }
+}
+
+void dcSearchResultWorkBar::onAddSearch(const dcSearchQueryStruct* st)
+{
+ wxGUIACQUIRE
+ int idx = searchChoice->Append(st->getName(), const_cast<dcSearchQueryStruct*>(st));
+ searchChoice->SetSelection(idx);
+ updateResultList();
+ wxGUIRELEASE
+}
+
+void dcSearchResultWorkBar::onRemSearch(const dcSearchQueryStruct* st)
+{
+ wxGUIACQUIRE
+ int idx = findSearch(st);
+ if(idx!=wxNOT_FOUND)
+ {
+ searchChoice->Delete(idx);
+ if(searchChoice->GetCount()>0)
+ searchChoice->SetSelection(idx>0?idx-1:idx);
+ updateResultList();
+ }
+ wxGUIRELEASE
+}
+
+void dcSearchResultWorkBar::onAddSearchResult(const dcSearchQueryStruct* st, const dcBookmark* bookmark)
+{
+ wxGUIACQUIRE
+ int idx = findSearch(st);
+ if(idx!=wxNOT_FOUND)
+ {
+ if(idx!=searchChoice->GetCurrentSelection())
+ {
+ searchChoice->SetSelection(idx);
+ updateResultList();
+ }
+ resultList->Append(bookmark->getLocation(), const_cast<dcBookmark*>(bookmark));
+ }
+ wxGUIRELEASE
+}
+
+void dcSearchResultWorkBar::onRemSearchResult(const dcSearchQueryStruct* st, const dcBookmark* bookmark)
+{
+ wxGUIACQUIRE
+ int idx = findSearch(st);
+ if(idx!=wxNOT_FOUND && idx==searchChoice->GetCurrentSelection())
+ {
+ int id = findList(bookmark);
+ resultList->Delete(id);
+ }
+ wxGUIRELEASE
+}
+
+void dcSearchResultWorkBar::onRemAllSearchResult(const dcSearchQueryStruct* st)
+{
+ wxGUIACQUIRE
+ int idx = findSearch(st);
+ if(idx!=wxNOT_FOUND && idx==searchChoice->GetCurrentSelection())
+ {
+ resultList->Clear();
+ }
+ wxGUIRELEASE
+}
+
+void dcSearchResultWorkBar::onRemAllSearch()
+{
+ wxGUIACQUIRE
+ searchChoice->Clear();
+ resultList->Clear();
+ wxGUIRELEASE
+}
+
+
+//==========================================================================
+// dcSearchManager
+//==========================================================================
+
+dcSearchManager dcSearchManager::instance;
+
+BEGIN_EVENT_TABLE(dcSearchManager, wxEvtHandler)
+ EVT_ACTION(XRCID("SEARCH"), dcSearchManager::onSearch)
+END_EVENT_TABLE()
+
+void dcSearchManager::registerModule(dcSearchModule* module)
+{
+ modules.insert(module);
+}
+
+void dcSearchManager::unregister(dcSearchModule* module)
+{
+ modules.erase(module);
+}
+
+void dcSearchManager::querySearch()const
+{
+ dcSearchDialogBox dlg;
+ if(dlg.ShowModal()==dlg.GetAffirmativeId())
+ {
+ search(dlg.getSearchQueryStruct());
+ }
+}
+
+void dcSearchManager::search(dcSearchQueryStruct* st)const
+{
+ if(st!=NULL && st->module!=NULL)
+ {
+ st->module->doSearch(st);
+ }
+}
+
+
+bool dcSearchManager::initialize()
+{
+ m_actionsTools = new dcActionGroupEntry(this, wxID_ANY, wxdcACTION_GROUP_ENTRY_TOOLS, wxT(""), wxT(""), wxT(""), wxdcACTION_GROUP_PRIORITY_TOOLS);
+ dcActionManager::Register(m_actionsTools);
+ m_actionsTools->Append(XRCID("SEARCH"), _("Search ..."))->Accelerator(dcKeyCombo(wxT('H')).Ctrl());
+
+ dcWorkBarTemplate* wbtempl = new dcWorkBarTemplate(_("Search results"), _("Search results"),
+ CLASSINFO(dcSearchResultWorkBar), &wxGetApp(), wxSize(400, 240));
+ dcWorkBarManager::GetManager().RegisterTemplate(wbtempl);
+
+ return true;
+}
+
+void dcSearchManager::onSearch(dcActionEvent& event)
+{
+ querySearch();
+}
+
+void dcSearchManager::fillDialog(dcSearchUI& ui)const
+{
+ wxWindow* parent = ui.getSearchPanelParent();
+ for(SearchModuleSet::const_iterator iter=modules.begin(); iter!=modules.end(); iter++)
+ {
+ dcSearchPanel* panel = (*iter)->CreatePanel(parent, wxID_ANY);
+ if(panel!=NULL)
+ ui.addSearchPanel(panel, (*iter)->getModuleName());
+ }
+}
+
+const std::list<const dcBookmark*>* dcSearchManager::getSearchResults(const dcSearchQueryStruct* st)const
+{
+ Map::const_iterator it = map.find(const_cast<dcSearchQueryStruct*>(st));
+ if(it!=map.end())
+ return (const std::list<const dcBookmark*>*) &it->second;
+ else
+ return NULL;
+}
+
+
+void dcSearchManager::addListner(dcSearchResultListener* listener)
+{
+ listenerSet.insert(listener);
+}
+
+void dcSearchManager::remListner(dcSearchResultListener* listener)
+{
+ listenerSet.erase(listener);
+}
+
+void dcSearchManager::addSearchResult(dcSearchQueryStruct* st, dcBookmark* bookmark)
+{
+ Map::iterator iter = map.find(st);
+ if(iter==map.end())
+ {
+ map[st];
+ iter = map.find(st);
+ for(Set::iterator iter=listenerSet.begin(); iter!=listenerSet.end(); iter++)
+ (*iter)->onAddSearch(st);
+ }
+ iter->second.push_back(bookmark);
+ for(Set::iterator iter=listenerSet.begin(); iter!=listenerSet.end(); iter++)
+ (*iter)->onAddSearchResult(st, bookmark);
+}
+
+void dcSearchManager::addSearch(dcSearchQueryStruct* st)
+{
+ Map::iterator iter = map.find(st);
+ if(iter==map.end())
+ {
+ map[st];
+ iter = map.find(st);
+ for(Set::iterator iter=listenerSet.begin(); iter!=listenerSet.end(); iter++)
+ (*iter)->onAddSearch(st);
+ }
+}
+
+void dcSearchManager::remSearchResult(dcSearchQueryStruct* st, dcBookmark* bookmark, bool del)
+{
+ Map::iterator iter = map.find(st);
+ if(iter!=map.end())
+ std::remove(iter->second.begin(), iter->second.end(), bookmark);
+ for(Set::iterator iter=listenerSet.begin(); iter!=listenerSet.end(); iter++)
+ (*iter)->onRemSearchResult(st, bookmark);
+ if(del)
+ delete bookmark;
+}
+
+void dcSearchManager::remAllSearchResult(dcSearchQueryStruct* st, bool del)
+{
+ for(Set::iterator iter=listenerSet.begin(); iter!=listenerSet.end(); iter++)
+ (*iter)->onRemAllSearchResult(st);
+
+ Map::iterator iter = map.find(st);
+ if(iter!=map.end())
+ {
+ if(del)
+ {
+ for(std::list<dcBookmark*>::iterator it=iter->second.begin(); it!=iter->second.end(); it++)
+ delete *it;
+ }
+ iter->second.clear();
+ }
+}
+
+void dcSearchManager::dcSearchManager::remSearch(dcSearchQueryStruct* st, bool del)
+{
+ remAllSearchResult(st, del);
+
+ for(Set::iterator iter=listenerSet.begin(); iter!=listenerSet.end(); iter++)
+ (*iter)->onRemSearch(st);
+
+ map.erase(st);
+ if(del)
+ delete st;
+}
+
+void dcSearchManager::remAllSearches(bool del)
+{
+ for(Set::iterator iter=listenerSet.begin(); iter!=listenerSet.end(); iter++)
+ (*iter)->onRemAllSearch();
+
+ if(del)
+ {
+ for(Map::iterator iter=map.begin(); iter!=map.end(); iter++)
+ {
+ for(std::list<dcBookmark*>::iterator it=iter->second.begin(); it!=iter->second.end(); it++)
+ delete *it;
+ delete iter->first;
+ }
+ map.clear();
+ }
+}
Added: trunk/wxdevcenter/src/sys/search.hpp
===================================================================
--- trunk/wxdevcenter/src/sys/search.hpp (rev 0)
+++ trunk/wxdevcenter/src/sys/search.hpp 2009-09-10 11:22:10 UTC (rev 54)
@@ -0,0 +1,202 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * wxdevcenter
+ * Copyright (C) Emilien KIA 2009 <emi...@fr...>
+ *
+ * wxdevcenter is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wxdevcenter is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _SEARCH_HPP_
+#define _SEARCH_HPP_
+
+#include "bookmark.hpp"
+
+#include <set>
+#include <list>
+#include <map>
+
+class dcSearchQueryStruct;
+
+
+/**
+ * Base search panel.
+ */
+class dcSearchPanel : public wxPanel
+{
+ DECLARE_ABSTRACT_CLASS(dcSearchPanel)
+public:
+ virtual dcSearchQueryStruct* getSearchQueryStruct()const=0;
+};
+
+
+
+/**
+ * Base search module.
+ * Derive it to implement a new specific search module
+ */
+class dcSearchModule : public wxModule
+{
+ DECLARE_DYNAMIC_CLASS(dcSearchModule)
+public:
+ dcSearchModule();
+
+ virtual dcSearchPanel* CreatePanel(wxWindow* parent, wxWindowID id)const{return NULL;}
+ virtual wxString getModuleName(){return wxEmptyString;}
+
+ virtual void doSearch(dcSearchQueryStruct* st)const{}
+
+ virtual bool OnInit();
+ virtual void OnExit();
+};
+
+/**
+ * Base search query structure
+ */
+class dcSearchQueryStruct
+{
+public:
+ virtual ~dcSearchQueryStruct(){}
+
+ const dcSearchModule* module;
+
+ virtual dcSearchQueryStruct* clone()const=0;
+ virtual wxString getName()const=0;
+};
+
+/**
+ * Search UI.
+ */
+class dcSearchUI
+{
+public:
+ virtual void addSearchPanel(dcSearchPanel* panel, const wxString& moduleName)=0;
+ virtual wxWindow* getSearchPanelParent()const=0;
+};
+
+/**
+ * Search dialog box.
+ */
+class dcSearchDialogBox : public wxDialog, public dcSearchUI
+{
+public:
+ dcSearchDialogBox();
+ virtual void addSearchPanel(dcSearchPanel* panel, const wxString& moduleName);
+ virtual wxWindow* getSearchPanelParent()const;
+
+ dcSearchQueryStruct* getSearchQueryStruct()const;
+protected:
+ wxNotebook* notebook;
+};
+
+/**
+ * Interface for search result listeners
+ */
+class dcSearchResultListener
+{
+public:
+ virtual void onRemAllSearch()=0;
+ virtual void onAddSearch(const dcSearchQueryStruct* st)=0;
+ virtual void onRemSearch(const dcSearchQueryStruct* st)=0;
+ virtual void onAddSearchResult(const dcSearchQueryStruct* st, const dcBookmark* bookmark)=0;
+ virtual void onRemSearchResult(const dcSearchQueryStruct* st, const dcBookmark* bookmark)=0;
+ virtual void onRemAllSearchResult(const dcSearchQueryStruct* st)=0;
+};
+
+/**
+ * Asynchronous task list work bar.
+ */
+class dcSearchResultWorkBar: public dcWorkBar, public dcSearchResultListener
+{
+ DECLARE_DYNAMIC_CLASS(dcSearchResultWorkBar)
+ DECLARE_EVENT_TABLE()
+public:
+ dcSearchResultWorkBar();
+ bool Create(wxWindow* parent, wxWindowID id);
+
+ virtual bool Destroy();
+ virtual void onRemAllSearch();
+ virtual void onAddSearch(const dcSearchQueryStruct* st);
+ virtual void onRemSearch(const dcSearchQueryStruct* st);
+ virtual void onAddSearchResult(const dcSearchQueryStruct* st, const dcBookmark* bookmark);
+ virtual void onRemSearchResult(const dcSearchQueryStruct* st, const dcBookmark* bookmark);
+ virtual void onRemAllSearchResult(const dcSearchQueryStruct* st);
+
+protected:
+ int findSearch(const dcSearchQueryStruct* st);
+ int findList(const dcBookmark* bm);
+
+ dcSearchQueryStruct* getCurrentSearch()const;
+ dcBookmark* getCurrentBookmark()const;
+
+ void updateResultList();
+
+ void onChoice(wxCommandEvent& event);
+ void onListDblClicked(wxCommandEvent& event);
+ void onSearch(wxCommandEvent& event);
+ void onRemove(wxCommandEvent& event);
+ void onUpdateUIHasSearch(wxUpdateUIEvent& event);
+
+ wxChoice* searchChoice;
+ wxListBox* resultList;
+};
+
+/**
+ * Manager of search modules.
+ */
+class dcSearchManager : public wxEvtHandler, public dcGlobalActionTarget
+{
+ friend class dcSearchModule;
+ DECLARE_EVENT_TABLE()
+public:
+ typedef std::set<dcSearchModule*> SearchModuleSet;
+
+ static dcSearchManager& getInstance(){return instance;}
+
+ void querySearch()const;
+ void search(dcSearchQueryStruct* st)const;
+
+ void registerModule(dcSearchModule* module);
+ void unregister(dcSearchModule* module);
+
+ void fillDialog(dcSearchUI& ui)const;
+
+ void addSearchResult(dcSearchQueryStruct* st, dcBookmark* bookmark);
+ void remSearchResult(dcSearchQueryStruct* st, dcBookmark* bookmark, bool del=true);
+ void remAllSearchResult(dcSearchQueryStruct* st, bool del=true);
+ void addSearch(dcSearchQueryStruct* st);
+ void remSearch(dcSearchQueryStruct* st, bool del=true);
+ void remAllSearches(bool del=true);
+
+ void addListner(dcSearchResultListener* listener);
+ void remListner(dcSearchResultListener* listener);
+
+ const std::list<const dcBookmark*>* getSearchResults(const dcSearchQueryStruct* st)const;
+
+protected:
+ bool initialize();
+private:
+ void onSearch(dcActionEvent& event);
+
+ dcActionGroupEntry *m_actionsTools;
+ static dcSearchManager instance;
+ SearchModuleSet modules;
+
+ typedef std::map<dcSearchQueryStruct*, std::list<dcBookmark*> > Map;
+ Map map;
+
+ typedef std::set<dcSearchResultListener*> Set;
+ Set listenerSet;
+};
+
+#endif // _SEARCH_HPP_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
