diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
| commit | 4f40fd2727a826d5d0b06617e5179829d66df5d2 (patch) | |
| tree | bb3fbdb8fd94c48653a3b642b7d59dd10972b439 /sfx2/prj | |
| parent | 83d7b776fba6a9b6be8e52f221b237b49ff7612d (diff) | |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'sfx2/prj')
| -rw-r--r-- | sfx2/prj/build.lst | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index d3f687fbc4af..85763aab9258 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,38 +1,11 @@ sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL sf sfx2 usr1 - all sf_mkout NULL -<<<<<<< local sf sfx2\prj nmake - all sf_prj NULL -======= -sf sfx2\inc nmake - all sf_inc NULL -sf sfx2\prj get - all sf_prj NULL -sf sfx2\mac\res get - all sf_mres NULL -sf sfx2\source\inc get - all sf_sinc NULL -sf sfx2\sdi nmake - all sf_sdi NULL -sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL -sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL -sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL -sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL -sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL -sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL -sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL -sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL -sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL -sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL -sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL -sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL -sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL -sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL -sf sfx2\workben\custompanel nmake - all sf_wb_custompanel NULL -sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL -sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL -sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL ->>>>>>> other -<<<<<<< local -======= + # fails on unxsoli4 # sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL # sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL # sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL ->>>>>>> other + |