[project @ 1996-11-28 15:17:20 by dnt]
authordnt <unknown>
Thu, 28 Nov 1996 15:25:22 +0000 (15:25 +0000)
committerdnt <unknown>
Thu, 28 Nov 1996 15:25:22 +0000 (15:25 +0000)
Converted more Jmakefiles to Makefiles

256 files changed:
GHC_ONLY/Jmakefile [deleted file]
GHC_ONLY/Makefile [new file with mode: 0644]
GHC_ONLY/arith001/Jmakefile [deleted file]
GHC_ONLY/arith001/Makefile [new file with mode: 0644]
GHC_ONLY/arith002/Jmakefile [deleted file]
GHC_ONLY/arith002/Makefile [new file with mode: 0644]
GHC_ONLY/arith003/Jmakefile [deleted file]
GHC_ONLY/arith003/Makefile [new file with mode: 0644]
GHC_ONLY/arith004/Jmakefile [deleted file]
GHC_ONLY/arith004/Makefile [new file with mode: 0644]
GHC_ONLY/arith005/Jmakefile [deleted file]
GHC_ONLY/arith005/Main.hs
GHC_ONLY/arith005/Makefile [new file with mode: 0644]
GHC_ONLY/arith006/Jmakefile [deleted file]
GHC_ONLY/arith006/Makefile [new file with mode: 0644]
GHC_ONLY/arith007/Jmakefile [deleted file]
GHC_ONLY/arith007/Makefile [new file with mode: 0644]
GHC_ONLY/arith008/Jmakefile [deleted file]
GHC_ONLY/arith008/Makefile [new file with mode: 0644]
GHC_ONLY/arith009/Jmakefile [deleted file]
GHC_ONLY/arith009/Makefile [new file with mode: 0644]
GHC_ONLY/array001/Jmakefile [deleted file]
GHC_ONLY/array001/Makefile [new file with mode: 0644]
GHC_ONLY/array002/Jmakefile [deleted file]
GHC_ONLY/array002/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/10queens/Jmakefile [deleted file]
GHC_ONLY/bugs/10queens/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/Jmakefile [deleted file]
GHC_ONLY/bugs/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/andre_monad/Jmakefile [deleted file]
GHC_ONLY/bugs/andre_monad/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/andy_cherry/Jmakefile [deleted file]
GHC_ONLY/bugs/andy_cherry/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/areid_pass/Jmakefile [deleted file]
GHC_ONLY/bugs/areid_pass/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/cvh_unboxing/Jmakefile [deleted file]
GHC_ONLY/bugs/cvh_unboxing/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/dmgob_native1/Jmakefile [deleted file]
GHC_ONLY/bugs/dmgob_native1/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/dmgob_native2/Jmakefile [deleted file]
GHC_ONLY/bugs/dmgob_native2/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/fast2haskell/Jmakefile [deleted file]
GHC_ONLY/bugs/fast2haskell/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/fun_insts/Jmakefile [deleted file]
GHC_ONLY/bugs/fun_insts/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/hill_stk_oflow/Jmakefile [deleted file]
GHC_ONLY/bugs/hill_stk_oflow/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/ipoole_spec_class/Jmakefile [deleted file]
GHC_ONLY/bugs/ipoole_spec_class/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/jl_defaults/Jmakefile [deleted file]
GHC_ONLY/bugs/jl_defaults/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/jq_readsPrec/Jmakefile [deleted file]
GHC_ONLY/bugs/jq_readsPrec/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/jtod_circint/Jmakefile [deleted file]
GHC_ONLY/bugs/jtod_circint/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/jules_xref/Jmakefile [deleted file]
GHC_ONLY/bugs/jules_xref/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/jules_xref2/Jmakefile [deleted file]
GHC_ONLY/bugs/jules_xref2/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/lennart_array/Jmakefile [deleted file]
GHC_ONLY/bugs/lennart_array/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/lennart_range/Jmakefile [deleted file]
GHC_ONLY/bugs/lennart_range/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/lex/Jmakefile [deleted file]
GHC_ONLY/bugs/lex/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/life_space_leak/Jmakefile [deleted file]
GHC_ONLY/bugs/life_space_leak/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/north_array/Jmakefile [deleted file]
GHC_ONLY/bugs/north_array/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/north_lias/Makefile [moved from GHC_ONLY/bugs/north_lias/Jmakefile with 100% similarity]
GHC_ONLY/bugs/sanders_array/Jmakefile [deleted file]
GHC_ONLY/bugs/sanders_array/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/waugh_neural/Jmakefile [deleted file]
GHC_ONLY/bugs/waugh_neural/Makefile [new file with mode: 0644]
GHC_ONLY/bugs/zhang_ccall/Jmakefile [deleted file]
GHC_ONLY/bugs/zhang_ccall/Makefile [new file with mode: 0644]
GHC_ONLY/cg001/Jmakefile [deleted file]
GHC_ONLY/cg001/Makefile [new file with mode: 0644]
GHC_ONLY/cg002/Jmakefile [deleted file]
GHC_ONLY/cg002/Makefile [new file with mode: 0644]
GHC_ONLY/cg003/Jmakefile [deleted file]
GHC_ONLY/cg003/Makefile [new file with mode: 0644]
GHC_ONLY/cg004/Jmakefile [deleted file]
GHC_ONLY/cg004/Makefile [new file with mode: 0644]
GHC_ONLY/cg005/Jmakefile [deleted file]
GHC_ONLY/cg005/Makefile [new file with mode: 0644]
GHC_ONLY/cg006/Jmakefile [deleted file]
GHC_ONLY/cg006/Makefile [new file with mode: 0644]
GHC_ONLY/cg007/Jmakefile [deleted file]
GHC_ONLY/cg007/Makefile [new file with mode: 0644]
GHC_ONLY/cg008/Jmakefile [deleted file]
GHC_ONLY/cg008/Makefile [new file with mode: 0644]
GHC_ONLY/cg009/Jmakefile [deleted file]
GHC_ONLY/cg009/Makefile [new file with mode: 0644]
GHC_ONLY/cg010/Jmakefile [deleted file]
GHC_ONLY/cg010/Makefile [new file with mode: 0644]
GHC_ONLY/cg011/Jmakefile [deleted file]
GHC_ONLY/cg011/Makefile [new file with mode: 0644]
GHC_ONLY/cg012/Jmakefile [deleted file]
GHC_ONLY/cg012/Makefile [new file with mode: 0644]
GHC_ONLY/cg013/Jmakefile [deleted file]
GHC_ONLY/cg013/Makefile [new file with mode: 0644]
GHC_ONLY/cg014/Jmakefile [deleted file]
GHC_ONLY/cg014/Makefile [new file with mode: 0644]
GHC_ONLY/cg015/Jmakefile [deleted file]
GHC_ONLY/cg015/Makefile [new file with mode: 0644]
GHC_ONLY/cg016/Jmakefile [deleted file]
GHC_ONLY/cg016/Makefile [new file with mode: 0644]
GHC_ONLY/cg017/Jmakefile [deleted file]
GHC_ONLY/cg017/Makefile [new file with mode: 0644]
GHC_ONLY/cg018/Jmakefile [deleted file]
GHC_ONLY/cg018/Makefile [new file with mode: 0644]
GHC_ONLY/cg019/Jmakefile [deleted file]
GHC_ONLY/cg019/Makefile [new file with mode: 0644]
GHC_ONLY/cg020/Jmakefile [deleted file]
GHC_ONLY/cg020/Makefile [new file with mode: 0644]
GHC_ONLY/cg021/Jmakefile [deleted file]
GHC_ONLY/cg021/Makefile [new file with mode: 0644]
GHC_ONLY/cg022/Jmakefile [deleted file]
GHC_ONLY/cg022/Makefile [new file with mode: 0644]
GHC_ONLY/cg023/Jmakefile [deleted file]
GHC_ONLY/cg023/Main.lhs
GHC_ONLY/cg023/Makefile [new file with mode: 0644]
GHC_ONLY/cg024/Jmakefile [deleted file]
GHC_ONLY/cg024/Makefile [new file with mode: 0644]
GHC_ONLY/cg025/Jmakefile [deleted file]
GHC_ONLY/cg025/Makefile [new file with mode: 0644]
GHC_ONLY/cg026/Jmakefile [deleted file]
GHC_ONLY/cg026/Makefile [new file with mode: 0644]
GHC_ONLY/cg027/Jmakefile [deleted file]
GHC_ONLY/cg027/Makefile [new file with mode: 0644]
GHC_ONLY/cg028/Jmakefile [deleted file]
GHC_ONLY/cg028/Makefile [new file with mode: 0644]
GHC_ONLY/cg029/Jmakefile [deleted file]
GHC_ONLY/cg029/Makefile [new file with mode: 0644]
GHC_ONLY/cg030/Jmakefile [deleted file]
GHC_ONLY/cg030/Makefile [new file with mode: 0644]
GHC_ONLY/cg031/Jmakefile [deleted file]
GHC_ONLY/cg031/Makefile [new file with mode: 0644]
GHC_ONLY/cg032/Jmakefile [deleted file]
GHC_ONLY/cg032/Makefile [new file with mode: 0644]
GHC_ONLY/cg033/Jmakefile [deleted file]
GHC_ONLY/cg033/Makefile [new file with mode: 0644]
GHC_ONLY/cg034/Jmakefile [deleted file]
GHC_ONLY/cg034/Makefile [new file with mode: 0644]
GHC_ONLY/cg035/Jmakefile [deleted file]
GHC_ONLY/cg035/Makefile [new file with mode: 0644]
GHC_ONLY/cg036/Jmakefile [deleted file]
GHC_ONLY/cg036/Makefile [new file with mode: 0644]
GHC_ONLY/cg037/Jmakefile [deleted file]
GHC_ONLY/cg037/Main.hs
GHC_ONLY/cg037/Makefile [new file with mode: 0644]
GHC_ONLY/cg037/cg037.stdout
GHC_ONLY/cg038/Jmakefile [deleted file]
GHC_ONLY/cg038/Makefile [new file with mode: 0644]
GHC_ONLY/cg039/Jmakefile [deleted file]
GHC_ONLY/cg039/Main.hs
GHC_ONLY/cg039/Makefile [new file with mode: 0644]
GHC_ONLY/cg039/cg039.stdout
GHC_ONLY/cg040/Jmakefile [deleted file]
GHC_ONLY/cg040/Makefile [new file with mode: 0644]
GHC_ONLY/ghclib001/Jmakefile [deleted file]
GHC_ONLY/ghclib001/Makefile [new file with mode: 0644]
GHC_ONLY/io001/Jmakefile [deleted file]
GHC_ONLY/io001/Makefile [new file with mode: 0644]
GHC_ONLY/io002/Jmakefile [deleted file]
GHC_ONLY/io002/Makefile [new file with mode: 0644]
GHC_ONLY/io003/Jmakefile [deleted file]
GHC_ONLY/io003/Makefile [new file with mode: 0644]
GHC_ONLY/io004/Jmakefile [deleted file]
GHC_ONLY/io004/Makefile [new file with mode: 0644]
GHC_ONLY/io005/Jmakefile [deleted file]
GHC_ONLY/io005/Makefile [new file with mode: 0644]
GHC_ONLY/io006/Jmakefile [deleted file]
GHC_ONLY/io006/Makefile [new file with mode: 0644]
GHC_ONLY/io007/Jmakefile [deleted file]
GHC_ONLY/io007/Makefile [new file with mode: 0644]
GHC_ONLY/io008/Jmakefile [deleted file]
GHC_ONLY/io008/Makefile [new file with mode: 0644]
GHC_ONLY/io009/Jmakefile [deleted file]
GHC_ONLY/io009/Makefile [new file with mode: 0644]
GHC_ONLY/io010/Jmakefile [deleted file]
GHC_ONLY/io010/Makefile [new file with mode: 0644]
GHC_ONLY/io011/Jmakefile [deleted file]
GHC_ONLY/io011/Makefile [new file with mode: 0644]
GHC_ONLY/io012/Jmakefile [deleted file]
GHC_ONLY/io012/Makefile [new file with mode: 0644]
GHC_ONLY/io013/Jmakefile [deleted file]
GHC_ONLY/io013/Makefile [new file with mode: 0644]
GHC_ONLY/io014/Jmakefile [deleted file]
GHC_ONLY/io014/Makefile [new file with mode: 0644]
GHC_ONLY/io015/Jmakefile [deleted file]
GHC_ONLY/io015/Makefile [new file with mode: 0644]
GHC_ONLY/io016/Jmakefile [deleted file]
GHC_ONLY/io016/Makefile [new file with mode: 0644]
GHC_ONLY/io017/Jmakefile [deleted file]
GHC_ONLY/io017/Makefile [new file with mode: 0644]
GHC_ONLY/io018/Jmakefile [deleted file]
GHC_ONLY/io018/Makefile [new file with mode: 0644]
GHC_ONLY/io019/Jmakefile [deleted file]
GHC_ONLY/io019/Makefile [new file with mode: 0644]
GHC_ONLY/io020/Jmakefile [deleted file]
GHC_ONLY/io020/Makefile [new file with mode: 0644]
GHC_ONLY/io021/Jmakefile [deleted file]
GHC_ONLY/io021/Makefile [new file with mode: 0644]
GHC_ONLY/net001/Jmakefile [deleted file]
GHC_ONLY/net001/Makefile [new file with mode: 0644]
GHC_ONLY/net002/Jmakefile [deleted file]
GHC_ONLY/net002/Makefile [new file with mode: 0644]
GHC_ONLY/net003/Jmakefile [deleted file]
GHC_ONLY/net003/Makefile [new file with mode: 0644]
GHC_ONLY/net004/Jmakefile [deleted file]
GHC_ONLY/net004/Makefile [new file with mode: 0644]
GHC_ONLY/net005/Jmakefile [deleted file]
GHC_ONLY/net005/Makefile [new file with mode: 0644]
GHC_ONLY/net006/Jmakefile [deleted file]
GHC_ONLY/net006/Makefile [new file with mode: 0644]
GHC_ONLY/net007/Jmakefile [deleted file]
GHC_ONLY/net007/Makefile [new file with mode: 0644]
GHC_ONLY/net008/Jmakefile [deleted file]
GHC_ONLY/net008/Makefile [new file with mode: 0644]
GHC_ONLY/obfuscated93/Jmakefile [deleted file]
GHC_ONLY/obfuscated93/Makefile [new file with mode: 0644]
GHC_ONLY/obfuscated93/launchbury/Jmakefile [deleted file]
GHC_ONLY/obfuscated93/launchbury/Makefile [new file with mode: 0644]
GHC_ONLY/obfuscated93/rittri/Jmakefile [deleted file]
GHC_ONLY/obfuscated93/rittri/Makefile [new file with mode: 0644]
GHC_ONLY/po001/Jmakefile [deleted file]
GHC_ONLY/po001/Makefile [new file with mode: 0644]
GHC_ONLY/po002/Jmakefile [deleted file]
GHC_ONLY/po002/Makefile [new file with mode: 0644]
GHC_ONLY/po003/Jmakefile [deleted file]
GHC_ONLY/po003/Makefile [new file with mode: 0644]
GHC_ONLY/po004/Jmakefile [deleted file]
GHC_ONLY/po004/Makefile [new file with mode: 0644]
GHC_ONLY/po005/Jmakefile [deleted file]
GHC_ONLY/po005/Makefile [new file with mode: 0644]
GHC_ONLY/po006/Jmakefile [deleted file]
GHC_ONLY/po006/Makefile [new file with mode: 0644]
GHC_ONLY/po007/Jmakefile [deleted file]
GHC_ONLY/po007/Makefile [new file with mode: 0644]
GHC_ONLY/po008/Jmakefile [deleted file]
GHC_ONLY/po008/Makefile [new file with mode: 0644]
GHC_ONLY/po009/Jmakefile [deleted file]
GHC_ONLY/po009/Makefile [new file with mode: 0644]
GHC_ONLY/po010/Jmakefile [deleted file]
GHC_ONLY/po010/Makefile [new file with mode: 0644]
GHC_ONLY/po011/Jmakefile [deleted file]
GHC_ONLY/po011/Makefile [new file with mode: 0644]
GHC_ONLY/po012/Jmakefile [deleted file]
GHC_ONLY/po012/Makefile [new file with mode: 0644]
GHC_ONLY/specialise/Jmakefile [deleted file]
GHC_ONLY/specialise/Makefile [new file with mode: 0644]
GHC_ONLY/stable001/Jmakefile [deleted file]
GHC_ONLY/stable001/Makefile [new file with mode: 0644]
mk/nofib.mk

diff --git a/GHC_ONLY/Jmakefile b/GHC_ONLY/Jmakefile
deleted file mode 100644 (file)
index 0edcd7e..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-#define IHaveSubdirs
-
-SUBDIRS = arith001 \
-         arith002 \
-         arith003 \
-         arith004 \
-         arith005 \
-         arith006 \
-         arith007 \
-         arith008 \
-         array001 \
-         array002 \
-         bugs  \
-         cg001 \
-         cg002 \
-         cg003 \
-         cg004 \
-         cg005 \
-         cg006 \
-         cg007 \
-         cg008 \
-         cg009 \
-         cg010 \
-         cg011 \
-         cg012 \
-         cg013 \
-         cg014 \
-         cg015 \
-         cg016 \
-         cg017 \
-         cg018 \
-         cg019 \
-         cg020 \
-         cg021 \
-         cg022 \
-         cg024 \
-         cg025 \
-         cg026 \
-         cg028 \
-         cg029 \
-         cg030 \
-         cg031 \
-         cg032 \
-         cg033 \
-         cg034 \
-         cg035 \
-         cg036 \
-         cg037 \
-         ghclib001 \
-         io001 /* 1.3 I/O */ \
-         io002 \
-         io003 \
-         io004 \
-         io005 \
-         io006 \
-         io007 \
-         io008 \
-         io009 \
-         io010 \
-         io011 \
-         io012 \
-         io013 \
-         io014 \
-         io015 \
-         io016 \
-         io017 \
-         io018 \
-         io019 \
-         io020 \
-         io021 \
-         obfuscated93 \
-         po001 /* LibPosix */ \
-         po002 \
-         po003 \
-         po004 \
-         po005 \
-         po006 \
-         po007 \
-         po008 \
-         po009 \
-         po010 \
-         po011 \
-         po012 \
-         net001 /* SocketPrim, BSD, Socket */ \
-         net002 \
-         net003 \
-         net004 \
-         net005 \
-         net006 \
-         net007 \
-         net008 \
-         stable001
-
-/* LATER: specialise */
-
-/* takes too long: put it back:ToDo:     cg023 */
-
-/* OLD:          cg018 -- -feval-tran no longer supported */
-/*       cg027 : compile-time error */
-
-runtests::
-       @echo '###############################################################'
-       @echo '# GHC tests that need to be *run*                             #'
-       @echo '###############################################################'
diff --git a/GHC_ONLY/Makefile b/GHC_ONLY/Makefile
new file mode 100644 (file)
index 0000000..e6e6fcf
--- /dev/null
@@ -0,0 +1,3 @@
+TOP = ../..
+SUBDIRS = $(wildcard arith* bugs cg* ghclib* io* obfuscated93 po* net* stable*)
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/arith001/Jmakefile b/GHC_ONLY/arith001/Jmakefile
deleted file mode 100644 (file)
index a42fd4d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(arith001,)
diff --git a/GHC_ONLY/arith001/Makefile b/GHC_ONLY/arith001/Makefile
new file mode 100644 (file)
index 0000000..c620ffa
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = arith001
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/arith002/Jmakefile b/GHC_ONLY/arith002/Jmakefile
deleted file mode 100644 (file)
index 54b0214..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(arith002,)
diff --git a/GHC_ONLY/arith002/Makefile b/GHC_ONLY/arith002/Makefile
new file mode 100644 (file)
index 0000000..c53e41c
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = arith002
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/arith003/Jmakefile b/GHC_ONLY/arith003/Jmakefile
deleted file mode 100644 (file)
index c116a4e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(arith003,)
diff --git a/GHC_ONLY/arith003/Makefile b/GHC_ONLY/arith003/Makefile
new file mode 100644 (file)
index 0000000..8f4bf78
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = arith003
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/arith004/Jmakefile b/GHC_ONLY/arith004/Jmakefile
deleted file mode 100644 (file)
index 17b5493..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(arith004,)
diff --git a/GHC_ONLY/arith004/Makefile b/GHC_ONLY/arith004/Makefile
new file mode 100644 (file)
index 0000000..98be346
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = arith004
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/arith005/Jmakefile b/GHC_ONLY/arith005/Jmakefile
deleted file mode 100644 (file)
index 2ae613e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(arith005,)
index b55d701..c472bdd 100644 (file)
@@ -46,30 +46,15 @@ main
        )
   where
     float_list :: [Float]
-    double_list :: [Double]
-
-#define LIST \
-       0.0, \
-       -0.0, \
-       1.1, \
-       2.8, \
-       3.5, \
-       4.5, \
-       -1.0000000001, \
-       -2.9999995, \
-       -3.50000000001, \
-       -4.49999999999, \
-       1000012.0, \
-       123.456, \
-       100.25, \
-       102.5, \
-       0.0012, \
-       -0.00000012, \
-       1.7e4, \
-       -1.7e-4, \
-       0.15e-6, \
-       pi
+    float_list = [
+       0.0, -0.0, 1.1, 2.8, 3.5, 4.5, -1.0000000001, -2.9999995,
+       -3.50000000001, -4.49999999999, 1000012.0, 123.456, 100.25,
+       102.5, 0.0012, -0.00000012, 1.7e4, -1.7e-4, 0.15e-6, pi
+      ]
 
-    float_list = [ LIST        ]
-
-    double_list = [ LIST ]
+    double_list :: [Double]
+    double_list = [
+       0.0, -0.0, 1.1, 2.8, 3.5, 4.5, -1.0000000001, -2.9999995,
+       -3.50000000001, -4.49999999999, 1000012.0, 123.456, 100.25,
+       102.5, 0.0012, -0.00000012, 1.7e4, -1.7e-4, 0.15e-6, pi
+      ]
diff --git a/GHC_ONLY/arith005/Makefile b/GHC_ONLY/arith005/Makefile
new file mode 100644 (file)
index 0000000..aeb436c
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = arith005
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/arith006/Jmakefile b/GHC_ONLY/arith006/Jmakefile
deleted file mode 100644 (file)
index 0d2efbe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(arith006,)
diff --git a/GHC_ONLY/arith006/Makefile b/GHC_ONLY/arith006/Makefile
new file mode 100644 (file)
index 0000000..093ab0d
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = arith006
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/arith007/Jmakefile b/GHC_ONLY/arith007/Jmakefile
deleted file mode 100644 (file)
index 840a10f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(arith007,)
diff --git a/GHC_ONLY/arith007/Makefile b/GHC_ONLY/arith007/Makefile
new file mode 100644 (file)
index 0000000..dd0a562
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = arith007
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/arith008/Jmakefile b/GHC_ONLY/arith008/Jmakefile
deleted file mode 100644 (file)
index 2d716eb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(arith008,)
diff --git a/GHC_ONLY/arith008/Makefile b/GHC_ONLY/arith008/Makefile
new file mode 100644 (file)
index 0000000..030099e
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = arith008
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/arith009/Jmakefile b/GHC_ONLY/arith009/Jmakefile
deleted file mode 100644 (file)
index 8b556e5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(arith009,)
diff --git a/GHC_ONLY/arith009/Makefile b/GHC_ONLY/arith009/Makefile
new file mode 100644 (file)
index 0000000..0371ceb
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = arith009
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/array001/Jmakefile b/GHC_ONLY/array001/Jmakefile
deleted file mode 100644 (file)
index 960646f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(array001,)
diff --git a/GHC_ONLY/array001/Makefile b/GHC_ONLY/array001/Makefile
new file mode 100644 (file)
index 0000000..bba6e1d
--- /dev/null
@@ -0,0 +1,3 @@
+TOP = ../../..
+PROG = array001
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/array002/Jmakefile b/GHC_ONLY/array002/Jmakefile
deleted file mode 100644 (file)
index 3abcf92..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(array002,)
diff --git a/GHC_ONLY/array002/Makefile b/GHC_ONLY/array002/Makefile
new file mode 100644 (file)
index 0000000..30bddca
--- /dev/null
@@ -0,0 +1,3 @@
+TOP = ../../..
+PROG = array002
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/bugs/10queens/Jmakefile b/GHC_ONLY/bugs/10queens/Jmakefile
deleted file mode 100644 (file)
index a5cb860..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(10queens,)
diff --git a/GHC_ONLY/bugs/10queens/Makefile b/GHC_ONLY/bugs/10queens/Makefile
new file mode 100644 (file)
index 0000000..6158e44
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../../..
+PROG = 10queens
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/bugs/Jmakefile b/GHC_ONLY/bugs/Jmakefile
deleted file mode 100644 (file)
index b748da1..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#define IHaveSubdirs
-
-SUBDIRS = 10queens             \
-         andy_cherry           \
-         cvh_unboxing          \
-         dmgob_native1         \
-         dmgob_native2         \
-         fast2haskell          \
-         ipoole_spec_class     \
-         jq_readsPrec          \
-         jl_defaults           \
-         jtod_circint          \
-         jules_xref            \
-         jules_xref2           \
-         lennart_array         \
-         lennart_range         \
-         lex                   \
-         life_space_leak       \
-         north_array           \
-         sanders_array         \
-         waugh_neural          \
-         zhang_ccall
-
-/* andre_monad: boring -- the correct answer is a divide-by-zero */
-/* NOT REALLY A BUG:     fun_insts  */
-/* NOT A BUG AS FAR AS I CAN TELL: north_lias */
-/* NOT A BUG: stk overflow is expected w/ stranal: hill_stk_oflow */
-/* TESTS OLD ccall (now irrelevant): areid_pass */
-
-runtests::
-       @echo '###############################################################'
-       @echo '# GHC tests to *run* -- from reported bugs                    #'
-       @echo '###############################################################'
diff --git a/GHC_ONLY/bugs/Makefile b/GHC_ONLY/bugs/Makefile
new file mode 100644 (file)
index 0000000..00bd984
--- /dev/null
@@ -0,0 +1,14 @@
+TOP = ../../..
+SUBDIRS = 10queens andy_cherry cvh_unboxing dmgob_native1 dmgob_native2 \
+         fast2haskell ipoole_spec_class jq_readsPrec jl_defaults \
+         jtod_circint jules_xref jules_xref2 lennart_array lennart_range \
+         lex life_space_leak north_array sanders_array waugh_neural \
+         zhang_ccall
+
+# andre_monad: boring -- the correct answer is a divide-by-zero
+# NOT REALLY A BUG: fun_insts
+# NOT A BUG AS FAR AS I CAN TELL: north_lias
+# NOT A BUG: stk overflow is expected w/ stranal: hill_stk_oflow
+# TESTS OLD ccall (now irrelevant): areid_pass
+
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/bugs/andre_monad/Jmakefile b/GHC_ONLY/bugs/andre_monad/Jmakefile
deleted file mode 100644 (file)
index 3ceab5c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(andre_monad,)
diff --git a/GHC_ONLY/bugs/andre_monad/Makefile b/GHC_ONLY/bugs/andre_monad/Makefile
new file mode 100644 (file)
index 0000000..da7c04c
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = andre_monad
+EXTRA_RUNTESTFLAGS = 
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/bugs/andy_cherry/Jmakefile b/GHC_ONLY/bugs/andy_cherry/Jmakefile
deleted file mode 100644 (file)
index eb3c7ed..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-SRCS_LHS=DataTypes.lhs GenUtils.lhs Interp.lhs InterpUtils.lhs Main.lhs Parser.lhs PrintTEX.lhs
-OBJS_O=  DataTypes.o   GenUtils.o   Interp.o   InterpUtils.o   Main.o   Parser.o   PrintTEX.o
-
-NoFibMultiModuleCompileAndRun(andy_cherry,-d tex mygames.pgn -o1 andy_cherry.stdout)
-
-NoFibHaskellCompile(andy_cherry,DataTypes,lhs)
-NoFibHaskellCompile(andy_cherry,GenUtils,lhs)
-NoFibHaskellCompile(andy_cherry,Interp,lhs)
-NoFibHaskellCompile(andy_cherry,InterpUtils,lhs)
-NoFibHaskellCompile(andy_cherry,Main,lhs)
-NoFibHaskellCompile(andy_cherry,Parser,lhs)
-NoFibHaskellCompile(andy_cherry,PrintTEX,lhs)
-
-NoFibDependTarget(andy_cherry, $(SRCS_LHS))
diff --git a/GHC_ONLY/bugs/andy_cherry/Makefile b/GHC_ONLY/bugs/andy_cherry/Makefile
new file mode 100644 (file)
index 0000000..7601d12
--- /dev/null
@@ -0,0 +1,6 @@
+TOP = ../../../..
+PROG = andy_cherry
+SRCS = DataTypes.lhs GenUtils.lhs Interp.lhs InterpUtils.lhs \
+       Parser.lhs PrintTEX.lhs Main.lhs 
+EXTRA_RUNTESTFLAGS = -d tex mygames.pgn
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/bugs/areid_pass/Jmakefile b/GHC_ONLY/bugs/areid_pass/Jmakefile
deleted file mode 100644 (file)
index 84749f4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(areid_pass,)
diff --git a/GHC_ONLY/bugs/areid_pass/Makefile b/GHC_ONLY/bugs/areid_pass/Makefile
new file mode 100644 (file)
index 0000000..b9cca5b
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = areid_pass
+EXTRA_RUNTESTFLAGS = 
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/bugs/cvh_unboxing/Jmakefile b/GHC_ONLY/bugs/cvh_unboxing/Jmakefile
deleted file mode 100644 (file)
index 5eb687e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-SRCS_HS = Append.lhs Main.lhs Types.lhs
-OBJS_O  = Append.o   Main.o   Types.o
-NoFibMultiModuleCompileAndRun(cvh_unboxing,-o1 cvh_unboxing.stdout)
-
-NoFibHaskellCompile(cvh_unboxing,Append,lhs)
-NoFibHaskellCompile(cvh_unboxing,Main,lhs)
-NoFibHaskellCompile(cvh_unboxing,Types,lhs)
-
-NoFibDependTarget(cvh_unboxing, $(SRCS_HS))
diff --git a/GHC_ONLY/bugs/cvh_unboxing/Makefile b/GHC_ONLY/bugs/cvh_unboxing/Makefile
new file mode 100644 (file)
index 0000000..d6f70e4
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../../..
+PROG = cvh_unboxing
+SRCS = Types.lhs Append.lhs Main.lhs
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/bugs/dmgob_native1/Jmakefile b/GHC_ONLY/bugs/dmgob_native1/Jmakefile
deleted file mode 100644 (file)
index 50d1916..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-SRCS_LHS = MaybeStateT.lhs Main.lhs
-OBJS_O   = MaybeStateT.o   Main.o
-
-NoFibMultiModuleCompileAndRun(dmgob_native1, test_data -o1 dmgob_native1.stdout)
-
-NoFibHaskellCompile(dmgob_native1,MaybeStateT,lhs)
-NoFibHaskellCompile(dmgob_native1,Main,lhs)
-
-/* "generate_vectors" is used to make the test data.
-   It can be done by hand.
- */
diff --git a/GHC_ONLY/bugs/dmgob_native1/Makefile b/GHC_ONLY/bugs/dmgob_native1/Makefile
new file mode 100644 (file)
index 0000000..a95a81d
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../../..
+PROG = dmgob_native1
+EXTRA_RUNTESTFLAGS = test_data 
+SRCS = MaybeStateT.lhs Main.lhs
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/bugs/dmgob_native2/Jmakefile b/GHC_ONLY/bugs/dmgob_native2/Jmakefile
deleted file mode 100644 (file)
index ae0131c..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-SRCS_LHS = LPA.lhs Main.lhs
-OBJS_O   = LPA.o   Main.o
-
-NoFibMultiModuleCompileAndRun(dmgob_native2, -i dmgob_native2.stdin -o1 dmgob_native2.stdout)
-
-NoFibHaskellCompile(dmgob_native2,LPA,lhs)
-NoFibHaskellCompile(dmgob_native2,Main,lhs)
diff --git a/GHC_ONLY/bugs/dmgob_native2/Makefile b/GHC_ONLY/bugs/dmgob_native2/Makefile
new file mode 100644 (file)
index 0000000..edf6c05
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../../..
+PROG = dmgob_native2
+SRCS = LPA.lhs Main.lhs
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/bugs/fast2haskell/Jmakefile b/GHC_ONLY/bugs/fast2haskell/Jmakefile
deleted file mode 100644 (file)
index 244c234..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-SRCS_HS=Main.hs Fast2haskell.hs Word2.hs
-OBJS_O= Main.o  Fast2haskell.o  Word2.o
-
-NoFibMultiModuleCompileAndRun(fast2haskell,-o1 fast2haskell.stdout)
-
-NoFibHaskellCompile(fast2haskell,Main,hs)
-NoFibHaskellCompile(fast2haskell,Fast2haskell,hs)
-NoFibHaskellCompile(fast2haskell,Word2,hs)
-
-NoFibDependTarget(fast2haskell, $(SRCS_HS))
diff --git a/GHC_ONLY/bugs/fast2haskell/Makefile b/GHC_ONLY/bugs/fast2haskell/Makefile
new file mode 100644 (file)
index 0000000..70e0a47
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../../..
+PROG = fast2haskell
+SRCS = Word2.hs Fast2haskell.hs Main.hs
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/bugs/fun_insts/Jmakefile b/GHC_ONLY/bugs/fun_insts/Jmakefile
deleted file mode 100644 (file)
index 423a2b2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(fun_insts,)
diff --git a/GHC_ONLY/bugs/fun_insts/Makefile b/GHC_ONLY/bugs/fun_insts/Makefile
new file mode 100644 (file)
index 0000000..b943cfc
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = fun_insts
+EXTRA_RUNTESTFLAGS = 
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/bugs/hill_stk_oflow/Jmakefile b/GHC_ONLY/bugs/hill_stk_oflow/Jmakefile
deleted file mode 100644 (file)
index 20193a0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(hill_stk_oflow,)
diff --git a/GHC_ONLY/bugs/hill_stk_oflow/Makefile b/GHC_ONLY/bugs/hill_stk_oflow/Makefile
new file mode 100644 (file)
index 0000000..274b41b
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = hill_stk_oflow
+EXTRA_RUNTESTFLAGS = 
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/bugs/ipoole_spec_class/Jmakefile b/GHC_ONLY/bugs/ipoole_spec_class/Jmakefile
deleted file mode 100644 (file)
index a1eb27b..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-SRCS_LHS=GoferPreludeBits.lhs Lib.lhs Io.lhs JobImp.lhs JobApp.lhs Lognum.lhs Main.lhs
-OBJS_O=  GoferPreludeBits.o   Lib.o   Io.o   JobImp.o   JobApp.o   Lognum.o   Main.o
-
-NoFibMultiModuleCompileAndRun(ipoole_spec_class,-o1 ipoole_spec_class.stdout)
-
-NoFibHaskellCompile(ipoole_spec_class,GoferPreludeBits,lhs)
-NoFibHaskellCompile(ipoole_spec_class,Lib,lhs)
-NoFibHaskellCompile(ipoole_spec_class,Io,lhs)
-NoFibHaskellCompile(ipoole_spec_class,JobImp,lhs)
-NoFibHaskellCompile(ipoole_spec_class,JobApp,lhs)
-NoFibHaskellCompile(ipoole_spec_class,Lognum,lhs)
-NoFibHaskellCompile(ipoole_spec_class,Main,lhs)
-
-NoFibDependTarget(ipoole_spec_class, $(SRCS_LHS))
diff --git a/GHC_ONLY/bugs/ipoole_spec_class/Makefile b/GHC_ONLY/bugs/ipoole_spec_class/Makefile
new file mode 100644 (file)
index 0000000..9399a97
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../../..
+PROG = ipoole_spec_class
+SRCS = GoferPreludeBits.lhs Lib.lhs Io.lhs JobImp.lhs \
+       JobApp.lhs Lognum.lhs Main.lhs
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/bugs/jl_defaults/Jmakefile b/GHC_ONLY/bugs/jl_defaults/Jmakefile
deleted file mode 100644 (file)
index 04b4263..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(jl_defaults,-i jl_defaults.stdin)
diff --git a/GHC_ONLY/bugs/jl_defaults/Makefile b/GHC_ONLY/bugs/jl_defaults/Makefile
new file mode 100644 (file)
index 0000000..80eb0d5
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../../..
+PROG = jl_defaults
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/bugs/jq_readsPrec/Jmakefile b/GHC_ONLY/bugs/jq_readsPrec/Jmakefile
deleted file mode 100644 (file)
index c598a47..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(jq_readsPrec,-i jq_readsPrec.stdin)
diff --git a/GHC_ONLY/bugs/jq_readsPrec/Makefile b/GHC_ONLY/bugs/jq_readsPrec/Makefile
new file mode 100644 (file)
index 0000000..e2626d2
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../../..
+PROG = jq_readsPrec
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/bugs/jtod_circint/Jmakefile b/GHC_ONLY/bugs/jtod_circint/Jmakefile
deleted file mode 100644 (file)
index 89a9732..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-SRCS_HS=Main.hs Bit.hs LogFun.hs Signal.hs
-OBJS_O= Main.o  Bit.o  LogFun.o  Signal.o
-
-NoFibMultiModuleCompileAndRun(jtod_circint,-o1 jtod_circint.stdout)
-
-NoFibHaskellCompile(jtod_circint,Main,hs)
-NoFibHaskellCompile(jtod_circint,Bit,hs)
-NoFibHaskellCompile(jtod_circint,LogFun,hs)
-NoFibHaskellCompile(jtod_circint,Signal,hs)
-
-NoFibDependTarget(jtod_circint, $(SRCS_HS))
diff --git a/GHC_ONLY/bugs/jtod_circint/Makefile b/GHC_ONLY/bugs/jtod_circint/Makefile
new file mode 100644 (file)
index 0000000..5a9575b
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../../..
+PROG = jtod_circint
+SRCS = Bit.hs LogFun.hs Signal.hs Main.hs
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/bugs/jules_xref/Jmakefile b/GHC_ONLY/bugs/jules_xref/Jmakefile
deleted file mode 100644 (file)
index d6eeb81..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(jules_xref,-i jules_xref.stdin)
diff --git a/GHC_ONLY/bugs/jules_xref/Makefile b/GHC_ONLY/bugs/jules_xref/Makefile
new file mode 100644 (file)
index 0000000..0d65a05
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../../..
+PROG = jules_xref
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/bugs/jules_xref2/Jmakefile b/GHC_ONLY/bugs/jules_xref2/Jmakefile
deleted file mode 100644 (file)
index 56e9a03..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(jules_xref2,-i jules_xref2.stdin)
diff --git a/GHC_ONLY/bugs/jules_xref2/Makefile b/GHC_ONLY/bugs/jules_xref2/Makefile
new file mode 100644 (file)
index 0000000..f8f9190
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../../..
+PROG = jules_xref2
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/bugs/lennart_array/Jmakefile b/GHC_ONLY/bugs/lennart_array/Jmakefile
deleted file mode 100644 (file)
index 36bd280..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(lennart_array,)
diff --git a/GHC_ONLY/bugs/lennart_array/Makefile b/GHC_ONLY/bugs/lennart_array/Makefile
new file mode 100644 (file)
index 0000000..34bbdf3
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../../..
+PROG = lennart_array
+EXTRA_RUNTESTFLAGS = 
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/bugs/lennart_range/Jmakefile b/GHC_ONLY/bugs/lennart_range/Jmakefile
deleted file mode 100644 (file)
index dbf3b8f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(lennart_range,)
diff --git a/GHC_ONLY/bugs/lennart_range/Makefile b/GHC_ONLY/bugs/lennart_range/Makefile
new file mode 100644 (file)
index 0000000..2c519ad
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../../..
+PROG = lennart_range
+EXTRA_RUNTESTFLAGS = 
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/bugs/lex/Jmakefile b/GHC_ONLY/bugs/lex/Jmakefile
deleted file mode 100644 (file)
index 482fba8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(lex,-i lex.stdin)
diff --git a/GHC_ONLY/bugs/lex/Makefile b/GHC_ONLY/bugs/lex/Makefile
new file mode 100644 (file)
index 0000000..5685272
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../../..
+PROG = lex
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/bugs/life_space_leak/Jmakefile b/GHC_ONLY/bugs/life_space_leak/Jmakefile
deleted file mode 100644 (file)
index aa7d96f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-/* has a special test script */
-
-NoFibOneModuleCompileAndRun(life_space_leak, -script ./life.test)
diff --git a/GHC_ONLY/bugs/life_space_leak/Makefile b/GHC_ONLY/bugs/life_space_leak/Makefile
new file mode 100644 (file)
index 0000000..d0692df
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../../..
+PROG = life_space_leak
+EXTRA_RUNTESTFLAGS = -prescript ./life.test
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/bugs/north_array/Jmakefile b/GHC_ONLY/bugs/north_array/Jmakefile
deleted file mode 100644 (file)
index b4fd93e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(north_array,)
diff --git a/GHC_ONLY/bugs/north_array/Makefile b/GHC_ONLY/bugs/north_array/Makefile
new file mode 100644 (file)
index 0000000..f226505
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../../..
+PROG = north_array
+EXTRA_RUNTESTFLAGS = 
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/bugs/sanders_array/Jmakefile b/GHC_ONLY/bugs/sanders_array/Jmakefile
deleted file mode 100644 (file)
index 3e2e029..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(sanders_array,)
diff --git a/GHC_ONLY/bugs/sanders_array/Makefile b/GHC_ONLY/bugs/sanders_array/Makefile
new file mode 100644 (file)
index 0000000..e773842
--- /dev/null
@@ -0,0 +1,3 @@
+TOP = ../../../..
+PROG = sanders_array
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/bugs/waugh_neural/Jmakefile b/GHC_ONLY/bugs/waugh_neural/Jmakefile
deleted file mode 100644 (file)
index e340d66..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-SRCS_LHS=Main.lhs ReadLists.lhs BpGen.lhs
-OBJS_O=  Main.o   ReadLists.o   BpGen.o
-
-NoFibMultiModuleCompileAndRun(waugh_neural,-o1 waugh_neural.stdout)
-
-NoFibHaskellCompile(waugh_neural,Main,lhs)
-NoFibHaskellCompile(waugh_neural,ReadLists,lhs)
-NoFibHaskellCompile(waugh_neural,BpGen,lhs)
-
-NoFibDependTarget(waugh_neural, $(SRCS_LHS))
diff --git a/GHC_ONLY/bugs/waugh_neural/Makefile b/GHC_ONLY/bugs/waugh_neural/Makefile
new file mode 100644 (file)
index 0000000..dd48f32
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../../..
+PROG = waugh_neural
+SRCS = BpGen.lhs ReadLists.lhs Main.lhs
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/bugs/zhang_ccall/Jmakefile b/GHC_ONLY/bugs/zhang_ccall/Jmakefile
deleted file mode 100644 (file)
index f0245be..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-SRCS_HS = Main.hs
-OBJS_O  = Main.o ccall.o
-
-NoFibMultiModuleCompileAndRun(zhang_ccall,-o1 zhang_ccall.stdout)
-
-NoFibHaskellCompile(zhang_ccall,Main,hs)
-
-ccall.o : ccall.c
-       $(CC) -c $(CFLAGS) ccall.c
diff --git a/GHC_ONLY/bugs/zhang_ccall/Makefile b/GHC_ONLY/bugs/zhang_ccall/Makefile
new file mode 100644 (file)
index 0000000..78b88b6
--- /dev/null
@@ -0,0 +1,7 @@
+TOP = ../../../..
+PROG = zhang_ccall
+LIBS = ccall.o
+include $(TOP)/nofib/mk/nofib.mk
+
+ccall.o : ccall.c
+       $(CC) -c $(CFLAGS) ccall.c
diff --git a/GHC_ONLY/cg001/Jmakefile b/GHC_ONLY/cg001/Jmakefile
deleted file mode 100644 (file)
index 5530c27..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg001,)
diff --git a/GHC_ONLY/cg001/Makefile b/GHC_ONLY/cg001/Makefile
new file mode 100644 (file)
index 0000000..95c8b77
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg001
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg002/Jmakefile b/GHC_ONLY/cg002/Jmakefile
deleted file mode 100644 (file)
index c96437f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg002,)
diff --git a/GHC_ONLY/cg002/Makefile b/GHC_ONLY/cg002/Makefile
new file mode 100644 (file)
index 0000000..0db7911
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg002
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg003/Jmakefile b/GHC_ONLY/cg003/Jmakefile
deleted file mode 100644 (file)
index c3cbe22..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg003,)
diff --git a/GHC_ONLY/cg003/Makefile b/GHC_ONLY/cg003/Makefile
new file mode 100644 (file)
index 0000000..fef4807
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg003
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg004/Jmakefile b/GHC_ONLY/cg004/Jmakefile
deleted file mode 100644 (file)
index a52b191..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg004,)
diff --git a/GHC_ONLY/cg004/Makefile b/GHC_ONLY/cg004/Makefile
new file mode 100644 (file)
index 0000000..d430c1d
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg004
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg005/Jmakefile b/GHC_ONLY/cg005/Jmakefile
deleted file mode 100644 (file)
index f056c1d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg005,)
diff --git a/GHC_ONLY/cg005/Makefile b/GHC_ONLY/cg005/Makefile
new file mode 100644 (file)
index 0000000..6cf03d7
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg005
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg006/Jmakefile b/GHC_ONLY/cg006/Jmakefile
deleted file mode 100644 (file)
index 620ff10..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg006,)
diff --git a/GHC_ONLY/cg006/Makefile b/GHC_ONLY/cg006/Makefile
new file mode 100644 (file)
index 0000000..0bfaded
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg006
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg007/Jmakefile b/GHC_ONLY/cg007/Jmakefile
deleted file mode 100644 (file)
index 80e5504..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg007,)
diff --git a/GHC_ONLY/cg007/Makefile b/GHC_ONLY/cg007/Makefile
new file mode 100644 (file)
index 0000000..39d8ad9
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg007
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg008/Jmakefile b/GHC_ONLY/cg008/Jmakefile
deleted file mode 100644 (file)
index f9be72b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg008,)
diff --git a/GHC_ONLY/cg008/Makefile b/GHC_ONLY/cg008/Makefile
new file mode 100644 (file)
index 0000000..b46e7dc
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg008
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg009/Jmakefile b/GHC_ONLY/cg009/Jmakefile
deleted file mode 100644 (file)
index 6925586..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg009,)
diff --git a/GHC_ONLY/cg009/Makefile b/GHC_ONLY/cg009/Makefile
new file mode 100644 (file)
index 0000000..b7a9aa8
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg009
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg010/Jmakefile b/GHC_ONLY/cg010/Jmakefile
deleted file mode 100644 (file)
index 233e444..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg010,)
diff --git a/GHC_ONLY/cg010/Makefile b/GHC_ONLY/cg010/Makefile
new file mode 100644 (file)
index 0000000..ff8e25c
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg010
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg011/Jmakefile b/GHC_ONLY/cg011/Jmakefile
deleted file mode 100644 (file)
index 91e2794..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg011,)
diff --git a/GHC_ONLY/cg011/Makefile b/GHC_ONLY/cg011/Makefile
new file mode 100644 (file)
index 0000000..a158018
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg011
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg012/Jmakefile b/GHC_ONLY/cg012/Jmakefile
deleted file mode 100644 (file)
index 0e4365b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg012,)
diff --git a/GHC_ONLY/cg012/Makefile b/GHC_ONLY/cg012/Makefile
new file mode 100644 (file)
index 0000000..9a60785
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = cg012
+EXTRA_HCFLAGS = -fglasgow-exts
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg013/Jmakefile b/GHC_ONLY/cg013/Jmakefile
deleted file mode 100644 (file)
index 1758421..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg013,)
diff --git a/GHC_ONLY/cg013/Makefile b/GHC_ONLY/cg013/Makefile
new file mode 100644 (file)
index 0000000..56fcf3c
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg013
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg014/Jmakefile b/GHC_ONLY/cg014/Jmakefile
deleted file mode 100644 (file)
index 8b48006..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg014,)
diff --git a/GHC_ONLY/cg014/Makefile b/GHC_ONLY/cg014/Makefile
new file mode 100644 (file)
index 0000000..5db8ce9
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg014
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg015/Jmakefile b/GHC_ONLY/cg015/Jmakefile
deleted file mode 100644 (file)
index 90e12aa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg015,)
diff --git a/GHC_ONLY/cg015/Makefile b/GHC_ONLY/cg015/Makefile
new file mode 100644 (file)
index 0000000..c943d21
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = cg015
+EXTRA_HCFLAGS = -fglasgow-exts
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg016/Jmakefile b/GHC_ONLY/cg016/Jmakefile
deleted file mode 100644 (file)
index 4815d05..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg016,-x1 -o2 cg016.stderr)
diff --git a/GHC_ONLY/cg016/Makefile b/GHC_ONLY/cg016/Makefile
new file mode 100644 (file)
index 0000000..c2ff28d
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg016
+EXTRA_RUNTESTFLAGS = -x1
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/cg017/Jmakefile b/GHC_ONLY/cg017/Jmakefile
deleted file mode 100644 (file)
index 96a51ea..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg017,)
diff --git a/GHC_ONLY/cg017/Makefile b/GHC_ONLY/cg017/Makefile
new file mode 100644 (file)
index 0000000..17052f0
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg017
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg018/Jmakefile b/GHC_ONLY/cg018/Jmakefile
deleted file mode 100644 (file)
index 51644b6..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-NoFibOneModuleCompileAndRun(cg018,-o1 cg018.stdout2)
-/* I am not sure what the range of acceptable output values really is
-   WDP 95/06
-*/
diff --git a/GHC_ONLY/cg018/Makefile b/GHC_ONLY/cg018/Makefile
new file mode 100644 (file)
index 0000000..f32447b
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg018
+EXTRA_HCFLAGS = -fglasgow-exts
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/cg019/Jmakefile b/GHC_ONLY/cg019/Jmakefile
deleted file mode 100644 (file)
index f8d76e9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg019,)
diff --git a/GHC_ONLY/cg019/Makefile b/GHC_ONLY/cg019/Makefile
new file mode 100644 (file)
index 0000000..2c03650
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg019
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg020/Jmakefile b/GHC_ONLY/cg020/Jmakefile
deleted file mode 100644 (file)
index 6abae26..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg020,)
diff --git a/GHC_ONLY/cg020/Makefile b/GHC_ONLY/cg020/Makefile
new file mode 100644 (file)
index 0000000..31117d4
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg020
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg021/Jmakefile b/GHC_ONLY/cg021/Jmakefile
deleted file mode 100644 (file)
index ea3f00f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg021,)
diff --git a/GHC_ONLY/cg021/Makefile b/GHC_ONLY/cg021/Makefile
new file mode 100644 (file)
index 0000000..43b54a0
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg021
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg022/Jmakefile b/GHC_ONLY/cg022/Jmakefile
deleted file mode 100644 (file)
index d3a356f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg022,)
diff --git a/GHC_ONLY/cg022/Makefile b/GHC_ONLY/cg022/Makefile
new file mode 100644 (file)
index 0000000..61351b6
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg022
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg023/Jmakefile b/GHC_ONLY/cg023/Jmakefile
deleted file mode 100644 (file)
index 3ffe7b9..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-SRCS_HS=Main.lhs
-OBJS_O= Main.o
-
-/* not multi-module, but a .lhs file... */
-NoFibMultiModuleCompileAndRun(cg023,-o1 cg023.stdout)
-
-NoFibHaskellCompile(cg023,Main,lhs)
index 6c2a3dc..c481597 100644 (file)
@@ -201,7 +201,7 @@ immediately selected.
 > eval co de args cds@(Call fname tag params alt0 alt1)
 >   = let (copied_an_empty, callee_args) = copy_args args params
 >         augmented_de      = tag : de
->         callee_code       = lookup co fname
+>         callee_code       = lkup co fname
 >         callee_result     = eval co augmented_de callee_args callee_code
 >         been_here_before  = tag `elem` de
 >     in
@@ -244,7 +244,7 @@ ToDo: what happens if a Call turns up ???
 >               copied_an_empty
 >         then  cds
 >         else  eval co de args 
->                    (lookup alts (get_head 
+>                    (lkup alts (get_head 
 >                                    (eval co de new_args functional_param)))
 
 Auxiliary for evaluating Case expressions.
@@ -273,7 +273,7 @@ corresponding output position.
 >                Empty -> cax True ps (Empty:res)
 >                other -> cax empty ps (other:res)
 
-> lookup env k = head ( [v | (kk,v) <- env, kk == k] ++ 
+> lkup env k = head ( [v | (kk,v) <- env, kk == k] ++ 
 >                       [error ( "Can't look up " ) ] )
 
 %============================================================
@@ -284,7 +284,7 @@ corresponding output position.
 
 Something to make running tests easier ...
 
-> eval0 fname args = eval test [] args (lookup test fname)
+> eval0 fname args = eval test [] args (lkup test fname)
 >
 > two = [Zero, One]
 
diff --git a/GHC_ONLY/cg023/Makefile b/GHC_ONLY/cg023/Makefile
new file mode 100644 (file)
index 0000000..d7c63a2
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg023
+SRCS = Main.lhs
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/cg024/Jmakefile b/GHC_ONLY/cg024/Jmakefile
deleted file mode 100644 (file)
index a83b7f0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg024,)
diff --git a/GHC_ONLY/cg024/Makefile b/GHC_ONLY/cg024/Makefile
new file mode 100644 (file)
index 0000000..a3b1e1c
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg024
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg025/Jmakefile b/GHC_ONLY/cg025/Jmakefile
deleted file mode 100644 (file)
index 68cf2c4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg025,-x1 -o2 cg025.stderr Main.hs)
diff --git a/GHC_ONLY/cg025/Makefile b/GHC_ONLY/cg025/Makefile
new file mode 100644 (file)
index 0000000..61c10c4
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg025
+EXTRA_RUNTESTFLAGS = -x1
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/cg026/Jmakefile b/GHC_ONLY/cg026/Jmakefile
deleted file mode 100644 (file)
index ecc7e4c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg026,)
diff --git a/GHC_ONLY/cg026/Makefile b/GHC_ONLY/cg026/Makefile
new file mode 100644 (file)
index 0000000..6c01e2a
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = cg026
+EXTRA_HCFLAGS = -fglasgow-exts
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg027/Jmakefile b/GHC_ONLY/cg027/Jmakefile
deleted file mode 100644 (file)
index 0d684ef..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg027,)
diff --git a/GHC_ONLY/cg027/Makefile b/GHC_ONLY/cg027/Makefile
new file mode 100644 (file)
index 0000000..f3a4e61
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg027
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg028/Jmakefile b/GHC_ONLY/cg028/Jmakefile
deleted file mode 100644 (file)
index bd08f18..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg028,)
diff --git a/GHC_ONLY/cg028/Makefile b/GHC_ONLY/cg028/Makefile
new file mode 100644 (file)
index 0000000..086044f
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg028
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg029/Jmakefile b/GHC_ONLY/cg029/Jmakefile
deleted file mode 100644 (file)
index 2be7a39..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg029,)
diff --git a/GHC_ONLY/cg029/Makefile b/GHC_ONLY/cg029/Makefile
new file mode 100644 (file)
index 0000000..7fc79d1
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = cg029
+EXTRA_HCFLAGS = -fglasgow-exts
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg030/Jmakefile b/GHC_ONLY/cg030/Jmakefile
deleted file mode 100644 (file)
index 9599ff5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg030,)
diff --git a/GHC_ONLY/cg030/Makefile b/GHC_ONLY/cg030/Makefile
new file mode 100644 (file)
index 0000000..c73c8cf
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = cg030
+EXTRA_HCFLAGS = -fglasgow-exts
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg031/Jmakefile b/GHC_ONLY/cg031/Jmakefile
deleted file mode 100644 (file)
index 3a2ed29..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg031,)
diff --git a/GHC_ONLY/cg031/Makefile b/GHC_ONLY/cg031/Makefile
new file mode 100644 (file)
index 0000000..6bb3c0b
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = cg031
+EXTRA_HCFLAGS = -fglasgow-exts
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg032/Jmakefile b/GHC_ONLY/cg032/Jmakefile
deleted file mode 100644 (file)
index 00cb84c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg032,)
diff --git a/GHC_ONLY/cg032/Makefile b/GHC_ONLY/cg032/Makefile
new file mode 100644 (file)
index 0000000..31cc7d2
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = cg032
+EXTRA_HCFLAGS = -fglasgow-exts
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg033/Jmakefile b/GHC_ONLY/cg033/Jmakefile
deleted file mode 100644 (file)
index 3b47409..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg033,)
diff --git a/GHC_ONLY/cg033/Makefile b/GHC_ONLY/cg033/Makefile
new file mode 100644 (file)
index 0000000..4b7f3f4
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = cg033
+EXTRA_HCFLAGS = -fglasgow-exts
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg034/Jmakefile b/GHC_ONLY/cg034/Jmakefile
deleted file mode 100644 (file)
index cbc55e4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg034,)
diff --git a/GHC_ONLY/cg034/Makefile b/GHC_ONLY/cg034/Makefile
new file mode 100644 (file)
index 0000000..3f2bcce
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg034
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg035/Jmakefile b/GHC_ONLY/cg035/Jmakefile
deleted file mode 100644 (file)
index bd0ff6a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg035,)
diff --git a/GHC_ONLY/cg035/Makefile b/GHC_ONLY/cg035/Makefile
new file mode 100644 (file)
index 0000000..5ee426e
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = cg035
+EXTRA_HCFLAGS = -fglasgow-exts
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg036/Jmakefile b/GHC_ONLY/cg036/Jmakefile
deleted file mode 100644 (file)
index 1aa0cfc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg036,)
diff --git a/GHC_ONLY/cg036/Makefile b/GHC_ONLY/cg036/Makefile
new file mode 100644 (file)
index 0000000..1ccc645
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg036
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg037/Jmakefile b/GHC_ONLY/cg037/Jmakefile
deleted file mode 100644 (file)
index e10540b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg037,)
index e54375a..82620a1 100644 (file)
@@ -1,4 +1,4 @@
 -- Andy Gill bug report 95/08:
 -- Constant strings with '\0' in them don't work :-
 --
-main = putStr "hello\0 world"
+main = putStrLn "hello\0 world"
diff --git a/GHC_ONLY/cg037/Makefile b/GHC_ONLY/cg037/Makefile
new file mode 100644 (file)
index 0000000..9d74017
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg037
+include $(TOP)/nofib/mk/nofib.mk
+
index 3713268..fa50190 100644 (file)
Binary files a/GHC_ONLY/cg037/cg037.stdout and b/GHC_ONLY/cg037/cg037.stdout differ
diff --git a/GHC_ONLY/cg038/Jmakefile b/GHC_ONLY/cg038/Jmakefile
deleted file mode 100644 (file)
index 9a59762..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg038,)
diff --git a/GHC_ONLY/cg038/Makefile b/GHC_ONLY/cg038/Makefile
new file mode 100644 (file)
index 0000000..1936f8f
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg038
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/cg039/Jmakefile b/GHC_ONLY/cg039/Jmakefile
deleted file mode 100644 (file)
index 7833ce9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(cg039,)
index e2a40fc..8a8d988 100644 (file)
@@ -4,11 +4,11 @@
 
 module Main where
 
-class Seq a where
-   seq :: a -> b -> b
+class Poly a where
+   poly :: a -> b -> b
 
-instance Seq [a] where
-   seq [] y = y
-   seq x  y = y
+instance Poly [a] where
+   poly [] y = y
+   poly x  y = y
 
-main = print ("hurrah" `seq` "Hello, world!\n")
+main = print ("hurrah" `poly` "Hello, world!\n")
diff --git a/GHC_ONLY/cg039/Makefile b/GHC_ONLY/cg039/Makefile
new file mode 100644 (file)
index 0000000..d20c4fc
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg039
+include $(TOP)/nofib/mk/nofib.mk
+
index 004dc77..1c2d5d6 100644 (file)
@@ -1 +1 @@
-"Hello, world!\n"
\ No newline at end of file
+"Hello, world!\n"
diff --git a/GHC_ONLY/cg040/Jmakefile b/GHC_ONLY/cg040/Jmakefile
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/GHC_ONLY/cg040/Makefile b/GHC_ONLY/cg040/Makefile
new file mode 100644 (file)
index 0000000..1e50b05
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = cg040
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/ghclib001/Jmakefile b/GHC_ONLY/ghclib001/Jmakefile
deleted file mode 100644 (file)
index 50bd042..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(ghclib001,-i ghclib001.stdin)
diff --git a/GHC_ONLY/ghclib001/Makefile b/GHC_ONLY/ghclib001/Makefile
new file mode 100644 (file)
index 0000000..6e7ea21
--- /dev/null
@@ -0,0 +1,3 @@
+TOP = ../../..
+PROG = ghclib001
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/io001/Jmakefile b/GHC_ONLY/io001/Jmakefile
deleted file mode 100644 (file)
index 9881d5e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io001,)
diff --git a/GHC_ONLY/io001/Makefile b/GHC_ONLY/io001/Makefile
new file mode 100644 (file)
index 0000000..57f2079
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io001
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/io002/Jmakefile b/GHC_ONLY/io002/Jmakefile
deleted file mode 100644 (file)
index 5f5e71a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io002,-x 1 -o1 io002.stdout -o2 io002.stderr)
diff --git a/GHC_ONLY/io002/Makefile b/GHC_ONLY/io002/Makefile
new file mode 100644 (file)
index 0000000..580772f
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io002
+EXTRA_RUNTESTFLAGS = -x1
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/io003/Jmakefile b/GHC_ONLY/io003/Jmakefile
deleted file mode 100644 (file)
index ac50cd2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io003, with some arguments -o1 io003.stdout)
diff --git a/GHC_ONLY/io003/Makefile b/GHC_ONLY/io003/Makefile
new file mode 100644 (file)
index 0000000..47983d6
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io003
+EXTRA_RUNTESTFLAGS = with some arguments
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/io004/Jmakefile b/GHC_ONLY/io004/Jmakefile
deleted file mode 100644 (file)
index 6fd8e47..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io004, -x 42)
diff --git a/GHC_ONLY/io004/Makefile b/GHC_ONLY/io004/Makefile
new file mode 100644 (file)
index 0000000..564c9cd
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io004
+EXTRA_RUNTESTFLAGS = -x42
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/io005/Jmakefile b/GHC_ONLY/io005/Jmakefile
deleted file mode 100644 (file)
index 6507a3a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io005,)
diff --git a/GHC_ONLY/io005/Makefile b/GHC_ONLY/io005/Makefile
new file mode 100644 (file)
index 0000000..aef13e9
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io005
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/io006/Jmakefile b/GHC_ONLY/io006/Jmakefile
deleted file mode 100644 (file)
index 785b139..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io006,)
diff --git a/GHC_ONLY/io006/Makefile b/GHC_ONLY/io006/Makefile
new file mode 100644 (file)
index 0000000..81f013d
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io006
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/io007/Jmakefile b/GHC_ONLY/io007/Jmakefile
deleted file mode 100644 (file)
index 45cd9d1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io007,)
diff --git a/GHC_ONLY/io007/Makefile b/GHC_ONLY/io007/Makefile
new file mode 100644 (file)
index 0000000..9e91137
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io007
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/io008/Jmakefile b/GHC_ONLY/io008/Jmakefile
deleted file mode 100644 (file)
index c8f0561..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io008,)
diff --git a/GHC_ONLY/io008/Makefile b/GHC_ONLY/io008/Makefile
new file mode 100644 (file)
index 0000000..0bc4bb1
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io008
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/io009/Jmakefile b/GHC_ONLY/io009/Jmakefile
deleted file mode 100644 (file)
index b032f3f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io009,)
diff --git a/GHC_ONLY/io009/Makefile b/GHC_ONLY/io009/Makefile
new file mode 100644 (file)
index 0000000..f804d17
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io009
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/io010/Jmakefile b/GHC_ONLY/io010/Jmakefile
deleted file mode 100644 (file)
index b8607c1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io010,)
diff --git a/GHC_ONLY/io010/Makefile b/GHC_ONLY/io010/Makefile
new file mode 100644 (file)
index 0000000..f4a80d8
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io010
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/io011/Jmakefile b/GHC_ONLY/io011/Jmakefile
deleted file mode 100644 (file)
index 48cf325..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io011,)
diff --git a/GHC_ONLY/io011/Makefile b/GHC_ONLY/io011/Makefile
new file mode 100644 (file)
index 0000000..6272189
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io011
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/io012/Jmakefile b/GHC_ONLY/io012/Jmakefile
deleted file mode 100644 (file)
index a6051c6..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-/* has a special test script */
-
-SRCS_HS=Main.hs
-OBJS_O= Main.o
-
-NoFibMultiModuleCompileAndRun(io012, -script ./io012.test)
-
-NoFibHaskellCompile(io012,Main,hs)
diff --git a/GHC_ONLY/io012/Makefile b/GHC_ONLY/io012/Makefile
new file mode 100644 (file)
index 0000000..e7323ba
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io012
+EXTRA_RUNSTDTESTFLAGS = -prescript ./io012.test
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/io013/Jmakefile b/GHC_ONLY/io013/Jmakefile
deleted file mode 100644 (file)
index bf47ee9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io013,)
diff --git a/GHC_ONLY/io013/Makefile b/GHC_ONLY/io013/Makefile
new file mode 100644 (file)
index 0000000..8b1f4a3
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io013
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/io014/Jmakefile b/GHC_ONLY/io014/Jmakefile
deleted file mode 100644 (file)
index 5c4f3ef..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io014,-i Main.hs)
diff --git a/GHC_ONLY/io014/Makefile b/GHC_ONLY/io014/Makefile
new file mode 100644 (file)
index 0000000..49c0619
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io014
+EXTRA_RUNTESTFLAGS = -i Main.hs
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/io015/Jmakefile b/GHC_ONLY/io015/Jmakefile
deleted file mode 100644 (file)
index d113b46..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io015,-i Main.hs)
diff --git a/GHC_ONLY/io015/Makefile b/GHC_ONLY/io015/Makefile
new file mode 100644 (file)
index 0000000..4bf4b56
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io015
+EXTRA_RUNTESTFLAGS = -i Main.hs
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/io016/Jmakefile b/GHC_ONLY/io016/Jmakefile
deleted file mode 100644 (file)
index c9750d3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io016,Main.hs bar)
diff --git a/GHC_ONLY/io016/Makefile b/GHC_ONLY/io016/Makefile
new file mode 100644 (file)
index 0000000..fa4430b
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io016
+EXTRA_RUNTESTFLAGS = Main.hs bar
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/io017/Jmakefile b/GHC_ONLY/io017/Jmakefile
deleted file mode 100644 (file)
index 1c94626..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io017,-i io017.stdin)
diff --git a/GHC_ONLY/io017/Makefile b/GHC_ONLY/io017/Makefile
new file mode 100644 (file)
index 0000000..ec35e33
--- /dev/null
@@ -0,0 +1,3 @@
+TOP = ../../..
+PROG = io017
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/io018/Jmakefile b/GHC_ONLY/io018/Jmakefile
deleted file mode 100644 (file)
index 0e7a4c5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io018,)
diff --git a/GHC_ONLY/io018/Makefile b/GHC_ONLY/io018/Makefile
new file mode 100644 (file)
index 0000000..5be1f47
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io018
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/io019/Jmakefile b/GHC_ONLY/io019/Jmakefile
deleted file mode 100644 (file)
index 6d27401..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io019,)
diff --git a/GHC_ONLY/io019/Makefile b/GHC_ONLY/io019/Makefile
new file mode 100644 (file)
index 0000000..2f9ae74
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io019
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/io020/Jmakefile b/GHC_ONLY/io020/Jmakefile
deleted file mode 100644 (file)
index f768e9f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io020,)
diff --git a/GHC_ONLY/io020/Makefile b/GHC_ONLY/io020/Makefile
new file mode 100644 (file)
index 0000000..636449b
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io020
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/io021/Jmakefile b/GHC_ONLY/io021/Jmakefile
deleted file mode 100644 (file)
index e269c73..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(io021,)
diff --git a/GHC_ONLY/io021/Makefile b/GHC_ONLY/io021/Makefile
new file mode 100644 (file)
index 0000000..805960d
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = io021
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/net001/Jmakefile b/GHC_ONLY/net001/Jmakefile
deleted file mode 100644 (file)
index a34a1cb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(net001,-script ./not-really-hahaha)
diff --git a/GHC_ONLY/net001/Makefile b/GHC_ONLY/net001/Makefile
new file mode 100644 (file)
index 0000000..e472b66
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = net001
+EXTRA_RUNTESTFLAGS = -script ./not-really-hahaha
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/net002/Jmakefile b/GHC_ONLY/net002/Jmakefile
deleted file mode 100644 (file)
index ed16ab9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(net002,-script ./not-really-hahaha)
diff --git a/GHC_ONLY/net002/Makefile b/GHC_ONLY/net002/Makefile
new file mode 100644 (file)
index 0000000..fe9d9ba
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = net002
+EXTRA_RUNTESTFLAGS = -script ./not-really-hahaha
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/net003/Jmakefile b/GHC_ONLY/net003/Jmakefile
deleted file mode 100644 (file)
index d4edf08..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(net003,-script ./not-really-hahaha)
diff --git a/GHC_ONLY/net003/Makefile b/GHC_ONLY/net003/Makefile
new file mode 100644 (file)
index 0000000..29c92c0
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = net003
+EXTRA_RUNTESTFLAGS = -script ./not-really-hahaha
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/net004/Jmakefile b/GHC_ONLY/net004/Jmakefile
deleted file mode 100644 (file)
index 5b30b3f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(net004,-script ./not-really-hahaha)
diff --git a/GHC_ONLY/net004/Makefile b/GHC_ONLY/net004/Makefile
new file mode 100644 (file)
index 0000000..1091faf
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = net004
+EXTRA_RUNTESTFLAGS = -script ./not-really-hahaha
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/net005/Jmakefile b/GHC_ONLY/net005/Jmakefile
deleted file mode 100644 (file)
index 9a38949..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(net005,-script ./not-really-hahaha)
diff --git a/GHC_ONLY/net005/Makefile b/GHC_ONLY/net005/Makefile
new file mode 100644 (file)
index 0000000..0b10c26
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = net005
+EXTRA_RUNTESTFLAGS = -script ./not-really-hahaha
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/net006/Jmakefile b/GHC_ONLY/net006/Jmakefile
deleted file mode 100644 (file)
index 0ca6960..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(net006,-script ./not-really-hahaha)
diff --git a/GHC_ONLY/net006/Makefile b/GHC_ONLY/net006/Makefile
new file mode 100644 (file)
index 0000000..9654fd6
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = net006
+EXTRA_RUNTESTFLAGS = -script ./not-really-hahaha
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/net007/Jmakefile b/GHC_ONLY/net007/Jmakefile
deleted file mode 100644 (file)
index 5360e4a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(net007,-script ./not-really-hahaha)
diff --git a/GHC_ONLY/net007/Makefile b/GHC_ONLY/net007/Makefile
new file mode 100644 (file)
index 0000000..a647446
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = net007
+EXTRA_RUNTESTFLAGS = -script ./not-really-hahaha
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/net008/Jmakefile b/GHC_ONLY/net008/Jmakefile
deleted file mode 100644 (file)
index d742d71..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(net008,-script ./not-really-hahaha)
diff --git a/GHC_ONLY/net008/Makefile b/GHC_ONLY/net008/Makefile
new file mode 100644 (file)
index 0000000..1e99cea
--- /dev/null
@@ -0,0 +1,5 @@
+TOP = ../../..
+PROG = net008
+EXTRA_RUNTESTFLAGS = -script ./not-really-hahaha
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/obfuscated93/Jmakefile b/GHC_ONLY/obfuscated93/Jmakefile
deleted file mode 100644 (file)
index 6e7bb04..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-/* "winners" of 1993 Obfuscated Haskell contest */
-
-#define IHaveSubdirs
-
-SUBDIRS = hammond      \
-         launchbury    \
-         rittri
diff --git a/GHC_ONLY/obfuscated93/Makefile b/GHC_ONLY/obfuscated93/Makefile
new file mode 100644 (file)
index 0000000..aa8ddb9
--- /dev/null
@@ -0,0 +1,3 @@
+TOP = ../../..
+SUBDIRS = launchbury rittri
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/obfuscated93/launchbury/Jmakefile b/GHC_ONLY/obfuscated93/launchbury/Jmakefile
deleted file mode 100644 (file)
index 4c56ee7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(launchbury,-i launchbury.stdin)
diff --git a/GHC_ONLY/obfuscated93/launchbury/Makefile b/GHC_ONLY/obfuscated93/launchbury/Makefile
new file mode 100644 (file)
index 0000000..c4327df
--- /dev/null
@@ -0,0 +1,3 @@
+TOP = ../../../..
+PROG = launchbury
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/obfuscated93/rittri/Jmakefile b/GHC_ONLY/obfuscated93/rittri/Jmakefile
deleted file mode 100644 (file)
index 9207745..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(rittri,-i rittri.stdin)
diff --git a/GHC_ONLY/obfuscated93/rittri/Makefile b/GHC_ONLY/obfuscated93/rittri/Makefile
new file mode 100644 (file)
index 0000000..20cd20e
--- /dev/null
@@ -0,0 +1,3 @@
+TOP = ../../../..
+PROG = rittri
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/po001/Jmakefile b/GHC_ONLY/po001/Jmakefile
deleted file mode 100644 (file)
index 006576d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(po001,)
diff --git a/GHC_ONLY/po001/Makefile b/GHC_ONLY/po001/Makefile
new file mode 100644 (file)
index 0000000..fa5e65d
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = po001
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/po002/Jmakefile b/GHC_ONLY/po002/Jmakefile
deleted file mode 100644 (file)
index c91d170..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(po002,)
diff --git a/GHC_ONLY/po002/Makefile b/GHC_ONLY/po002/Makefile
new file mode 100644 (file)
index 0000000..cd0f638
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = po002
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/po003/Jmakefile b/GHC_ONLY/po003/Jmakefile
deleted file mode 100644 (file)
index 2baae62..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(po003,)
diff --git a/GHC_ONLY/po003/Makefile b/GHC_ONLY/po003/Makefile
new file mode 100644 (file)
index 0000000..c4c1c95
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = po003
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/po004/Jmakefile b/GHC_ONLY/po004/Jmakefile
deleted file mode 100644 (file)
index 7d32c11..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(po004,)
diff --git a/GHC_ONLY/po004/Makefile b/GHC_ONLY/po004/Makefile
new file mode 100644 (file)
index 0000000..a1fca98
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = po004
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/po005/Jmakefile b/GHC_ONLY/po005/Jmakefile
deleted file mode 100644 (file)
index 1653a31..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(po005,)
diff --git a/GHC_ONLY/po005/Makefile b/GHC_ONLY/po005/Makefile
new file mode 100644 (file)
index 0000000..0216a9c
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = po005
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/po006/Jmakefile b/GHC_ONLY/po006/Jmakefile
deleted file mode 100644 (file)
index fa946d7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(po006,)
diff --git a/GHC_ONLY/po006/Makefile b/GHC_ONLY/po006/Makefile
new file mode 100644 (file)
index 0000000..71fb296
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = po006
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/po007/Jmakefile b/GHC_ONLY/po007/Jmakefile
deleted file mode 100644 (file)
index cff168d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(po007,)
diff --git a/GHC_ONLY/po007/Makefile b/GHC_ONLY/po007/Makefile
new file mode 100644 (file)
index 0000000..2776a2e
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = po007
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/po008/Jmakefile b/GHC_ONLY/po008/Jmakefile
deleted file mode 100644 (file)
index 09c4b5e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(po008,)
diff --git a/GHC_ONLY/po008/Makefile b/GHC_ONLY/po008/Makefile
new file mode 100644 (file)
index 0000000..f4bd36b
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = po008
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/po009/Jmakefile b/GHC_ONLY/po009/Jmakefile
deleted file mode 100644 (file)
index 328548a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(po009,)
diff --git a/GHC_ONLY/po009/Makefile b/GHC_ONLY/po009/Makefile
new file mode 100644 (file)
index 0000000..f64a513
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = po009
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/po010/Jmakefile b/GHC_ONLY/po010/Jmakefile
deleted file mode 100644 (file)
index 1535ffb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(po010,)
diff --git a/GHC_ONLY/po010/Makefile b/GHC_ONLY/po010/Makefile
new file mode 100644 (file)
index 0000000..dd82f86
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = po010
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/po011/Jmakefile b/GHC_ONLY/po011/Jmakefile
deleted file mode 100644 (file)
index 29d2ea4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(po011,)
diff --git a/GHC_ONLY/po011/Makefile b/GHC_ONLY/po011/Makefile
new file mode 100644 (file)
index 0000000..bacc65b
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = po011
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/po012/Jmakefile b/GHC_ONLY/po012/Jmakefile
deleted file mode 100644 (file)
index c74d6df..0000000
+++ /dev/null
@@ -1 +0,0 @@
-NoFibOneModuleCompileAndRun(po012,)
diff --git a/GHC_ONLY/po012/Makefile b/GHC_ONLY/po012/Makefile
new file mode 100644 (file)
index 0000000..90e5d20
--- /dev/null
@@ -0,0 +1,4 @@
+TOP = ../../..
+PROG = po012
+include $(TOP)/nofib/mk/nofib.mk
+
diff --git a/GHC_ONLY/specialise/Jmakefile b/GHC_ONLY/specialise/Jmakefile
deleted file mode 100644 (file)
index f2585b3..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#define IHaveSubdirs
-
-SUBDIRS = spec001 \
-         /* spec002 */ \
-         spec003 \
-         /* code001 */ \
-         clausify001 \
-         clausify002 \
-         clausify003
-
-runtests::
-       @echo '###############################################################'
-       @echo '# GHC tests to *run* -- specialiser                           #'
-       @echo '###############################################################'
diff --git a/GHC_ONLY/specialise/Makefile b/GHC_ONLY/specialise/Makefile
new file mode 100644 (file)
index 0000000..0e57824
--- /dev/null
@@ -0,0 +1,3 @@
+TOP = ../../..
+SUBDIRS = $(wildcard spec* code* clausify*)
+include $(TOP)/nofib/mk/nofib.mk
diff --git a/GHC_ONLY/stable001/Jmakefile b/GHC_ONLY/stable001/Jmakefile
deleted file mode 100644 (file)
index c88478f..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# This is a test of my changes to the Glasgow Haskell Compiler to allow
-# C to call Haskell directly (stable pointers, performIO, etc.)
-# Note the change of compiler version!
-LIT2PGM=lit2pgm
-CC=gcc
-
-OBJS_O= Main.o Main_C.o
-
-NoFibMultiModuleCompileAndRun(stable001,)
-
-NoFibHaskellCompile(stable001,Main,hs)
-
-Main_C.o: Main_C.c
-       $(HC) -c -O Main_C.c
-
-Main_C.c: Main.lhs
-       $(LIT2PGM) -r C-code -l c -i Main.lhs -o Main_C.c
-
-Main.hs: Main.lhs
-       $(LIT2PGM) -i Main.lhs -o Main.hs
-
-/*
-       ${HASKELL} -C Main.hs '-#include "registers.h"'
-       ${HASKELL} -c Main.hc '-#include "registers.h"'
-
-Main:  Main.o Main_C.o
-       ${HASKELL} Main.o Main_C.o -o Main '-#include "registers.h"'
-*/
diff --git a/GHC_ONLY/stable001/Makefile b/GHC_ONLY/stable001/Makefile
new file mode 100644 (file)
index 0000000..e39330b
--- /dev/null
@@ -0,0 +1,12 @@
+TOP = ../../..
+PROG = stable001
+include $(TOP)/nofib/mk/nofib.mk
+
+Main_C.o: Main_C.c
+       $(HC) -c -O Main_C.c
+
+Main_C.c: Main.lhs
+       $(LIT2PGM) -r C-code -l c -i Main.lhs -o Main_C.c
+
+Main.hs: Main.lhs
+       $(LIT2PGM) -i Main.lhs -o Main.hs
index 91e77ab..2c20450 100644 (file)
@@ -73,7 +73,10 @@ ifndef SRCS
   SRCS = Main.hs
 endif
 
-OBJS = $(patsubst %.lhs, %.o, $(patsubst %.hs, %.o, $(SRCS)))
+OBJS = $(SRCS)
+OBJS := $(patsubst %.lhs, %.o, $(OBJS))
+OBJS := $(patsubst %.hs, %.o, $(OBJS))
+OBJS := $(patsubst %.hc, %.o, $(OBJS))
 
 define COMPILE
        @echo === compiling $(PROG)/$@ $(EXTRA_HCFLAGS) ===
@@ -93,6 +96,11 @@ endef
 %.l.o %.m.o %.n.o %.o.o %.p.o %.A.o %.B.o : %.lhs
        $(COMPILE)
 
+%.normal.o %.mc.o %.mr.o %.mt.o %.mp.o %.mg.o %.2s.o %.1s.o %.du.o \
+%.a.o %.b.o %.c.o %.d.o %.e.o %.f.o %.g.o %.h.o %.i.o %.j.o %.k.o \
+%.l.o %.m.o %.n.o %.o.o %.p.o %.A.o %.B.o : %.hc
+       $(COMPILE)
+
 $(PROG)_% : $(OBJS:.o=.%.o)
        @echo === linking $@ $(EXTRA_HCFLAGS) ===
        @$(TIME) $(HC) $(HCFLAGS) $(EXTRA_HCFLAGS) -o $@ $^ $(LIBS)