Changeset 8fe5fa557a9b1dee97f6a4e2e8fa0cdeb3c37291

Timestamp:

11/26/08 12:24:27 (6 weeks ago)

Author:

David Balmain <dbalmain@…>

git-author:

Eduardo Habkost <ehabkost@raisama.net> / 2008-11-13T02:16:19Z-0200

Parents:

50fe43baa6294a0d49811e3361d79caa33ec2cdf

Children:

cf7cce6b4a6915f84afd4c8a3729e93b71fc0afe

git-committer:

David Balmain <dbalmain@gmail.com> / 2008-11-26T12:24:27Z+1100

Message:

Make t.prerequisites usage work on some Rakefile rules

Signed-off-by: Eduardo Habkost <ehabkost@…>

Files:

• c/Rakefile (modified) (4 diffs)

c/Rakefile

@@ -360 +360 @@
   file "libferret.a" => LIB_FERRET_OBJS do |t|
     qsh "Generating library: #{t.name}",
-        "#{AR} -cru #{t.name} #{t.prerequisites}"
+        "#{AR} -cru #{t.name} #{t.prerequisites.join(' ')}"
   end
 
   file "testall" => [TEST_OBJS, 'libferret.a'].flatten do |t|
     qsh "Building tests",
-        "#{CC} #{CFLAGS} #{LDFLAGS} #{t.prerequisites} -o testall"
+        "#{CC} #{CFLAGS} #{LDFLAGS} #{t.prerequisites.join(' ')} -o testall"
   end
 
@@ -377 +377 @@
   file "tokenize" => [LIB_FERRET_OBJS].flatten do |t|
     qsh "Building tokenize",
-        "#{CC} #{CFLAGS} #{LDFLAGS} #{t.prerequisites} -o #{t.name}"
+        "#{CC} #{CFLAGS} #{LDFLAGS} #{t.prerequisites.join(' ')} -o #{t.name}"
   end
 
   file "bench" => [BENCHMARK_OBJS, 'libferret.a'].flatten do |t|
     qsh "Building bench",
-        "#{CC} #{CFLAGS} #{LDFLAGS} #{t.prerequisites} -o #{t.name}"
+        "#{CC} #{CFLAGS} #{LDFLAGS} #{t.prerequisites.join(' ')} -o #{t.name}"
   end
 
@@ -436 +436 @@
 
   rule '.c' => '.y' do |t|
-    sh "yacc -o #{t.name} -p frt_ #{t.prerequisites}"
+    sh "yacc -o #{t.name} -p frt_ #{t.prerequisites.join(' ')}"
   end
 
   rule '.c' => '.rl' do |t|
-    sh "ragel #{t.prerequisites} -o #{t.name}"
+    sh "ragel #{t.prerequisites.join(' ')} -o #{t.name}"
   end
 
@@ -449 +449 @@
   file '.rake/HAVE_SPARSE_HASH' => '.rake/have_sparse_hash.cpp' do |t|
     begin
-      sh "g++ #{t.prerequisites}"
+      sh "g++ #{t.prerequisites.join(' ')}"
       File.open(t.name, 'w') {|f| f.write(' -DHAVE_SPARSE_HASH')}
     rescue