diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:03:35 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:03:35 +0200 |
| commit | 31daa1bd60b3d2118393752cbc1a1d44d9a802f7 (patch) | |
| tree | 562a19ceda25e5f0c7412acd089081933f9d7ba0 /berkeleydb/prj | |
| parent | e512adbb0a83012da7ca76c7725c2c532f31b0e7 (diff) | |
| parent | 1d84afcf346e374980259718e26f48622b76aa5d (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
cairo/cairo-1.8.0.patch
cairo/prj/build.lst
gdk-pixbuf/makefile.mk
libcroco/makefile.mk
Diffstat (limited to 'berkeleydb/prj')
| -rw-r--r-- | berkeleydb/prj/build.lst | 2 | ||||
| -rw-r--r-- | berkeleydb/prj/d.lst | 19 |
2 files changed, 9 insertions, 12 deletions
diff --git a/berkeleydb/prj/build.lst b/berkeleydb/prj/build.lst index c74e15efd2fd..55a7bf1a70a6 100644 --- a/berkeleydb/prj/build.lst +++ b/berkeleydb/prj/build.lst @@ -1,3 +1,3 @@ -db berkeleydb : external stlport NULL +db berkeleydb : external NULL db berkeleydb nmake - u as_mkout NULL db berkeleydb nmake - w,vc7 as_mkout NULL diff --git a/berkeleydb/prj/d.lst b/berkeleydb/prj/d.lst index 78682f825e0b..1d50f617a1e6 100644 --- a/berkeleydb/prj/d.lst +++ b/berkeleydb/prj/d.lst @@ -1,15 +1,12 @@ -mkdir: %_DEST%\inc%_EXT%\berkeleydb +mkdir: %_DEST%\inc\berkeleydb -..\%__SRC%\inc\db.h %_DEST%\inc%_EXT%\berkeleydb\db.h +..\%__SRC%\inc\db.h %_DEST%\inc\berkeleydb\db.h -..\%__SRC%\lib\libdb47.lib %_DEST%\lib%_EXT%\libdb47.lib - -..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib%_EXT%\libdb-4.7.so - -..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib%_EXT%\libdb-4.7.dylib - -..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib%_EXT%\libdb-4.7.a - -..\%__SRC%\bin\libdb47.dll %_DEST%\bin%_EXT%\libdb47.dll +..\%__SRC%\lib\libdb47.lib %_DEST%\lib\libdb47.lib +..\%__SRC%\lib\libdb-4.7.a %_DEST%\lib\libdb-4.7.a +..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib\libdb-4.7.so +..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib\libdb-4.7.dylib +..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib\libdb-4.7.a +..\%__SRC%\bin\libdb47.dll %_DEST%\bin\libdb47.dll |