CWS gnumake2: various fixes after merging with DEV300_m76

4 files changed, 24 insertions, 172 deletions

diff --git a/tools/prj/build.lst b/tools/prj/build.lst
index 659ecfe66cab..3194cbb4e87c 100644
--- a/tools/prj/build.lst
+++ b/tools/prj/build.lst
@@ -1,30 +1,3 @@
-tl	tools	:	cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
-tl	tools								usr1	-	all	tl_mkout NULL
-tl	tools\bootstrp\isdll				get		-	all	tl_bsisdll NULL
-tl	tools\bootstrp\addexes				get		-	all	tl_bsexes NULL
-tl	tools\inc							nmake	-	all	tl_inc NULL
-tl	tools\prj							get		-	all	tl_prj NULL
-tl	tools\prj							usr7	-	all	tl_deliver NULL
-tl	tools\prj							usr42	-	all	tl_zn NULL
-tl	tools\workben						get		-	all	tl_wben NULL
-tl	tools\source\testtoolloader			nmake	-	all	tl_ttloader tl_inc NULL
-tl	tools\source\generic				nmake	-	all	tl_gen tl_fsys tl_inc NULL
-tl	tools\source\memtools				nmake	-	all	tl_mem tl_fsys tl_inc NULL
-tl	tools\source\debug					nmake	-	all	tl_deb tl_fsys tl_inc NULL
-tl	tools\source\datetime				nmake	-	all	tl_dat tl_fsys tl_inc NULL
-tl	tools\source\stream					nmake	-	all	tl_str tl_fsys tl_inc NULL
-tl	tools\source\rc						nmake	-	all	tl_rc tl_fsys tl_inc NULL
-tl	tools\source\ref					nmake	-	all	tl_ref tl_fsys tl_inc NULL
-tl	tools\source\fsys					nmake	-	all	tl_fsys tl_inc NULL
-tl	tools\source\zcodec					nmake	-	all	tl_zco tl_fsys tl_inc NULL
-tl	tools\source\communi				nmake	-	all	tl_com tl_fsys tl_inc NULL
-tl	tools\source\inet					nmake	-	all	tl_inet tl_fsys tl_inc NULL
-tl	tools\source\string					nmake	-	all	tl_string tl_fsys tl_inc NULL
-tl  tools\source\misc                   nmake   -   all tl_misc tl_inc NULL
-tl	tools\win\source\dll				nmake	-	w	tl_dllw tl_inc NULL
-tl	tools\os2\source\dll				nmake	-	p	tl_dllp tl_inc NULL
-tl	tools\unx\source\dll				nmake	-	u	tl_dllu tl_inc NULL
-tl	tools\util							nmake	-	all	tl_utl tl_com tl_dat tl_deb tl_dllu.u tl_dllp.p tl_dllw.w tl_fsys tl_gen tl_inet tl_mem tl_rc tl_ref tl_str tl_string tl_misc tl_zco tl_ttloader NULL
-tl	tools\bootstrp						nmake	-	all	tl_bstrp tl_utl tl_inc NULL
-tl	tools\bootstrp\addexes2				nmake	-	all	tl_bsexes2 tl_bstrp tl_inc NULL
-
+tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
+tl tools     usr1  - all tl_mkout NULL
+tl tools\prj nmake - all tl_prj NULL
diff --git a/tools/prj/d.lst b/tools/prj/d.lst
index 76cb0107453c..8b137891791f 100644
--- a/tools/prj/d.lst
+++ b/tools/prj/d.lst
@@ -1,124 +1 @@
-mkdir: %_DEST%\inc%_EXT%\bootstrp
 
-..\%__SRC%\misc\_ooo_st_btstrp.pdb %_DEST%\lib%_EXT%\_ooo_st_btstrp.pdb
-..\%__SRC%\bin\mkunroll* %_DEST%\bin%_EXT%
-..\%__SRC%\bin\tl?????.dll %_DEST%\bin%_EXT%\tl?????.dll
-..\%__SRC%\bin\tl?????.sym %_DEST%\bin%_EXT%\tl?????.sym
-..\%__SRC%\lib\atools.lib %_DEST%\lib%_EXT%\atools.lib
-..\%__SRC%\lib\btstrp.lib %_DEST%\lib%_EXT%\btstrp.lib
-..\%__SRC%\lib\bootstrp2.lib %_DEST%\lib%_EXT%\bootstrp2.lib
-..\%__SRC%\lib\itools.lib %_DEST%\lib%_EXT%\itools.lib
-..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%\lib*.a
-..\%__SRC%\lib\lib*.sl %_DEST%\lib%_EXT%\lib*.sl
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.*
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
-..\%__SRC%\lib\stdstrm.lib %_DEST%\lib%_EXT%\stdstrm.lib
-..\%__SRC%\misc\tl?????.map %_DEST%\bin%_EXT%\tl?????.map
-..\%__SRC%\slb\btstrpsh.lib %_DEST%\lib%_EXT%\btstrpsh.lib
-
-..\inc\bootstrp\command.hxx %_DEST%\inc%_EXT%\bootstrp\command.hxx
-..\inc\bootstrp\inimgr.hxx %_DEST%\inc%_EXT%\bootstrp\inimgr.hxx
-..\inc\bootstrp\listmacr.hxx %_DEST%\inc%_EXT%\bootstrp\listmacr.hxx
-..\inc\bootstrp\mkcreate.hxx %_DEST%\inc%_EXT%\bootstrp\mkcreate.hxx
-..\inc\bootstrp\prj.hxx %_DEST%\inc%_EXT%\bootstrp\prj.hxx
-..\inc\bootstrp\sstring.hxx %_DEST%\inc%_EXT%\bootstrp\sstring.hxx
-
-..\inc\tools\toolsdllapi.h %_DEST%\inc%_EXT%\tools\toolsdllapi.h
-..\inc\tools\weakbase.hxx %_DEST%\inc%_EXT%\tools\weakbase.hxx
-..\inc\tools\weakbase.h %_DEST%\inc%_EXT%\tools\weakbase.h
-
-..\inc\tools\postwin.h %_DEST%\inc%_EXT%\tools\postwin.h
-..\inc\tools\prewin.h %_DEST%\inc%_EXT%\tools\prewin.h
-
-..\inc\tools\postx.h %_DEST%\inc%_EXT%\tools\postx.h
-..\inc\tools\prex.h %_DEST%\inc%_EXT%\tools\prex.h
-
-..\inc\tools\solarmutex.hxx %_DEST%\inc%_EXT%\tools\solarmutex.hxx
-..\inc\tools\wintypes.hxx %_DEST%\inc%_EXT%\tools\wintypes.hxx
-..\inc\tools\mapunit.hxx %_DEST%\inc%_EXT%\tools\mapunit.hxx
-..\inc\tools\fldunit.hxx %_DEST%\inc%_EXT%\tools\fldunit.hxx
-..\inc\tools\fontenum.hxx %_DEST%\inc%_EXT%\tools\fontenum.hxx
-..\inc\tools\agapi.hxx %_DEST%\inc%_EXT%\tools\agapi.hxx
-..\inc\tools\agitem.hxx %_DEST%\inc%_EXT%\tools\agitem.hxx
-..\inc\tools\appendunixshellword.hxx %_DEST%\inc%_EXT%\tools\appendunixshellword.hxx
-..\inc\tools\bigint.hxx %_DEST%\inc%_EXT%\tools\bigint.hxx
-..\inc\tools\cachestr.hxx %_DEST%\inc%_EXT%\tools\cachestr.hxx
-..\inc\tools\chapi.hxx %_DEST%\inc%_EXT%\tools\chapi.hxx
-..\inc\tools\color.hxx %_DEST%\inc%_EXT%\tools\color.hxx
-..\inc\tools\contnr.hxx %_DEST%\inc%_EXT%\tools\contnr.hxx
-..\inc\tools\date.hxx %_DEST%\inc%_EXT%\tools\date.hxx
-..\inc\tools\datetime.hxx %_DEST%\inc%_EXT%\tools\datetime.hxx
-..\inc\tools\debug.hxx %_DEST%\inc%_EXT%\tools\debug.hxx
-..\inc\tools\diagnose_ex.h %_DEST%\inc%_EXT%\tools\diagnose_ex.h
-..\inc\tools\download.hxx %_DEST%\inc%_EXT%\tools\download.hxx
-..\inc\tools\dynary.hxx %_DEST%\inc%_EXT%\tools\dynary.hxx
-..\inc\tools\errcode.hxx %_DEST%\inc%_EXT%\tools\errcode.hxx
-..\inc\tools\errinf.hxx %_DEST%\inc%_EXT%\tools\errinf.hxx
-..\inc\tools\extendapplicationenvironment.hxx %_DEST%\inc%_EXT%\tools\extendapplicationenvironment.hxx
-..\inc\tools\fract.hxx %_DEST%\inc%_EXT%\tools\fract.hxx
-..\inc\tools\fsys.hxx %_DEST%\inc%_EXT%\tools\fsys.hxx
-..\inc\tools\eacopier.hxx %_DEST%\inc%_EXT%\tools\eacopier.hxx
-..\inc\tools\gen.hxx %_DEST%\inc%_EXT%\tools\gen.hxx
-..\inc\tools\globname.hxx %_DEST%\inc%_EXT%\tools\globname.hxx
-..\inc\tools\inetdef.hxx %_DEST%\inc%_EXT%\tools\inetdef.hxx
-..\inc\tools\inetmime.hxx %_DEST%\inc%_EXT%\tools\inetmime.hxx
-..\inc\tools\inetmsg.hxx %_DEST%\inc%_EXT%\tools\inetmsg.hxx
-..\inc\tools\inetstrm.hxx %_DEST%\inc%_EXT%\tools\inetstrm.hxx
-..\inc\tools\link.hxx %_DEST%\inc%_EXT%\tools\link.hxx
-..\inc\tools\list.hxx %_DEST%\inc%_EXT%\tools\list.hxx
-..\inc\tools\mempool.hxx %_DEST%\inc%_EXT%\tools\mempool.hxx
-..\inc\tools\multisel.hxx %_DEST%\inc%_EXT%\tools\multisel.hxx
-..\inc\tools\ownlist.hxx %_DEST%\inc%_EXT%\tools\ownlist.hxx
-..\inc\tools\postsys.h %_DEST%\inc%_EXT%\tools\postsys.h
-..\inc\tools\presys.h %_DEST%\inc%_EXT%\tools\presys.h
-..\inc\tools\pstm.hxx %_DEST%\inc%_EXT%\tools\pstm.hxx
-..\inc\tools\queue.hxx %_DEST%\inc%_EXT%\tools\queue.hxx
-..\inc\tools\rc.h %_DEST%\inc%_EXT%\tools\rc.h
-..\inc\tools\rc.hxx %_DEST%\inc%_EXT%\tools\rc.hxx
-..\inc\tools\rcid.h %_DEST%\inc%_EXT%\tools\rcid.h
-..\inc\tools\ref.hxx %_DEST%\inc%_EXT%\tools\ref.hxx
-..\inc\tools\resid.hxx %_DEST%\inc%_EXT%\tools\resid.hxx
-..\inc\tools\resmgr.hxx %_DEST%\inc%_EXT%\tools\resmgr.hxx
-..\inc\tools\StringListResource.hxx %_DEST%\inc%_EXT%\tools\StringListResource.hxx
-..\inc\tools\isofallback.hxx %_DEST%\inc%_EXT%\tools\isofallback.hxx
-..\inc\tools\rtti.hxx %_DEST%\inc%_EXT%\tools\rtti.hxx
-..\inc\tools\shl.hxx %_DEST%\inc%_EXT%\tools\shl.hxx
-..\inc\tools\simplerm.hxx %_DEST%\inc%_EXT%\tools\simplerm.hxx
-..\inc\tools\solar.h %_DEST%\inc%_EXT%\tools\solar.h
-..\inc\tools\stack.hxx %_DEST%\inc%_EXT%\tools\stack.hxx
-..\inc\tools\stream.hxx %_DEST%\inc%_EXT%\tools\stream.hxx
-..\inc\tools\string.hxx %_DEST%\inc%_EXT%\tools\string.hxx
-..\inc\tools\svwin.h %_DEST%\inc%_EXT%\tools\svwin.h
-..\inc\tools\table.hxx %_DEST%\inc%_EXT%\tools\table.hxx
-..\inc\tools\tenccvt.hxx %_DEST%\inc%_EXT%\tools\tenccvt.hxx
-..\inc\tools\time.hxx %_DEST%\inc%_EXT%\tools\time.hxx
-..\inc\tools\tools.h %_DEST%\inc%_EXT%\tools\tools.h
-..\inc\tools\unqid.hxx %_DEST%\inc%_EXT%\tools\unqid.hxx
-..\inc\tools\unqidx.hxx %_DEST%\inc%_EXT%\tools\unqidx.hxx
-..\inc\tools\urlkeys.hxx %_DEST%\inc%_EXT%\tools\urlkeys.hxx
-..\inc\tools\urlobj.hxx %_DEST%\inc%_EXT%\tools\urlobj.hxx
-..\inc\tools\vcompat.hxx %_DEST%\inc%_EXT%\tools\vcompat.hxx
-..\inc\tools\wldcrd.hxx %_DEST%\inc%_EXT%\tools\wldcrd.hxx
-..\inc\tools\zcodec.hxx %_DEST%\inc%_EXT%\tools\zcodec.hxx
-..\inc\tools\tempfile.hxx %_DEST%\inc%_EXT%\tools\tempfile.hxx
-..\inc\tools\geninfo.hxx %_DEST%\inc%_EXT%\tools\geninfo.hxx
-..\inc\tools\iparser.hxx %_DEST%\inc%_EXT%\tools\iparser.hxx
-..\inc\tools\config.hxx %_DEST%\inc%_EXT%\tools\config.hxx
-..\inc\tools\resary.hxx %_DEST%\inc%_EXT%\tools\resary.hxx
-..\inc\tools\poly.hxx %_DEST%\inc%_EXT%\tools\poly.hxx
-..\inc\tools\line.hxx %_DEST%\inc%_EXT%\tools\line.hxx
-..\inc\tools\vector2d.hxx %_DEST%\inc%_EXT%\tools\vector2d.hxx
-..\inc\tools\testtoolloader.hxx %_DEST%\inc%_EXT%\tools\testtoolloader.hxx
-..\inc\tools\svborder.hxx %_DEST%\inc%_EXT%\tools\svborder.hxx
-..\inc\tools\getprocessworkingdir.hxx %_DEST%\inc%_EXT%\tools\getprocessworkingdir.hxx
-..\inc\tools\b3dtrans.hxx %_DEST%\inc%_EXT%\tools\b3dtrans.hxx
-
-..\%__SRC%\bin\rscdep.exe %_DEST%\bin%_EXT%\rscdep.exe
-..\%__SRC%\bin\rscdep %_DEST%\bin%_EXT%\rscdep
-..\%__SRC%\bin\so_checksum.exe %_DEST%\bin%_EXT%\so_checksum.exe
-..\%__SRC%\bin\so_checksum %_DEST%\bin%_EXT%\so_checksum
-
-..\inc\tools\pathutils.hxx %_DEST%\inc%_EXT%\tools\pathutils.hxx
-..\%__SRC%\obj\pathutils.obj %_DEST%\lib%_EXT%\pathutils-obj.obj
-..\%__SRC%\slo\pathutils.obj %_DEST%\lib%_EXT%\pathutils-slo.obj
diff --git a/tools/prj/target_lib_tl.mk b/tools/prj/target_lib_tl.mk
index 3379a194e024..704ddbb16be1 100644
--- a/tools/prj/target_lib_tl.mk
+++ b/tools/prj/target_lib_tl.mk
@@ -61,14 +61,27 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
 
 
 $(eval $(call gb_Library_add_exception_objects,tl,\
+    tools/source/communi/geninfo \
     tools/source/communi/parser \
+    tools/source/datetime/datetime \
     tools/source/datetime/tdate \
     tools/source/datetime/ttime \
+    tools/source/debug/debug \
     tools/source/debug/stcktree \
+    tools/source/fsys/comdep \
+    tools/source/fsys/dirent \
+    tools/source/fsys/filecopy \
+    tools/source/fsys/fstat \
     tools/source/fsys/tdir \
     tools/source/fsys/tempfile \
     tools/source/fsys/urlobj \
     tools/source/fsys/wldcrd \
+    tools/source/generic/b3dtrans \
+    tools/source/generic/bigint \
+    tools/source/generic/color \
+    tools/source/generic/config \
+    tools/source/generic/fract \
+    tools/source/generic/gen \
     tools/source/generic/line \
     tools/source/generic/link \
     tools/source/generic/poly \
@@ -78,44 +91,32 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
     tools/source/inet/inetmime \
     tools/source/inet/inetmsg \
     tools/source/inet/inetstrm \
+    tools/source/memtools/contnr \
     tools/source/memtools/mempool \
     tools/source/memtools/multisel \
     tools/source/memtools/table \
     tools/source/memtools/unqidx \
+    tools/source/misc/appendunixshellword \
+    tools/source/misc/extendapplicationenvironment \
+    tools/source/misc/getprocessworkingdir \
     tools/source/misc/solarmutex \
     tools/source/rc/isofallback \
     tools/source/rc/rc \
     tools/source/rc/resary \
     tools/source/rc/resmgr \
+    tools/source/ref/errinf \
     tools/source/ref/globname \
     tools/source/ref/pstm \
     tools/source/ref/ref \
+    tools/source/stream/cachestr \
     tools/source/stream/stream \
     tools/source/stream/strmsys \
     tools/source/stream/vcompat \
+    tools/source/string/debugprint \
     tools/source/string/tenccvt \
     tools/source/string/tstring \
     tools/source/string/tustring \
     tools/source/testtoolloader/testtoolloader \
-    tools/source/communi/geninfo \
-    tools/source/datetime/datetime \
-    tools/source/debug/debug \
-    tools/source/fsys/comdep \
-    tools/source/fsys/dirent \
-    tools/source/fsys/filecopy \
-    tools/source/fsys/fstat \
-    tools/source/generic/bigint \
-    tools/source/generic/color \
-    tools/source/generic/config \
-    tools/source/generic/fract \
-    tools/source/generic/gen \
-    tools/source/memtools/contnr \
-    tools/source/misc/appendunixshellword \
-    tools/source/misc/extendapplicationenvironment \
-    tools/source/misc/getprocessworkingdir \
-    tools/source/ref/errinf \
-    tools/source/stream/cachestr \
-    tools/source/string/debugprint \
     tools/source/zcodec/zcodec \
 ))
 
diff --git a/tools/prj/target_package_inc.mk b/tools/prj/target_package_inc.mk
index 92bb02034e7d..14e70973b276 100644
--- a/tools/prj/target_package_inc.mk
+++ b/tools/prj/target_package_inc.mk
@@ -118,3 +118,4 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/weakbase.hxx,tools/weakbas
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/wintypes.hxx,tools/wintypes.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/wldcrd.hxx,tools/wldcrd.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/zcodec.hxx,tools/zcodec.hxx))
+$(eval $(call gb_Package_add_file,tools_inc,inc/tools/b3dtrans.hxx,tools/b3dtrans.hxx))