Support building modular programs

[builder.git] / source / executable.cpp

diff --git a/source/executable.cpp b/source/executable.cpp
index 1f23990da93ca569af5476a7032a468d597549d4..a5a944ed18e7131e856b7af5fbc3d13238fd4c67 100644 (file)
--- a/source/executable.cpp
+++ b/source/executable.cpp
@@ -28,8 +28,8 @@ void Executable::find_depends()
 {
        LibMode libmode=package->get_library_mode();
        
-       //XXX Duplicate libraries?
        list<const Component *> queue;
+       list<Target *> dep_libs;
        queue.push_back(&comp);
        while(!queue.empty())
        {
@@ -44,7 +44,8 @@ void Executable::find_depends()
                        {
                                if(contains(depends, lib))
                                        continue;
-                               add_depend(lib);
+
+                               dep_libs.push_front(lib);
 
                                if(dynamic_cast<Install *>(lib))
                                        lib=lib->get_depends().front();
@@ -57,6 +58,9 @@ void Executable::find_depends()
                }
        }
 
+       for(list<Target *>::iterator i=dep_libs.begin(); i!=dep_libs.end(); ++i)
+               add_depend(*i);
+
        deps_ready=true;
 }
 
@@ -78,6 +82,8 @@ string Executable::generate_target_name(const Component &c)
                prefix="lib";
                suffix=".so";
        }
+       else if(c.get_type()==Component::MODULE)
+               suffix=".m";
 
        return (c.get_package().get_out_dir()/(prefix+c.get_name()+suffix)).str();
 }