improve OMakefile

- delete duplicate declare NATIVE_ENABLED and BYTE_ENABLED to custamize this setting easilly
- NATIVE_ENABLED/BYTE_ENABLEDの設定が重複していたので削除しました。これで、この設定の変更が楽になりました

diff --git a/OMakefile b/OMakefile
index a4a5799..7f642b7 100644 (file)
--- a/OMakefile
+++ b/OMakefile
@@ -46,7 +46,7 @@ Shell. +=
 
 public.OUnitTest(name,files) =
        protected.test_file = $(addsuffix Test,$(name))
-       protected.target    = $(addsuffix .runner,$(test_file))
+       protected.target    = $(addsuffix .runner.run,$(test_file))
        protected.src_files = $(addprefix $(OUNIT_SRC_DIR),$(files))
 
        .PHONY: check check-$(name) clean
@@ -88,7 +88,7 @@ if $(not $(OCAMLFIND_EXISTS))
    eprintln('You need to install ocamlfind and run "omake --configure".')
    exit 1
 
-NATIVE_ENABLED = $(OCAMLOPT_EXISTS)
+NATIVE_ENABLED = false
 BYTE_ENABLED = true
 
 

diff --git a/base/OMakefile b/base/OMakefile
index 3e5756e..a9df4bc 100644 (file)
--- a/base/OMakefile
+++ b/base/OMakefile
@@ -1,8 +1,5 @@
 .PHONY: clean
 
-NATIVE_ENABLED = $(OCAMLOPT_EXISTS)
-BYTE_ENABLED = true
-
 FILES[] =
        base
        config

diff --git a/camlp4/OMakefile b/camlp4/OMakefile
index b3a8b24..c730b77 100644 (file)
--- a/camlp4/OMakefile
+++ b/camlp4/OMakefile
@@ -23,8 +23,6 @@ OCAMLINCLUDES += -I +camlp4
 #
 # The default values are defined as follows:
 #
-NATIVE_ENABLED = $(OCAMLOPT_EXISTS)
-BYTE_ENABLED = true
 
 #
 # Various options

diff --git a/driver/src/OMakefile b/driver/src/OMakefile
index 00f92db..e65e853 100644 (file)
--- a/driver/src/OMakefile
+++ b/driver/src/OMakefile
@@ -28,8 +28,6 @@ OCAMLINCLUDES += $(ROOT)/base
 #
 # The default values are defined as follows:
 #
-NATIVE_ENABLED = $(OCAMLOPT_EXISTS)
-BYTE_ENABLED = true
 
 #
 # Various options

diff --git a/driver/test/OMakefile b/driver/test/OMakefile
index 99e2e2c..898dac8 100644 (file)
--- a/driver/test/OMakefile
+++ b/driver/test/OMakefile
@@ -11,9 +11,6 @@ if $(not $(OCAMLFIND_EXISTS))
    eprintln(You need to install ocamlfind and run "omake --configure".)
    exit 1
 
-NATIVE_ENABLED = $(OCAMLOPT_EXISTS)
-BYTE_ENABLED = true
-
 OCAMLINCLUDES += ../src
 OCAMLINCLUDES += $(ROOT)/base/
 

diff --git a/scm/OMakefile b/scm/OMakefile
index ec6e372..977f329 100644 (file)
--- a/scm/OMakefile
+++ b/scm/OMakefile
@@ -7,9 +7,6 @@ if $(not $(OCAMLFIND_EXISTS))
    eprintln('You need to install ocamlfind and run "omake --configure".')
    exit 1
 
-NATIVE_ENABLED = $(OCAMLOPT_EXISTS)
-BYTE_ENABLED = true
-
 .SUBDIRS: test src
 
 clean:

diff --git a/scm/src/parser/lexer.ml b/scm/src/parser/lexer.ml
index 1fe8260..f240de3 100644 (file)
--- a/scm/src/parser/lexer.ml
+++ b/scm/src/parser/lexer.ml
@@ -2,6 +2,7 @@ open Base
 open Node
 open Parsec
 
+
 let kwd    =
   Node.lift (fun x -> Genlex.Kwd x)
 

diff --git a/xml/src/OMakefile b/xml/src/OMakefile
index 14b6674..3f71417 100644 (file)
--- a/xml/src/OMakefile
+++ b/xml/src/OMakefile
@@ -27,8 +27,6 @@ if $(not $(OCAMLFIND_EXISTS))
 #
 # The default values are defined as follows:
 #
-NATIVE_ENABLED = $(OCAMLOPT_EXISTS)
-BYTE_ENABLED = true
 
 #
 # Various options

diff --git a/xml/test/OMakefile b/xml/test/OMakefile
index b1d7693..4bd6bc0 100644 (file)
--- a/xml/test/OMakefile
+++ b/xml/test/OMakefile
@@ -13,9 +13,6 @@ if $(not $(OCAMLFIND_EXISTS))
 
 OCAMLINCLUDES += ../src
 
-NATIVE_ENABLED = $(OCAMLOPT_EXISTS)
-BYTE_ENABLED = true
-
 FILES[] =
     testSupport
     byteTest