diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 11:57:43 +0200 |
commit | fd0649408ac52ec0c6a443c5716d50c9243bca7e (patch) | |
tree | 5c5472ebd37157ec38bef497ddad7c8fa4acfbba /jvmfwk/prj/d.lst | |
parent | ea3da31396ff5a1d88efdbd6e53f2c1b1794ccb0 (diff) | |
parent | 1247c8b2350734c4f16bbc15404c3c7d56bf8523 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
xmlreader/prj/d.lst
Diffstat (limited to 'jvmfwk/prj/d.lst')
-rw-r--r-- | jvmfwk/prj/d.lst | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst index 770523841..779ede709 100644 --- a/jvmfwk/prj/d.lst +++ b/jvmfwk/prj/d.lst @@ -1,22 +1,22 @@ -mkdir: %_DEST%\inc%_EXT%\jvmfwk -..\inc\jvmfwk\framework.h %_DEST%\inc%_EXT%\jvmfwk\framework.h -..\inc\jvmfwk\vendorplugin.h %_DEST%\inc%_EXT%\jvmfwk\vendorplugin.h -..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib%_EXT%\ijvmfwk.lib -..\%__SRC%\lib\libjvmfwk.*.* %_DEST%\lib%_EXT%\* -..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin%_EXT%\* -..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib%_EXT%\* -..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib%_EXT%\* -..\%__SRC%\class\JREProperties.class %_DEST%\bin%_EXT%\JREProperties.class -..\%__SRC%\class\JREProperties.class %_DEST%\lib%_EXT%\JREProperties.class -..\%__SRC%\bin\javaldx %_DEST%\bin%_EXT%\javaldx -..\source\javasettingsunopkginstall.xml %_DEST%\bin%_EXT%\javasettingsunopkginstall.xml -..\%__SRC%\bin\javavendors.xml %_DEST%\bin%_EXT%\javavendors.xml -..\%__SRC%\bin\javavendors.xml %_DEST%\lib%_EXT%\javavendors.xml -..\%__SRC%\bin\jvmfwk3rc %_DEST%\lib%_EXT%\jvmfwk3rc -..\%__SRC%\bin\jvmfwk3.ini %_DEST%\bin%_EXT%\jvmfwk3.ini -..\%__SRC%\bin\sunjavapluginrc %_DEST%\lib%_EXT%\sunjavapluginrc -..\%__SRC%\bin\sunjavaplugin.ini %_DEST%\bin%_EXT%\sunjavaplugin.ini +mkdir: %_DEST%\inc\jvmfwk +..\inc\jvmfwk\framework.h %_DEST%\inc\jvmfwk\framework.h +..\inc\jvmfwk\vendorplugin.h %_DEST%\inc\jvmfwk\vendorplugin.h +..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib\ijvmfwk.lib +..\%__SRC%\lib\libjvmfwk.*.* %_DEST%\lib\* +..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin\* +..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin\* +..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib\* +..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib\* +..\%__SRC%\class\JREProperties.class %_DEST%\bin\JREProperties.class +..\%__SRC%\class\JREProperties.class %_DEST%\lib\JREProperties.class +..\%__SRC%\bin\javaldx %_DEST%\bin\javaldx +..\source\javasettingsunopkginstall.xml %_DEST%\bin\javasettingsunopkginstall.xml +..\%__SRC%\bin\javavendors.xml %_DEST%\bin\javavendors.xml +..\%__SRC%\bin\javavendors.xml %_DEST%\lib\javavendors.xml +..\%__SRC%\bin\jvmfwk3rc %_DEST%\lib\jvmfwk3rc +..\%__SRC%\bin\jvmfwk3.ini %_DEST%\bin\jvmfwk3.ini +..\%__SRC%\bin\sunjavapluginrc %_DEST%\lib\sunjavapluginrc +..\%__SRC%\bin\sunjavaplugin.ini %_DEST%\bin\sunjavaplugin.ini linklib: libjvmfwk.*.* linklib: libjvmfwk*.dylib.*.*.* |