From 9d169a938905669d08dd17bc80182a099377bef5 Mon Sep 17 00:00:00 2001 From: mzp Date: Sat, 5 Sep 2009 07:48:32 +0900 Subject: [PATCH] bugfix: omake check run *-runner multily --- OMakefile | 2 -- base/src/OMakefile | 13 ------------- base/test/OMakefile | 11 ----------- xml/src/OMakefile | 29 ----------------------------- xml/test/.ocamlinit | 4 ---- xml/test/OMakefile | 18 ------------------ 6 files changed, 77 deletions(-) delete mode 100644 base/src/OMakefile delete mode 100644 base/test/OMakefile delete mode 100644 xml/src/OMakefile delete mode 100644 xml/test/.ocamlinit delete mode 100644 xml/test/OMakefile diff --git a/OMakefile b/OMakefile index e69c3cb..bce3559 100644 --- a/OMakefile +++ b/OMakefile @@ -135,8 +135,6 @@ public.OUnitTest(name,files) = check-$(name): $(target) $(addprefix ./,$(target)) - check-$(name): $(target) - $(addprefix ./,$(target)) check-detail-$(name): $(target) ($(addprefix ./,$(target)) -verbose ; true) | tee -a $(ROOT)/unittest.log diff --git a/base/src/OMakefile b/base/src/OMakefile deleted file mode 100644 index d234f4a..0000000 --- a/base/src/OMakefile +++ /dev/null @@ -1,13 +0,0 @@ -.PHONY: clean - -FILES[] = - base - hList - tuple - -LIB = base - -.DEFAULT: $(OCamlLibrary $(LIB), $(FILES)) - -clean: - ocaml-clean diff --git a/base/test/OMakefile b/base/test/OMakefile deleted file mode 100644 index 59ef869..0000000 --- a/base/test/OMakefile +++ /dev/null @@ -1,11 +0,0 @@ -.PHONY: clean - -OCAMLPACKS[] = - oUnit - -OCAMLINCLUDES += ../src - -OUnitTest(base,base) -OUnitTest(hList,hList base) -clean: - ocaml-clean diff --git a/xml/src/OMakefile b/xml/src/OMakefile deleted file mode 100644 index a998a17..0000000 --- a/xml/src/OMakefile +++ /dev/null @@ -1,29 +0,0 @@ -.PHONY: clean - -# package -OCAMLPACKS[] = - extlib - xml-light -UseCamlp4(pa_oo) - -# build -FILES[] = - abc - byte - code - disasm - easyXml - swfmill - parsec - code - -PROGRAM = habc-xml - -OCamlProgram($(PROGRAM), main $(FILES)) -OCamlLibrary($(PROGRAM), $(FILES)) - -# phony -.PHONY: clean -.DEFAULT: $(PROGRAM)$(EXE) -clean: - ocaml-clean $(PROGRAM)$(EXE) diff --git a/xml/test/.ocamlinit b/xml/test/.ocamlinit deleted file mode 100644 index d3fa175..0000000 --- a/xml/test/.ocamlinit +++ /dev/null @@ -1,4 +0,0 @@ -#directory "..";; -#use "../.ocamlinit";; -#require "oUnit";; -#load "testSupport.cmo";; \ No newline at end of file diff --git a/xml/test/OMakefile b/xml/test/OMakefile deleted file mode 100644 index 66e770a..0000000 --- a/xml/test/OMakefile +++ /dev/null @@ -1,18 +0,0 @@ -# package -OCAMLPACKS[] = - xml-light - extlib - oUnit - -# build -OCAMLINCLUDES += ../src - -OUnitTest(byte ,byte parsec) -OUnitTest(abc ,abc parsec disasm byte) -OUnitTest(swfmill,swfmill easyXml abc code byte disasm parsec) -OUnitTest(code ,code easyXml) - -# PHONY TARGET -.PHONY: check clean -clean: - ocaml-clean -- 2.11.0