--- a/Admin/Benchmarks/HOL-datatype/IsaMakefile Sun Nov 15 15:13:31 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-
-## targets
-
-default: HOL-datatype
-images:
-test: HOL-datatype
-all: images test
-
-
-## global settings
-
-SRC = $(ISABELLE_HOME)/src
-OUT = $(ISABELLE_OUTPUT)
-LOG = $(OUT)/log
-
-
-## HOL-datatype
-
-HOL:
- @cd $(SRC)/HOL; $(ISABELLE_TOOL) make HOL
-
-HOL-datatype: HOL $(LOG)/HOL-datatype.gz
-
-$(LOG)/HOL-datatype.gz: $(OUT)/HOLBrackin.thy Instructions.thy SML.thy \
- Verilog.thy
- @cd ..; $(ISABELLE_TOOL) usedir -s HOL-datatype $(OUT)/HOL HOL-datatype
-
-
-## clean
-
-clean:
- @rm -f $(LOG)/HOL-datatype.gz
--- a/Admin/Benchmarks/HOL-record/IsaMakefile Sun Nov 15 15:13:31 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# $Id$
-#
-
-## targets
-
-default: HOL-record
-images:
-test: HOL-record
-all: images test
-
-
-## global settings
-
-SRC = $(ISABELLE_HOME)/src
-OUT = $(ISABELLE_OUTPUT)
-LOG = $(OUT)/log
-
-
-## HOL-record
-
-HOL:
- @cd $(SRC)/HOL; $(ISABELLE_TOOL) make HOL
-
-HOL-record: HOL $(LOG)/HOL-record.gz
-
-$(LOG)/HOL-record.gz: RecordBenchmark.thy
- @cd ..; $(ISABELLE_TOOL) usedir -s HOL-record $(OUT)/HOL HOL-record
-
-
-## clean
-
-clean:
- @rm -f $(LOG)/HOL-record.gz
--- a/Admin/Benchmarks/IsaMakefile Sun Nov 15 15:13:31 2009 +0100
+++ b/Admin/Benchmarks/IsaMakefile Sun Nov 15 15:14:02 2009 +0100
@@ -1,10 +1,7 @@
-#
-# $Id$
-#
## targets
-default: HOL-datatype
+default: all
images:
test: HOL-datatype HOL-record
all: images test
@@ -22,17 +19,23 @@
HOL:
@cd $(SRC)/HOL; $(ISABELLE_TOOL) make HOL
+
HOL-datatype: HOL $(LOG)/HOL-datatype.gz
-$(LOG)/HOL-datatype.gz: $(OUT)/HOL HOL-datatype/Brackin.thy \
- HOL-datatype/Instructions.thy HOL-datatype/SML.thy \
- HOL-datatype/Verilog.thy
- @$(ISABELLE_TOOL) usedir -s HOL-datatype $(OUT)/HOL HOL-datatype
+$(LOG)/HOL-datatype.gz: $(OUT)/HOL HOL-datatype/ROOT.ML \
+ HOL-datatype/Brackin.thy HOL-datatype/Instructions.thy \
+ HOL-datatype/SML.thy HOL-datatype/Verilog.thy
+ @$(ISABELLE_TOOL) usedir -s datatype $(OUT)/HOL HOL-datatype
+
+
+## HOL-record
HOL-record: HOL $(LOG)/HOL-record.gz
-$(LOG)/HOL-record.gz: HOL-record/RecordBenchmark.thy
- @$(ISABELLE_TOOL) usedir -s HOL-record $(OUT)/HOL HOL-record
+$(LOG)/HOL-record.gz: $(OUT)/HOL HOL-record/ROOT.ML \
+ HOL-record/RecordBenchmark.thy
+ @$(ISABELLE_TOOL) usedir -s record $(OUT)/HOL HOL-record
+
## clean