merge from src641 internal ODK release

3 files changed, 22 insertions, 36 deletions

diff --git a/udkapi/prj/build.lst b/udkapi/prj/build.lst
index 96c17f864d3b..ac6511030611 100644
--- a/udkapi/prj/build.lst
+++ b/udkapi/prj/build.lst
@@ -1,27 +1,22 @@
 ua	udkapi	:	idlc NULL
 ua	udkapi									usr1	-	all	ua_mkout NULL
-ua	udkapi\com\sun\star\beans		nmake	-	all	ua_bean NULL
-ua	udkapi\com\sun\star\bridge		nmake	-	all	ua_brid NULL
-ua	udkapi\com\sun\star\connection		nmake	-	all	ua_connect NULL
-ua	udkapi\com\sun\star\container		nmake	-	all	ua_cont NULL
-ua	udkapi\com\sun\star\io			nmake	-	all	ua_io NULL
-ua	udkapi\com\sun\star\java		nmake	-	all	ua_java NULL
-ua	udkapi\com\sun\star\lang		nmake	-	all	ua_lang NULL
-ua	udkapi\com\sun\star\loader		nmake	-	all	ua_load NULL
-ua	udkapi\com\sun\star\reflection		nmake	-	all	ua_refl NULL
-ua	udkapi\com\sun\star\registry		nmake	-	all	ua_regis NULL
-ua	udkapi\com\sun\star\script		nmake	-	all	ua_scrpt NULL
-ua	udkapi\com\sun\star\test		nmake	-	all	ua_test NULL
+ua	udkapi\com\sun\star\beans				nmake	-	all	ua_bean NULL
+ua	udkapi\com\sun\star\bridge				nmake	-	all	ua_brid NULL
+ua	udkapi\com\sun\star\connection			nmake	-	all	ua_connect NULL
+ua	udkapi\com\sun\star\container			nmake	-	all	ua_cont NULL
+ua	udkapi\com\sun\star\io					nmake	-	all	ua_io NULL
+ua	udkapi\com\sun\star\java				nmake	-	all	ua_java NULL
+ua	udkapi\com\sun\star\lang				nmake	-	all	ua_lang NULL
+ua	udkapi\com\sun\star\loader				nmake	-	all	ua_load NULL
+ua	udkapi\com\sun\star\reflection			nmake	-	all	ua_refl NULL
+ua	udkapi\com\sun\star\registry			nmake	-	all	ua_regis NULL
+ua	udkapi\com\sun\star\script				nmake	-	all	ua_scrpt NULL
+ua	udkapi\com\sun\star\test				nmake	-	all	ua_test NULL
 ua	udkapi\com\sun\star\test\performance	nmake	-	all	ua_tstperform NULL
-ua	udkapi\com\sun\star\test\bridge		nmake	-	all	ua_tstbridge NULL
-ua	udkapi\com\sun\star\corba\iop		nmake	-	all	ua_iop NULL
-ua	udkapi\com\sun\star\corba\giop		nmake	-	all	ua_giop NULL
-ua	udkapi\com\sun\star\corba\iiop		nmake	-	all	ua_iiop NULL
-ua	udkapi\com\sun\star\corba		nmake	-	all	ua_corba NULL
-ua	udkapi\com\sun\star\uno			nmake	-	all	ua_uno NULL
-ua	udkapi\com\sun\star\security		nmake	-	all	ua_sec ua_uno NULL
-ua	udkapi\com\sun\star\util		nmake	-	all	ua_uutil ua_lang ua_uno NULL
-ua	udkapi\com\sun\star\util\logging	nmake	-	all	ua_log		NULL
-ua	udkapi\com\sun\star\task		nmake	-	all	ua_task ua_uno		NULL
-ua	udkapi\com\sun\star			nmake	-	all	ua_star ua_uno NULL
-ua	udkapi\util				nmake	-	all	ua_util ua_bean ua_brid ua_connect ua_cont ua_corba ua_giop ua_iiop ua_io ua_iop ua_java ua_lang ua_load ua_refl ua_regis ua_scrpt ua_test ua_tstbridge ua_tstperform ua_sec ua_uno ua_uutil ua_log ua_task ua_star NULL
+ua	udkapi\com\sun\star\test\bridge			nmake	-	all	ua_tstbridge NULL
+ua	udkapi\com\sun\star\corba\iop			nmake	-	all	ua_iop NULL
+ua	udkapi\com\sun\star\corba\giop			nmake	-	all	ua_giop NULL
+ua	udkapi\com\sun\star\corba\iiop			nmake	-	all	ua_iiop NULL
+ua	udkapi\com\sun\star\corba				nmake	-	all	ua_corba NULL
+ua	udkapi\com\sun\star\uno					nmake	-	all	ua_uno NULL
+ua	udkapi\util								nmake	-	all	ua_util ua_bean ua_brid ua_connect ua_cont ua_corba ua_giop ua_iiop ua_io ua_iop ua_java ua_lang ua_load ua_refl ua_regis ua_scrpt ua_test ua_tstbridge ua_tstperform ua_uno NULL
diff --git a/udkapi/prj/d.lst b/udkapi/prj/d.lst
index 637e7a249751..6ace69aea96f 100644
--- a/udkapi/prj/d.lst
+++ b/udkapi/prj/d.lst
@@ -16,12 +16,7 @@ mkdir: %_DEST%\idl%_EXT%\com\sun\star\test
 mkdir: %_DEST%\idl%_EXT%\com\sun\star\test\performance
 mkdir: %_DEST%\idl%_EXT%\com\sun\star\test\bridge
 mkdir: %_DEST%\idl%_EXT%\com\sun\star\uno
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\util
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\util\logging
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\security
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\task
 
-..\%__SRC%\misc\udkapi.autodoc %_DEST%\idl%_EXT%\udkapi.autodoc
 ..\%__SRC%\ucr\udkapi.db %_DEST%\bin%_EXT%\udkapi.rdb
 ..\%__SRC%\ucrdoc\udkapi_doc.db %_DEST%\bin%_EXT%\udkapi_doc.rdb
 
@@ -41,10 +36,7 @@ mkdir: %_DEST%\idl%_EXT%\com\sun\star\task
 ..\com\sun\star\test\bridge\*.idl %_DEST%\idl%_EXT%\com\sun\star\test\bridge\*.idl
 ..\com\sun\star\text\*.idl %_DEST%\idl%_EXT%\com\sun\star\text\*.idl
 ..\com\sun\star\uno\*.idl %_DEST%\idl%_EXT%\com\sun\star\uno\*.idl
-..\com\sun\star\util\*.idl %_DEST%\idl%_EXT%\com\sun\star\util\*.idl
-..\com\sun\star\util\logging\*.idl %_DEST%\idl%_EXT%\com\sun\star\util\logging\*.idl
-..\com\sun\star\security\*.idl %_DEST%\idl%_EXT%\com\sun\star\security\*.idl
-..\com\sun\star\task\*.idl %_DEST%\idl%_EXT%\com\sun\star\task\*.idl
+
 
 ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
 ..\%__SRC%\misc\*staticdatamembers.cxx %_DEST%\inc%_EXT%\*staticdatamembers.cxx
diff --git a/udkapi/prj/makefile.mk b/udkapi/prj/makefile.mk
index e070961df94a..5aa0b6d35fb9 100644
--- a/udkapi/prj/makefile.mk
+++ b/udkapi/prj/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: tpf $ $Date: 2002-01-14 17:16:54 $
+#   last change: $Author: mi $ $Date: 2003-01-21 13:17:34 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,7 +76,6 @@ INCLUDES= \
     com$/sun$/star$/beans$/makefile.mk \
     com$/sun$/star$/lang$/makefile.mk \
     com$/sun$/star$/uno$/makefile.mk \
-    com$/sun$/star$/uno$/util$/logging$/makefile.mk \
     com$/sun$/star$/corba$/makefile.mk			\
     com$/sun$/star$/corba$/iop$/makefile.mk 	\
     com$/sun$/star$/corba$/giop$/makefile.mk 	\