From b78c3f4641924c5c3446fc5ff127abe0fa7025f6 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Sun, 26 Aug 2007 17:25:22 +0200 Subject: [PATCH] Updated build system for recent Esmart pkg-config changes. --- Rakefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Rakefile b/Rakefile index 4dd7571..cc2f2f7 100644 --- a/Rakefile +++ b/Rakefile @@ -25,8 +25,9 @@ module_tasks = modules.map { |mod| "ext_#{mod}".to_sym } task :default => module_tasks config = Rake::ConfigureTask.new do |t| - t.tests << Rake::ConfigureTask:: - PkgConfigTest.new("esmart", :is_critical => true) + modules[1..-1].each do |mod| + t.tests << Rake::ConfigureTask::PkgConfigTest.new(mod.to_s) + end end module_tasks.each do |mt| @@ -45,12 +46,14 @@ modules.each_with_index do |mod, i| end task :pre_ext => [:configure] do - exts.values.each do |e| - e.link_libs << config.esmart.libs + exts.each do |(key, e)| + next if key == :esmart + + e.link_libs << config[key.to_s].libs cflags = [ e.env[:cflags], - config.esmart.cflags + config[key.to_s].cflags ] e.env.update(:cflags => cflags) -- 2.30.2