CWS gnumake2: various fixes after merging with DEV300_m76

2 files changed, 3 insertions, 75 deletions

diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst
index 304d0e7c978f..b9403f4fd164 100644
--- a/toolkit/prj/build.lst
+++ b/toolkit/prj/build.lst
@@ -1,13 +1,3 @@
-ti	toolkit	:	vcl NULL
-ti	toolkit									usr1	-	all	ti_mkout NULL
-ti	toolkit\prj								get		-	all	ti_prj NULL
-ti	toolkit\inc								nmake	-	all	ti_inc NULL
-ti	toolkit\uiconfig\layout									nmake	-	all	ti_uiconfig_layout NULL
-ti	toolkit\source\helper					nmake	-	all	ti_helper  ti_inc NULL
-ti	toolkit\source\awt						nmake	-	all	ti_awt  ti_inc NULL
-ti	toolkit\source\controls					nmake	-	all	ti_controls  ti_inc NULL
-ti	toolkit\source\controls\tree			nmake	-	all	ti_tree  NULL
-ti	toolkit\source\controls\grid			nmake	-	all	ti_grid  NULL
-ti	toolkit\source\layout\core			nmake	-	all	ti_layout_core  NULL
-ti	toolkit\source\layout\vcl			nmake	-	all	ti_layout_vcl  NULL
-ti	toolkit\util							nmake	-	all	ti_util ti_awt ti_controls ti_layout_core ti_helper ti_tree ti_grid ti_layout_vcl NULL
+ti toolkit : vcl NULL
+ti toolkit     usr1  - all ti_mkout NULL
+ti toolkit\prj nmake - all ti_prj NULL
diff --git a/toolkit/prj/d.lst b/toolkit/prj/d.lst
index 0c62a083b330..8b137891791f 100644
--- a/toolkit/prj/d.lst
+++ b/toolkit/prj/d.lst
@@ -1,63 +1 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\inc%_EXT%\toolkit
-mkdir: %_DEST%\inc%_EXT%\toolkit\helper
-mkdir: %_DEST%\inc%_EXT%\toolkit\awt
-mkdir: %_DEST%\inc%_EXT%\toolkit\controls
 
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\itk.lib %_DEST%\lib%_EXT%\itk.lib
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\bin\tk*.res %_DEST%\bin%_EXT%\tk*res
-..\%__SRC%\bin\tk?????.sym %_DEST%\bin%_EXT%\tk?????.sym
-..\%__SRC%\bin\tk?????.dll %_DEST%\bin%_EXT%\tk?????.dll
-..\%__SRC%\misc\tk?????.map %_DEST%\bin%_EXT%\tk?????.map
-
-..\util\toolkit.xml %_DEST%\xml%_EXT%\toolkit.xml
-
-..\inc\toolkit\awt\vclxaccessiblecomponent.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxaccessiblecomponent.hxx
-..\inc\toolkit\awt\vclxcontainer.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxcontainer.hxx
-..\inc\toolkit\awt\vclxdevice.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxdevice.hxx
-..\inc\toolkit\awt\vclxfont.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxfont.hxx
-..\inc\toolkit\awt\vclxtopwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxtopwindow.hxx
-..\inc\toolkit\awt\vclxtoolkit.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxtoolkit.hxx
-..\inc\toolkit\awt\vclxwindow.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxwindow.hxx
-..\source\awt\vclxdialog.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxdialog.hxx
-..\inc\toolkit\awt\vclxwindows.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxwindows.hxx
-..\inc\toolkit\awt\vclxmenu.hxx %_DEST%\inc%_EXT%\toolkit\awt\vclxmenu.hxx
-
-..\inc\toolkit\controls\unocontrol.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrol.hxx
-..\inc\toolkit\controls\unocontrols.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrols.hxx
-..\inc\toolkit\controls\unocontrolmodel.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrolmodel.hxx
-..\inc\toolkit\controls\unocontrolbase.hxx %_DEST%\inc%_EXT%\toolkit\controls\unocontrolbase.hxx
-..\inc\toolkit\helper\servicenames.hxx %_DEST%\inc%_EXT%\toolkit\helper\servicenames.hxx
-
-..\inc\toolkit\helper\emptyfontdescriptor.hxx %_DEST%\inc%_EXT%\toolkit\helper\emptyfontdescriptor.hxx
-..\inc\toolkit\helper\vclunohelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\vclunohelper.hxx
-..\inc\toolkit\helper\convert.hxx %_DEST%\inc%_EXT%\toolkit\helper\convert.hxx
-..\inc\toolkit\helper\property.hxx %_DEST%\inc%_EXT%\toolkit\helper\property.hxx
-..\inc\toolkit\helper\macros.hxx %_DEST%\inc%_EXT%\toolkit\helper\macros.hxx
-..\inc\toolkit\helper\mutexhelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\mutexhelper.hxx
-..\inc\toolkit\helper\mutexandbroadcasthelper.hxx %_DEST%\inc%_EXT%\toolkit\helper\mutexandbroadcasthelper.hxx
-..\inc\toolkit\helper\listenermultiplexer.hxx %_DEST%\inc%_EXT%\toolkit\helper\listenermultiplexer.hxx
-..\inc\toolkit\helper\unowrapper.hxx %_DEST%\inc%_EXT%\toolkit\helper\unowrapper.hxx
-..\inc\toolkit\helper\externallock.hxx %_DEST%\inc%_EXT%\toolkit\helper\externallock.hxx
-..\inc\toolkit\helper\formpdfexport.hxx %_DEST%\inc%_EXT%\toolkit\helper/formpdfexport.hxx
-..\inc\toolkit\helper\accessiblefactory.hxx %_DEST%\inc%_EXT%\toolkit\helper\accessiblefactory.hxx
-..\inc\toolkit\helper\fixedhyperbase.hxx %_DEST%\inc%_EXT%\toolkit\helper\fixedhyperbase.hxx
-
-..\inc\toolkit\helper\vclunohelper.hxx %_DEST%\inc%_EXT%\toolkit\unohlp.hxx
-..\inc\toolkit\dllapi.h %_DEST%\inc%_EXT%\toolkit\dllapi.h
-
-mkdir: %_DEST%\inc%_EXT%\layout
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\inc\layout\*.hxx %_DEST%\inc%_EXT%\layout\*.hxx
-mkdir: %_DEST%\inc%_EXT%\layout\core
-..\source\layout\core\*.hxx  %_DEST%\inc%_EXT%\layout\core\*.hxx
-mkdir: %_DEST%\inc%_EXT%\layout\vcl
-..\source\layout\vcl\*.hxx  %_DEST%\inc%_EXT%\layout\vcl\*.hxx
-
-..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.*