INTEGRATION: CWS ause064 (1.25.4); FILE MERGED

2006/08/17 10:32:41 hjs 1.25.4.4: #i68528# missed to deliver libstdc++
2006/08/14 12:38:37 hjs 1.25.4.3: #i68528# cleanup
2006/08/14 12:37:58 hjs 1.25.4.2: #i68528# gcc libs to solver
2006/08/11 10:07:15 hjs 1.25.4.1: #i68528# removed obsolete

1 files changed, 11 insertions, 60 deletions

diff --git a/external/prj/d.lst b/external/prj/d.lst
index cef0806ef1ae..babc498e8683 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -1,76 +1,26 @@
 mkdir: %_DEST%\inc%_EXT%\external
-mkdir: %_DEST%\inc%_EXT%\external\ado
-mkdir: %_DEST%\inc%_EXT%\external\atl
-mkdir: %_DEST%\inc%_EXT%\external\dt
-mkdir: %_DEST%\inc%_EXT%\external\freetype
-mkdir: %_DEST%\inc%_EXT%\external\freetype\config
-mkdir: %_DEST%\inc%_EXT%\external\freetype\internal
 mkdir: %_DEST%\inc%_EXT%\external\glibc
 mkdir: %_DEST%\inc%_EXT%\external\gpc
-mkdir: %_DEST%\inc%_EXT%\external\jpeg
-mkdir: %_DEST%\inc%_EXT%\external\npsdk
-mkdir: %_DEST%\inc%_EXT%\external\odbc
-mkdir: %_DEST%\inc%_EXT%\external\pgp
-mkdir: %_DEST%\inc%_EXT%\external\pgp\win32_55
-mkdir: %_DEST%\inc%_EXT%\external\pgp\win32_60
-mkdir: %_DEST%\inc%_EXT%\external\pgp\win32_65
-mkdir: %_DEST%\inc%_EXT%\external\sane
-mkdir: %_DEST%\inc%_EXT%\external\twain
-mkdir: %_DEST%\inc%_EXT%\external\zlib
-mkdir: %_DEST%\inc%_EXT%\audio
-mkdir: %_DEST%\inc%_EXT%\X11
-mkdir: %_DEST%\inc%_EXT%\X11\extensions
 mkdir: %_DEST%\pck%_EXT%
-..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
-..\common.pro\bin\*.zip %_DEST%\pck%_EXT%\*.zip
-..\common\xt.jar %_DEST%\bin%_EXT%\xt.jar
-
-..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
-..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\*
-..\ado\*.h %_DEST%\inc%_EXT%\external\ado\*.h
-..\atl\rtufiles\*.h %_DEST%\inc%_EXT%\external\atl\*.h
-..\atl\rtufiles\*.idl %_DEST%\inc%_EXT%\external\atl\*.idl
-..\atl\rtufiles\*.cpp %_DEST%\inc%_EXT%\external\atl\*.cpp
-..\dt\rtufiles\*.h %_DEST%\inc%_EXT%\external\dt\*.h
+
+..\jars\xt.jar %_DEST%\bin%_EXT%\xt.jar
+..\jars\parser.jar %_DEST%\bin%_EXT%\parser.jar
+..\jars\jaxp.jar %_DEST%\bin%_EXT%\jaxp.jar
+
 ..\glibc\rtufiles\config.h %_DEST%\inc%_EXT%\external\glibc\config.h
 ..\glibc\rtufiles\getopt.h %_DEST%\inc%_EXT%\external\glibc\getopt.h
 ..\gpc\gpc.h %_DEST%\inc%_EXT%\external\gpc\gpc.h
-..\npsdk\rtufiles\*.h %_DEST%\inc%_EXT%\external\npsdk\*.h
-..\odbc\rtufiles\*.h %_DEST%\inc%_EXT%\external\odbc\*.h
-..\sane\*.h %_DEST%\inc%_EXT%\external\sane\*.h
-..\twain\*.h %_DEST%\inc%_EXT%\external\twain\*.h
-..\zlib\rtufiles\zlib.h %_DEST%\inc%_EXT%\external\zlib\zlib.h
-..\zlib\rtufiles\zconf.h %_DEST%\inc%_EXT%\external\zconf.h
-
-..\%__SRC%\slo\np* %_DEST%\lib%_EXT%\*
-..\%__SRC%\slo\PluginNew.* %_DEST%\lib%_EXT%\*
+
 ..\%__SRC%\slb\gnu_getopt.lib %_DEST%\lib%_EXT%\gnu_getopt.lib
 ..\%__SRC%\lib\libgnu_getopt.a %_DEST%\lib%_EXT%\libgnu_getopt.a
-..\%__SRC%\slb\zlib.lib %_DEST%\lib%_EXT%\zlib.lib
-..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
-..\%__SRC%\lib\libfreetype.a %_DEST%\lib%_EXT%\libfreetype.a
-
-..\jpeg\rtufiles\jpeg.h %_DEST%\inc%_EXT%\external\jpeg\jpeg.h
-..\jpeg\rtufiles\jpeglib.h %_DEST%\inc%_EXT%\external\jpeg\jpeglib.h
-..\%__SRC%\slb\jpeglib.lib %_DEST%\lib%_EXT%\jpeglib.lib
-..\%__SRC%\lib\libjpeglib.a %_DEST%\lib%_EXT%\libjpeglib.a
-
-..\pgp\pgp553\win32_55\inc\*.h %_DEST%\inc%_EXT%\external\pgp\win32_55\*.h
-..\pgp\pgp602\win32_60\inc\*.h %_DEST%\inc%_EXT%\external\pgp\win32_60\*.h
-..\pgp\pgp651\win32_65\inc\*.h %_DEST%\inc%_EXT%\external\pgp\win32_65\*.h
-..\pgp\pgp553\win32_55\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\pgp\pgp602\win32_60\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\pgp\pgp651\win32_65\lib\*.lib %_DEST%\lib%_EXT%\*.lib
 
 ..\%__SRC%\slb\gpc.lib %_DEST%\lib%_EXT%\gpc.lib
 ..\%__SRC%\lib\libgpc.a %_DEST%\lib%_EXT%\libgpc.a
 
 ..\%__SRC%\lib\libautorec*.* %_DEST%\lib%_EXT%\lib*.*
 
-..\freetype\freetype-2.0.2\include\ft2build.h %_DEST%\inc%_EXT%\external\ft2build.h
-..\freetype\freetype-2.0.2\include\freetype\* %_DEST%\inc%_EXT%\external\freetype\*
-..\freetype\freetype-2.0.2\include\freetype\config\* %_DEST%\inc%_EXT%\external\freetype\config\*
-..\freetype\freetype-2.0.2\include\freetype\internal\* %_DEST%\inc%_EXT%\external\freetype\internal\*
+..\%__SRC%\lib\libgcc_s.so.1 %_DEST%\lib%_EXT%\libgcc_s.so.1
+..\%__SRC%\lib\libstdc++.so.6 %_DEST%\lib%_EXT%\libstdc++.so.6
 
 ..\dbghelp\dbghelp.dll %_DEST%\bin%_EXT%\dbghelp.dll
 
@@ -89,10 +39,11 @@ mkdir: %_DEST%\pck%_EXT%
 ..\msi\instmsia.exe %_DEST%\bin%_EXT%\instmsia.exe
 ..\msi\instmsiw.exe %_DEST%\bin%_EXT%\instmsiw.exe
 
-..\X11\extensions\*.h %_DEST%\inc%_EXT%\X11\extensions\*.h
-
 ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
 ..\%__SRC%\misc\*staticdatamembers.cxx %_DEST%\inc%_EXT%\*staticdatamembers.cxx
 ..\%__SRC%\misc\*staticdatamembers.h* %_DEST%\inc%_EXT%\*staticdatamembers.h*
 
 dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
+
+linklib: libgcc_s.*.*
+