fix

diff --git a/scm/OMakefile b/scm/OMakefile
index 97096b7..b3e6361 100644 (file)
--- a/scm/OMakefile
+++ b/scm/OMakefile
@@ -29,6 +29,7 @@ PROGRAM = habc-scm
 OCamlProgram($(PROGRAM), main $(FILES))
 AddDepend(codegen.cmx,$(ROOT)/swflib.cmx)
 
+
 # ------------------------------
 # phony
 # ------------------------------

diff --git a/scm/codegen/OMakefile b/scm/codegen/OMakefile
index f78f0bf..5882cfc 100644 (file)
--- a/scm/codegen/OMakefile
+++ b/scm/codegen/OMakefile
@@ -14,6 +14,7 @@ OCAMLOPTLINK= ocamlopt
 
 # test
 OUNIT_LIBS+=astUtil
+OUNIT_LIBS+=$(ROOT)/swflib
 
 OUnitTest(closureTrans , closureTrans module)
 OUnitTest(codegenExpr  , codegen)
@@ -25,7 +26,7 @@ OUnitTest(binding      , binding module)
 
 # phony
 .PHONY: clean
-.DEFAULT: $(OCamlPackage $(PROGRAM), $(FILES))
+.DEFAULT: $(MyOCamlPackage $(PROGRAM), $(FILES))
 
 
 match_body.h: gen_inst$(EXE) instruction.txt

diff --git a/scm/codegen/codegenClassTest.ml b/scm/codegen/codegenClassTest.ml
index 0c1ee03..208f53a 100644 (file)
--- a/scm/codegen/codegenClassTest.ml
+++ b/scm/codegen/codegenClassTest.ml
@@ -1,10 +1,11 @@
 open Base
-open Asm
-open Cpool
+
 open Codegen
 open OUnit
 open AstUtil
-open MethodType
+open Swflib
+open Swflib.MethodType
+open Swflib.Cpool
 
 let qname ns x =
   `QName ((`Namespace (String.concat "." ns)),x)

diff --git a/scm/codegen/codegenExprTest.ml b/scm/codegen/codegenExprTest.ml
index 334f0e8..9430b9e 100644 (file)
--- a/scm/codegen/codegenExprTest.ml
+++ b/scm/codegen/codegenExprTest.ml
@@ -3,7 +3,8 @@ open Codegen
 open OUnit
 open Binding
 open AstUtil
-open MethodType
+open Swflib
+open Swflib.MethodType
 
 let join xs =
   String.concat "." xs

diff --git a/scm/filter/OMakefile b/scm/filter/OMakefile
index a655597..44f83e6 100644 (file)
--- a/scm/filter/OMakefile
+++ b/scm/filter/OMakefile
@@ -14,7 +14,7 @@ OUnitTest(binding, binding)
 OUnitTest(rename, rename)
 
 # phony
-.DEFAULT: $(OCamlPackage $(PROGRAM), $(FILES))
+.DEFAULT: $(MyOCamlPackage $(PROGRAM), $(FILES))
 .PHONY: clean
 clean:
        ocaml-clean

diff --git a/scm/parser/OMakefile b/scm/parser/OMakefile
index 57a6149..23172e5 100644 (file)
--- a/scm/parser/OMakefile
+++ b/scm/parser/OMakefile
@@ -19,6 +19,6 @@ OUnitTest(lisp  ,lisp sexp parsec lexer)
 
 # phony
 .PHONY: clean
-.DEFAULT: $(OCamlPackage $(PROGRAM), $(FILES))
+.DEFAULT: $(MyOCamlPackage $(PROGRAM), $(FILES))
 clean:
        ocaml-clean closTrans.mli

diff --git a/swflib/OMakefile b/swflib/OMakefile
index b159dc3..3281867 100644 (file)
--- a/swflib/OMakefile
+++ b/swflib/OMakefile
@@ -29,7 +29,7 @@ OCAML_LIBS    += $(ROOT)/base/base
 OCAMLOPT   = ocamlopt -for-pack $(capitalize $(basename $(PROGRAM)))
 OCAMLOPTLINK= ocamlopt
 
-.DEFAULT: $(OCamlPackage $(PROGRAM), $(FILES))
+.DEFAULT: $(MyOCamlPackage $(PROGRAM), $(FILES))
 
 OCamlProgram(gen_inst,gen_inst)
 OCamlProgram(gen_typemap,gen_typemap)