X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finstall.cpp;h=2b2a5c94f0bae872039104bbfb638cfa4de2b6f2;hb=05a2b9dabd01414e9e9a91f9d69babaca4ccb32d;hp=893f021387cbb81e346fb47e8418f8402ee58c49;hpb=04c316da6d5d90e43cba262f54d90ca231f703bf;p=builder.git diff --git a/source/install.cpp b/source/install.cpp index 893f021..2b2a5c9 100644 --- a/source/install.cpp +++ b/source/install.cpp @@ -1,7 +1,7 @@ /* $Id$ This file is part of builder -Copyright © 2006-2009 Mikko Rasa, Mikkosoft Productions +Copyright © 2006-2010 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ @@ -28,14 +28,19 @@ Install::Install(Builder &b, const SourcePackage &p, FileTarget &s, const std::s add_depend(&source); } +Target *Install::get_real_target() +{ + return source.get_real_target(); +} + void Install::check_rebuild() { if(!mtime) mark_rebuild("Does not exist"); else if(source.get_mtime()>mtime || source.get_size()!=size) - mark_rebuild(FS::basename(source.get_name())+" has changed"); + mark_rebuild(source.get_name()+" has changed"); else if(source.get_rebuild()) - mark_rebuild(FS::basename(source.get_name())+" needs rebuilding"); + mark_rebuild(source.get_name()+" needs rebuilding"); } Action *Install::create_action() @@ -66,7 +71,10 @@ FS::Path Install::generate_target_path(const FileTarget &tgt, const std::string { const Component &comp = shlib->get_component(); if(comp.get_type()==Component::LIBRARY) + { mid = "lib"; + tgtname = shlib->get_soname(); + } else if(comp.get_type()==Component::MODULE) mid = "lib/"+tgt.get_package()->get_name(); }