Build shared libraries directly to a versioned name

[builder.git] / plugins / gnu / mingwdlltool.cpp

diff --git a/plugins/gnu/mingwdlltool.cpp b/plugins/gnu/mingwdlltool.cpp
index c5ffdf5939b9a1b01aeaf88b24a5efd867e055a4..f0128005c67cc12b985206105d69a1c1a391fa9d 100644 (file)
--- a/plugins/gnu/mingwdlltool.cpp
+++ b/plugins/gnu/mingwdlltool.cpp
@@ -37,7 +37,8 @@ Target *MingwDllTool::create_target(const vector<Target *> &sources, const strin
        ExportDefinitions *exp = new ExportDefinitions(builder, *shlib.get_component(), objs);
        exp->set_tool(*this);
 
-       ImportLibrary *imp = new ImportLibrary(builder, *shlib.get_component(), shlib, *exp);
+       ImportLibrary *imp = new ImportLibrary(builder, *shlib.get_component(), shlib);
+       imp->add_dependency(*exp);
        imp->set_tool(*this);
 
        return imp;
@@ -93,10 +94,7 @@ Task *MingwDllTool::_run(const Target &target)
                argv.push_back(relative(exp->get_path(), work_dir).str());
 
                argv.push_back("-D");
-               if(shlib.get_install_filename().empty())
-                       argv.push_back(FS::basename(shlib.get_path()));
-               else
-                       argv.push_back(shlib.get_install_filename());
+               argv.push_back(FS::basename(shlib.get_path()));
 
                argv.push_back("-l");
                argv.push_back(relative(imp->get_path(), work_dir).str());