Use mspio for all I/O operations

[builder.git] / source / sourcepackage.cpp

diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp
index 4edb70280917fa0f5fda438df9685bdfc5dfe613..3f38acf39c1eba37024d751ef840543195d2ee1d 100644 (file)
--- a/source/sourcepackage.cpp
+++ b/source/sourcepackage.cpp
@@ -5,7 +5,7 @@ Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <iostream>
+#include <msp/io/print.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
 #include "binarypackage.h"
@@ -43,17 +43,15 @@ unsigned SourcePackage::get_install_flags()
 {
        unsigned flags=0;
        for(ComponentList::iterator i=components.begin(); i!=components.end(); ++i)
-       {
                if(i->get_install())
                {
                        if(i->get_type()==Component::PROGRAM)
                                flags|=BIN;
                        else if(i->get_type()==Component::LIBRARY || i->get_type()==Component::MODULE)
                                flags|=LIB;
+                       else if(i->get_type()==Component::HEADERS)
+                               flags|=INCLUDE;
                }
-               if(!i->get_install_headers().empty())
-                       flags|=INCLUDE;
-       }
 
        return flags;
 }
@@ -84,7 +82,7 @@ void SourcePackage::do_configure(const StringMap &opts, unsigned flag)
        if(flag && config.update(opts))
        {
                if(builder.get_verbose()>=2)
-                       cout<<"Configuration of "<<name<<" changed\n";
+                       IO::print("Configuration of %s changed\n", name);
                if(!builder.get_dry_run())
                        config.save();
        }