Rearrange Target members

[builder.git] / source / pkgconfiggenerator.cpp

diff --git a/source/pkgconfiggenerator.cpp b/source/pkgconfiggenerator.cpp
index b18402a6d28001c671d46e59a4ff547c57c4805e..141b363cda3d348692d93887cf335a84e9873d93 100644 (file)
--- a/source/pkgconfiggenerator.cpp
+++ b/source/pkgconfiggenerator.cpp
@@ -2,7 +2,7 @@
 #include <msp/io/file.h>
 #include <msp/io/print.h>
 #include "builder.h"
-#include "pkgconfig.h"
+#include "pkgconfigfile.h"
 #include "pkgconfiggenerator.h"
 
 using namespace std;
@@ -20,20 +20,20 @@ Target *PkgConfigGenerator::create_target(const list<Target *> &, const string &
 
 Task *PkgConfigGenerator::run(const Target &target) const
 {
-       const PkgConfig &pkgc = dynamic_cast<const PkgConfig &>(target);
+       const PkgConfigFile &pkgc = dynamic_cast<const PkgConfigFile &>(target);
        Worker *worker = new Worker(pkgc);
        return new InternalTask(worker);
 }
 
 
-PkgConfigGenerator::Worker::Worker(const PkgConfig &t):
+PkgConfigGenerator::Worker::Worker(const PkgConfigFile &t):
        target(t)
 { }
 
 void PkgConfigGenerator::Worker::main()
 {
        Builder &builder = target.get_package()->get_builder();
-       const SourcePackage &spkg = dynamic_cast<const SourcePackage &>(*target.get_package());
+       const SourcePackage &spkg = *target.get_package();
 
        IO::BufferedFile out(target.get_path().str(), IO::M_WRITE);
        IO::print(out, "prefix=%s\n", builder.get_prefix().str());
@@ -52,16 +52,16 @@ void PkgConfigGenerator::Worker::main()
 
        const BuildInfo &binfo = spkg.get_exported_binfo();
        IO::print(out, "Libs:");
-       for(StringList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
+       for(BuildInfo::PathList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
                IO::print(out, " -L%s", FS::relative(*i, builder.get_prefix()).str());
-       for(StringList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
+       for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
                IO::print(out, " -l%s", *i);
        if(binfo.threads)
                out.write("-pthread");
        out.put('\n');
 
        IO::print(out, "Cflags:");
-       for(StringList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
+       for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
                IO::print(out, " -I%s", FS::relative(*i, builder.get_prefix()).str());
        for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
                if(i->second.empty())
@@ -69,4 +69,6 @@ void PkgConfigGenerator::Worker::main()
                else
                        IO::print(out, " -D%s=%s", i->first, i->second);
        out.put('\n');
+
+       status = Task::SUCCESS;
 }