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

diff --git a/source/pkgconfiggenerator.cpp b/source/pkgconfiggenerator.cpp
index bd807d4..949a4df 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,14 +39,14 @@ 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())
+	const Package::Requirements &reqs = spkg.get_required_packages();
+	for(Package::Requirements::const_iterator i=reqs.begin(); i!=reqs.end(); ++i)
+		if((*i)->uses_pkgconfig())
 			IO::print(out, " %s", (*i)->get_name());
 	out.put('\n');