Force shared linking on Android

[builder.git] / source / tar.cpp

diff --git a/source/tar.cpp b/source/tar.cpp
index 3bcf3cbc5fb1ebab8d83b3dd352af2c955518a15..bcaa85272c5a7e6c24c97249e65fa29162a6a426 100644 (file)
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -15,14 +15,16 @@ Tar::Tar(Builder &b):
        Tool(b, "TAR")
 { }
 
-Target *Tar::create_target(const list<Target *> &sources, const string &arg) const
+Target *Tar::create_target(const list<Target *> &sources, const string &arg)
 {
        if(!sources.front()->get_package())
                throw invalid_argument("Tar::create_target");
 
        TarBall *tarball = new TarBall(builder, *sources.front()->get_package(), arg);
        for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-               tarball->add_depend(*i);
+               tarball->add_dependency(**i);
+
+       tarball->set_tool(*this);
 
        return tarball;
 }
@@ -41,11 +43,11 @@ Tar::Worker::Worker(const TarBall &tb):
 
 void Tar::Worker::main()
 {
-       const FS::Path &pkg_src = tarball.get_package()->get_source();
+       const FS::Path &pkg_src = tarball.get_package()->get_source_directory();
        FS::Path basedir = FS::basepart(FS::basename(tarball.get_path()));
 
        IO::File out(tarball.get_path().str(), IO::M_WRITE);
-       const Target::Dependencies &deps = tarball.get_depends();
+       const Target::Dependencies &deps = tarball.get_dependencies();
        for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
        {
                FileTarget *ft = dynamic_cast<FileTarget *>(*i);