diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
| commit | 92667c8edbaee9a252b1d5d221eb62849f76697c (patch) | |
| tree | 8f1d329f2259b7d5bff054bc14d0965637df6961 /avmedia/prj/d.lst | |
| parent | baecdfb578cb7bc992944857ad4d8882ef7e842c (diff) | |
| parent | 48b4a99ce2451f1ddf2e8e128bbfcd6683072999 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk
Diffstat (limited to 'avmedia/prj/d.lst')
| -rw-r--r-- | avmedia/prj/d.lst | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/avmedia/prj/d.lst b/avmedia/prj/d.lst index eb140ed45770..12fea5524801 100644 --- a/avmedia/prj/d.lst +++ b/avmedia/prj/d.lst @@ -1,23 +1,23 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %COMMON_DEST%\res%_EXT% +mkdir: %COMMON_DEST%\bin\hid +mkdir: %COMMON_DEST%\res -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\bin\avmedia*.dll %_DEST%\bin%_EXT%\avmedia*.dll -..\source\java\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar -..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* -..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib -..\%__SRC%\bin\avmedia*.res %_DEST%\bin%_EXT%\avmedia*.res +..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid +..\%__SRC%\bin\avmedia*.dll %_DEST%\bin\avmedia*.dll +..\source\java\avmedia.jar %_DEST%\bin\avmedia.jar +..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.* +..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib +..\%__SRC%\bin\avmedia*.res %_DEST%\bin\avmedia*.res -mkdir: %_DEST%\inc%_EXT%\avmedia +mkdir: %_DEST%\inc\avmedia -..\inc\avmedia\mediawindow.hxx %_DEST%\inc%_EXT%\avmedia\mediawindow.hxx -..\inc\avmedia\mediaitem.hxx %_DEST%\inc%_EXT%\avmedia\mediaitem.hxx -..\inc\avmedia\mediaplayer.hxx %_DEST%\inc%_EXT%\avmedia\mediaplayer.hxx -..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc%_EXT%\avmedia\mediatoolbox.hxx +..\inc\avmedia\mediawindow.hxx %_DEST%\inc\avmedia\mediawindow.hxx +..\inc\avmedia\mediaitem.hxx %_DEST%\inc\avmedia\mediaitem.hxx +..\inc\avmedia\mediaplayer.hxx %_DEST%\inc\avmedia\mediaplayer.hxx +..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc\avmedia\mediatoolbox.hxx -..\%__SRC%\class\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar -..\%__SRC%\misc\avmedia.component %_DEST%\xml%_EXT%\avmedia.component -..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml%_EXT%\avmedia.jar.component -..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml%_EXT%\avmediaQuickTime.component -..\%__SRC%\misc\avmediagst.component %_DEST%\xml%_EXT%\avmediagst.component -..\%__SRC%\misc\avmediawin.component %_DEST%\xml%_EXT%\avmediawin.component +..\%__SRC%\class\avmedia.jar %_DEST%\bin\avmedia.jar +..\%__SRC%\misc\avmedia.component %_DEST%\xml\avmedia.component +..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml\avmedia.jar.component +..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml\avmediaQuickTime.component +..\%__SRC%\misc\avmediagstreamer.component %_DEST%\xml\avmediagstreamer.component +..\%__SRC%\misc\avmediawin.component %_DEST%\xml\avmediawin.component |