changed function names

make.scm

@@ -72,28 +72,28 @@
 			       (submatch (: ,right eos)))))))
     target-rx))
 
-(define (file-rx->rc target prereqs thunk)
+(define (file-rx target prereqs thunk)
   (rx->func string=? target prereqs file thunk))
 
-(define (once-rx->rc target prereqs thunk)
+(define (once-rx target prereqs thunk)
   (rx->func string=? target prereqs once thunk))
 
-(define (all-rx->rc target prereqs thunk)
+(define (all-rx target prereqs thunk)
   (rx->func string=? target prereqs all thunk))
 
-(define (always-rx->rc target prereqs thunk)
+(define (always-rx target prereqs thunk)
   (rx->func string=? target prereqs always thunk))
 
-(define (perms-rx->rc target prereqs thunk)
+(define (perms-rx target prereqs thunk)
   (rx->func string=? target prereqs perms thunk))
 
-(define (md5-rx->rc target prereqs thunk)
+(define (md5-rx target prereqs thunk)
   (rx->func string=? target prereqs md5 thunk))
 
-(define (md5-perms-rx->rc target prereqs thunk)
+(define (md5-perms-rx target prereqs thunk)
   (rx->func string=? target prereqs md5-perms thunk))
 
-(define (paranoid-rx->rc target prereqs thunk)
+(define (paranoid-rx target prereqs thunk)
   (rx->func string=? target prereqs paranoid thunk))
 
 (define (rx->func pred target-rx prereqs out-of-date?-func thunk)
@@ -101,28 +101,28 @@
     (common->func maybe-target target-rx pred
 		  out-of-date?-func target-rx prereqs thunk)))
 
-(define (file-%->rc target prereqs thunk)
+(define (file-% target prereqs thunk)
   (%->func string=? target prereqs file thunk))
 
-(define (once-%->rc target prereqs thunk)
+(define (once-% target prereqs thunk)
   (%->func string=? target prereqs once thunk))
 
-(define (all-%->rc target prereqs thunk)
+(define (all-% target prereqs thunk)
   (%->func string=? target prereqs all thunk))
 
-(define (always-%->rc target prereqs thunk)
+(define (always-% target prereqs thunk)
   (%->func string=? target prereqs always thunk))
 
-(define (perms-%->rc target prereqs thunk)
+(define (perms-% target prereqs thunk)
   (%->func string=? target prereqs perms thunk))
 
-(define (md5-%->rc target prereqs thunk)
+(define (md5-% target prereqs thunk)
   (%->func string=? target prereqs md5 thunk))
 
-(define (md5-perms-%->rc target prereqs thunk)
+(define (md5-perms-% target prereqs thunk)
   (%->func string=? target prereqs md5-perms thunk))
 
-(define (paranoid-%->rc target prereqs thunk)
+(define (paranoid-% target prereqs thunk)
   (%->func string=? target prereqs paranoid thunk))
 
 (define (%->func pred target-pattern prereqs out-of-date?-func thunk)

packages.scm

@@ -339,22 +339,22 @@
 	  paranoid->rc
 	  %-pattern->match
 	  %-pattern->rx
-	  file-rx->rc
+	  file-rx
-	  once-rx->rc
+	  once-rx
-	  all-rx->rc
+	  all-rx
-	  always-rx->rc
+	  always-rx
-	  perms-rx->rc
+	  perms-rx
-	  md5-rx->rc
+	  md5-rx
-	  md5-perms-rx->rc
+	  md5-perms-rx
-	  paranoid-rx->rc
+	  paranoid-rx
-	  file-%->rc
+	  file-%
-	  once-%->rc
+	  once-%
-	  all-%->rc
+	  all-%
-	  always-%->rc
+	  always-%
-	  perms-%->rc
+	  perms-%
-	  md5-%->rc
+	  md5-%
-	  md5-perms-%->rc
+	  md5-perms-%
-	  paranoid-%->rc
+	  paranoid-%
 	  %->func
 	  rx->func
 	  common->func))