X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fexecutable.cpp;h=1f23990da93ca569af5476a7032a468d597549d4;hb=57bdb055acb0453c75b22cb64f35cc0e817a2827;hp=cd8ceaff2040dc006cf446bc0b7ef80f9a0cd10a;hpb=40eb101a642b9ed2e898eec39e0916fa71066b23;p=builder.git

diff --git a/source/executable.cpp b/source/executable.cpp
index cd8ceaf..1f23990 100644
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -26,12 +26,7 @@ Finds and adds any required libraries to the dependencies.
 */
 void Executable::find_depends()
 {
-	const string &staticlibs=package->get_config().get_option("staticlibs").value;
-	unsigned libmode=0;
-	if(staticlibs=="all")
-		libmode=2;
-	else if(staticlibs=="local")
-		libmode=1;
+	LibMode libmode=package->get_library_mode();
 	
 	//XXX Duplicate libraries?
 	list<const Component *> queue;
@@ -84,5 +79,5 @@ string Executable::generate_target_name(const Component &c)
 		suffix=".so";
 	}
 
-	return (c.get_package().get_source()/(prefix+c.get_name()+suffix)).str();
+	return (c.get_package().get_out_dir()/(prefix+c.get_name()+suffix)).str();
 }