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 | 91e34e4ccc6c61d0b64d250817af7f0d2263b89e (patch) | |
tree | 40aada24b74a727c59941b29a8a12c3ea06f0b4f /tools/prj/d.lst | |
parent | CWS gnumake: resync to m91; conflicts unresolved (diff) | |
download | core-91e34e4ccc6c61d0b64d250817af7f0d2263b89e.tar.gz core-91e34e4ccc6c61d0b64d250817af7f0d2263b89e.zip |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'tools/prj/d.lst')
-rw-r--r-- | tools/prj/d.lst | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/tools/prj/d.lst b/tools/prj/d.lst index a8e08784f199..1c0b5271071d 100644 --- a/tools/prj/d.lst +++ b/tools/prj/d.lst @@ -8,107 +8,8 @@ mkdir: %_DEST%\inc%_EXT%\tools ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT%\lib*.so.* ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib -<<<<<<< local ..\inc\tools\*.h %_DEST%\inc%_EXT%\tools\*.h ..\inc\tools\*.hxx %_DEST%\inc%_EXT%\tools\*.hxx -======= -..\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\svlibrary.hxx %_DEST%\inc%_EXT%\tools\svlibrary.hxx -..\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\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 ->>>>>>> other ..\%__SRC%\bin\rscdep.exe %_DEST%\bin%_EXT%\rscdep.exe ..\%__SRC%\bin\rscdep %_DEST%\bin%_EXT%\rscdep |