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

diff --git a/source/pkgconfiggenerator.cpp b/source/pkgconfiggenerator.cpp
index 811fa5d..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,21 +39,21 @@ 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');
 
 	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", FS::relative(*i, builder.get_prefix()).str());
+		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);
 	if(binfo.threads)
@@ -62,7 +62,7 @@ void PkgConfigGenerator::Worker::main()
 
 	IO::print(out, "Cflags:");
 	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());
+		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);
@@ -72,3 +72,14 @@ void PkgConfigGenerator::Worker::main()
 
 	status = Task::SUCCESS;
 }
+
+string PkgConfigGenerator::Worker::prefixify(const FS::Path &path, const FS::Path &prefix)
+{
+	if(FS::descendant_depth(path, prefix)>=0)
+	{
+		FS::Path rel_path = FS::relative(path, prefix);
+		return "${prefix}"+rel_path.str().substr(1);
+	}
+	else
+		return path.str();
+}