[commit: nofib] master: Refactor fasta Makefile (6f07f40)

[Johan Tibell]

Repository : ssh://darcs.haskell.org//srv/darcs/nofib

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6f07f40ff309712f6f5e9c34ede20775def9f7c5

>---------------------------------------------------------------

commit 6f07f40ff309712f6f5e9c34ede20775def9f7c5
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Wed Feb 6 10:46:40 2013 -0800

    Refactor fasta Makefile

>---------------------------------------------------------------

 shootout/fasta/Makefile |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/shootout/fasta/Makefile b/shootout/fasta/Makefile
index c94eec8..46bf47f 100644
--- a/shootout/fasta/Makefile
+++ b/shootout/fasta/Makefile
@@ -16,9 +16,6 @@ HC_OPTS += -O2 -XBangPatterns -XOverloadedStrings -package bytestring
 #------------------------------------------------------------------
 # Create output to validate against
 
-# FIXME: You have to run make twice for the runstdtest.prl script to
-# find the various stdout files correctly.
-
 fasta-c : fasta-c.o
 	gcc $< -o $@
 
@@ -31,21 +28,21 @@ fasta.stdout : fasta-c
 fasta.slowstdout : fasta-c
 	./fasta-c $(SLOW_OPTS) > $@
 
-STDOUT_FILES = fasta.faststdout fasta.stdout fasta.slowstdout
-
 # Since the stdout files are created during the run the runstdtest
 # script doesn't correctly pick them up, so we have to specify them
 # explicitly here.
 ifeq "$(mode)" "slow"
- SRC_RUNTEST_OPTS += -o1 fasta.slowstdout
+ STDOUT_FILE = fasta.slowstdout
 else
  ifeq "$(mode)" "fast"
-  SRC_RUNTEST_OPTS += -o1 fasta.faststdout
+  STDOUT_FILE = fasta.faststdout
  else
-  SRC_RUNTEST_OPTS += -o1 fasta.stdout
+  STDOUT_FILE = fasta.stdout
  endif
 endif
 
-all boot :: $(STDOUT_FILES)
+SRC_RUNTEST_OPTS += -o1 $(STDOUT_FILE)
+
+all boot :: $(STDOUT_FILE)
 
 include $(TOP)/mk/target.mk