diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-15 07:38:44 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-15 07:38:44 +0000 |
| commit | bab50be6e325b798e8a9c9cac364e439f8b8fc8c (patch) | |
| tree | 6019b75bdf50701db13ef82f5f9070563d0372e0 /sca-cpp | |
| parent | da521c2a4e5904efcec4c702d4c90e18e0e8745d (diff) | |
Minor build fixes. Link against tinycdb shared library instead of static lib to fix 'relocation R_X86_64_PC32 against undefined symbol' error on 64-bit. Remove deleted scripts from ubuntu/Makefile.am.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035165 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp')
| -rw-r--r-- | sca-cpp/trunk/ubuntu/Makefile.am | 2 | ||||
| -rwxr-xr-x | sca-cpp/trunk/ubuntu/ubuntu-install-all | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sca-cpp/trunk/ubuntu/Makefile.am b/sca-cpp/trunk/ubuntu/Makefile.am index 640f464bec..21e045d4b5 100644 --- a/sca-cpp/trunk/ubuntu/Makefile.am +++ b/sca-cpp/trunk/ubuntu/Makefile.am @@ -18,5 +18,5 @@ dist_ubuntu_SCRIPTS = ip-redirect ip-redirect-all uec2-conf uec2-setenv uec2-ssh uec2-start uec2-status uec2-stop ubuntudir=$(prefix)/ubuntu -dist_noinst_SCRIPTS = ubuntu-bin-image ubuntu-bin-all-image ubuntu-dev-image ubuntu-dev-all-image ubuntu-gcc-4.5 ubuntu-install ubuntu-install-all uec2-bin-image uec2-bin-all-image uec2-dev-image uec2-dev-all-image +dist_noinst_SCRIPTS = ubuntu-bin-all-image ubuntu-dev-all-image ubuntu-install-all uec2-bin-all-image uec2-dev-all-image diff --git a/sca-cpp/trunk/ubuntu/ubuntu-install-all b/sca-cpp/trunk/ubuntu/ubuntu-install-all index dd730a6d03..a6b2ccf468 100755 --- a/sca-cpp/trunk/ubuntu/ubuntu-install-all +++ b/sca-cpp/trunk/ubuntu/ubuntu-install-all @@ -80,8 +80,8 @@ cd $build wget http://www.corpit.ru/mjt/tinycdb/tinycdb_0.77.tar.gz tar xzf tinycdb_0.77.tar.gz cd tinycdb-0.77 -make -make prefix=$build/tinycdb-0.77-bin install +make all shared +make prefix=$build/tinycdb-0.77-bin install-all install-sharedlib if [ "$?" != "0" ]; then exit $? fi |