diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:54:22 +0200 |
| commit | e2682561337c521f10fa2c87594c86c01b3c662a (patch) | |
| tree | a8cb220cf9888183c2de5edd3644597c63b67b9a /automation/prj/d.lst | |
| parent | 68f53efa2572acc661c8a75ee2ec09f87348aa65 (diff) | |
| parent | f9c2beb2cdb4ae448d22ae390c63159b88df9e9e (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
setup_native/prj/build.lst
setup_native/prj/d.lst
wizards/Jar_query.mk
wizards/Module_wizards.mk
wizards/Zip_launcher.mk
wizards/com/sun/star/wizards/report/makefile.mk
wizards/prj/build.lst
wizards/prj/d.lst
wizards/util/target.pmk
Diffstat (limited to 'automation/prj/d.lst')
| -rw-r--r-- | automation/prj/d.lst | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/automation/prj/d.lst b/automation/prj/d.lst index c83a2284e34b..69f82e4ad6ce 100644 --- a/automation/prj/d.lst +++ b/automation/prj/d.lst @@ -1,27 +1,27 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %_DEST%\inc%_EXT%\automation +mkdir: %COMMON_DEST%\bin\hid +mkdir: %_DEST%\inc\automation -#..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\util\manually_added_ids.hid %COMMON_DEST%\bin%_EXT%\hid\manually_added_ids.hid -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\lib\lib* %_DEST%\lib%_EXT%\* -..\%__SRC%\lib\ists.lib %_DEST%\lib%_EXT%\ists.lib -..\%__SRC%\lib\isimplecm.lib %_DEST%\lib%_EXT%\isimplecm.lib -..\%__SRC%\lib\icommuni.lib %_DEST%\lib%_EXT%\icommuni.lib +#..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid +..\util\manually_added_ids.hid %COMMON_DEST%\bin\hid\manually_added_ids.hid +..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll +..\%__SRC%\lib\lib* %_DEST%\lib\* +..\%__SRC%\lib\ists.lib %_DEST%\lib\ists.lib +..\%__SRC%\lib\isimplecm.lib %_DEST%\lib\isimplecm.lib +..\%__SRC%\lib\icommuni.lib %_DEST%\lib\icommuni.lib -..\inc\automation\automation.hxx %_DEST%\inc%_EXT%\automation\automation.hxx -..\inc\automation\commdefines.hxx %_DEST%\inc%_EXT%\automation\commdefines.hxx -..\inc\automation\commtypes.hxx %_DEST%\inc%_EXT%\automation\commtypes.hxx -..\inc\automation\communi.hxx %_DEST%\inc%_EXT%\automation\communi.hxx -..\inc\automation\simplecm.hxx %_DEST%\inc%_EXT%\automation\simplecm.hxx +..\inc\automation\automation.hxx %_DEST%\inc\automation\automation.hxx +..\inc\automation\commdefines.hxx %_DEST%\inc\automation\commdefines.hxx +..\inc\automation\commtypes.hxx %_DEST%\inc\automation\commtypes.hxx +..\inc\automation\communi.hxx %_DEST%\inc\automation\communi.hxx +..\inc\automation\simplecm.hxx %_DEST%\inc\automation\simplecm.hxx -..\%__SRC%\bin\testtool.exe %_DEST%\bin%_EXT%\testtool.bin -..\%__SRC%\bin\testtool %_DEST%\bin%_EXT%\testtool.bin -..\%__SRC%\inc\classes %_DEST%\bin%_EXT%\classes -..\%__SRC%\inc\keycodes %_DEST%\bin%_EXT%\keycodes -..\%__SRC%\inc\res_type %_DEST%\bin%_EXT%\res_type +..\%__SRC%\bin\testtool.exe %_DEST%\bin\testtool.bin +..\%__SRC%\bin\testtool %_DEST%\bin\testtool.bin +..\%__SRC%\inc\classes %_DEST%\bin\classes +..\%__SRC%\inc\keycodes %_DEST%\bin\keycodes +..\%__SRC%\inc\res_type %_DEST%\bin\res_type -..\%COMMON_OUTDIR%\bin\images_tt.zip %COMMON_DEST%\bin%_EXT%\images_tt.zip +..\%COMMON_OUTDIR%\bin\images_tt.zip %COMMON_DEST%\bin\images_tt.zip -..\%__SRC%\bin\testtoolrc %_DEST%\lib%_EXT%\testtoolrc -..\%__SRC%\bin\testtool.ini %_DEST%\bin%_EXT%\testtool.ini +..\%__SRC%\bin\testtoolrc %_DEST%\lib\testtoolrc +..\%__SRC%\bin\testtool.ini %_DEST%\bin\testtool.ini |