X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpkgconfiggenerator.cpp;h=e9320448b3508a201676eb783ddf2b8d73b87cd2;hb=7c2db9e2b91da953701be233336c5bfa1f3c4af0;hp=bd807d4581ba3e173367f8b040c63d30b4cc608b;hpb=64d69068586a764b8a8ee35b0efd98cd5a5bbf32;p=builder.git

diff --git a/source/pkgconfiggenerator.cpp b/source/pkgconfiggenerator.cpp
index bd807d4..e932044 100644
--- a/source/pkgconfiggenerator.cpp
+++ b/source/pkgconfiggenerator.cpp
@@ -13,7 +13,7 @@ PkgConfigGenerator::PkgConfigGenerator(Builder &b):
 {
 }
 
-Target *PkgConfigGenerator::create_target(const list<Target *> &, const string &) const
+Target *PkgConfigGenerator::create_target(const list<Target *> &, const string &)
 {
 	throw logic_error("Not implemented");
 }
@@ -39,35 +39,34 @@ void PkgConfigGenerator::Worker::main()
 	IO::print(out, "prefix=%s\n", builder.get_prefix().str());
 	IO::print(out, "source=%s\n\n", spkg.get_source_directory());
 
-	IO::print(out, "Name: %s\n", spkg.get_name());
+	IO::print(out, "Name: %s\n", spkg.get_label());
 	IO::print(out, "Description: %s\n", spkg.get_description());
 	IO::print(out, "Version: %s\n", spkg.get_version());
 
 	IO::print(out, "Requires:");
-	const PackageList &reqs = spkg.get_required_packages();
-	for(PackageList::const_iterator i=reqs.begin(); i!=reqs.end(); ++i)
-		if((*i)->get_use_pkgconfig())
-			IO::print(out, " %s", (*i)->get_name());
+	for(const Package *r: spkg.get_required_packages())
+		if(r->uses_pkgconfig())
+			IO::print(out, " %s", r->get_name());
 	out.put('\n');
 
 	const BuildInfo &binfo = spkg.get_exported_build_info();
 	IO::print(out, "Libs:");
-	for(BuildInfo::PathList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
-		IO::print(out, " -L%s", prefixify(*i, builder.get_prefix()));
-	for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
-		IO::print(out, " -l%s", *i);
+	for(const FS::Path &p: binfo.libpath)
+		IO::print(out, " -L%s", prefixify(p, builder.get_prefix()));
+	for(const string &l: binfo.libs)
+		IO::print(out, " -l%s", l);
 	if(binfo.threads)
 		out.write("-pthread");
 	out.put('\n');
 
 	IO::print(out, "Cflags:");
-	for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
-		IO::print(out, " -I%s", prefixify(*i, builder.get_prefix()));
-	for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
-		if(i->second.empty())
-			IO::print(out, " -D%s", i->first);
+	for(const FS::Path &p: binfo.incpath)
+		IO::print(out, " -I%s", prefixify(p, builder.get_prefix()));
+	for(const auto &kvp: binfo.defines)
+		if(kvp.second.empty())
+			IO::print(out, " -D%s", kvp.first);
 		else
-			IO::print(out, " -D%s=%s", i->first, i->second);
+			IO::print(out, " -D%s=%s", kvp.first, kvp.second);
 	out.put('\n');
 
 	status = Task::SUCCESS;