some cleanup of standalone build

diff --git a/OMakefile b/OMakefile
index c3a0fddf0c972fe9283c54a485dd094ad0119bb5..04cceadc55976896d03e34724c11b03485042c55 100644 (file)
--- a/OMakefile
+++ b/OMakefile
@@ -1,3 +1,6 @@
+
+CLEAN = rm -f *.annot *.cmi *.cmo *.cmxa *.cmx *.o *.a *.opt
+
 JSON_LIB_DIR      = $(dir libs/json)
 JSON_GEN_CONV_DIR = $(dir gen/json_conv)
 JSON_RPC_LIB_DIR  = $(dir libs/jsonrpc)

diff --git a/gen/json_conv/OMakefile b/gen/json_conv/OMakefile
index 982c926a674e83648f1e7d7c0df6466ca7493ac9..c33bd915ebd9ed57fba277ae12867ddc9e99a01f 100644 (file)
--- a/gen/json_conv/OMakefile
+++ b/gen/json_conv/OMakefile
@@ -1,5 +1,3 @@
-.PHONY: clean
-
 GEN_FILES = parser.mli parser.ml lexer.ml
 OCamlGeneratedFiles($(GEN_FILES))
 
@@ -17,9 +15,9 @@ JSON_CONV = $(OCamlProgram $(JSON_CONV_PROG), $(CONV_FILES))
 
 .DEFAULT: $(JSON_CONV)
 
+.PHONY: clean
 clean:
-    rm -f $(filter-proper-targets $(ls R, .)) *.annot *.cmo
+       $(CLEAN) $(JSON_CONV)
 
 .SUBDIRS: tests
 
-export JSON_CONV_PROG JSON_CONV

diff --git a/gen/json_conv/tests/OMakefile b/gen/json_conv/tests/OMakefile
index 440dda98ed65f071ecdc6bfa3b9d5afc5b689c8b..881c00f418e23ad75d2d72109609ef80da4ba061 100644 (file)
--- a/gen/json_conv/tests/OMakefile
+++ b/gen/json_conv/tests/OMakefile
@@ -1,5 +1,3 @@
-.PHONY: clean
-
 OCAMLFLAGS += -I $(JSON_LIB_DIR)
 
 test_types_json_conv.ml: test_types.ml $(JSON_CONV)
@@ -18,6 +16,6 @@ TESTER = $(OCamlProgram $(TESTER_PROG), $(TESTER_FILES))
 
 .DEFAULT: $(TESTER)
 
+.PHONY: clean
 clean:
-    rm -f $(filter-proper-targets $(ls R, .)) *.annot *.cmo
-
+       $(CLEAN) $(TESTER)

diff --git a/gen/rpc/OMakefile b/gen/rpc/OMakefile
index c7ace70ec894df5e7a937ee139c18432c0485815..77893a0fcc70240eeca10bc7d97dd076e8e1c1cf 100644 (file)
--- a/gen/rpc/OMakefile
+++ b/gen/rpc/OMakefile
@@ -1,5 +1,3 @@
-.PHONY: clean
-
 syntax_json_conv.ml: syntax.ml $(JSON_CONV)
        $(JSON_GEN_CONV_DIR)/$(JSON_CONV_PROG) -i $< -o $@
 
@@ -19,7 +17,9 @@ GEN_RPC = $(OCamlProgram $(GEN_RPC_PROG), $(GEN_RPC_FILES))
 
 .DEFAULT: $(GEN_RPC)
 
+
+.PHONY: clean
 clean:
-       rm -f $(filter-proper-targets $(ls R, .)) *.annot *.cmo
+       $(CLEAN) $(GEN_RPC) syntax_json_conv.ml
 
 .SUBDIRS: tests

diff --git a/gen/rpc/tests/OMakefile b/gen/rpc/tests/OMakefile
index 021a835101b7a1e290d18d2e4835f6f3d9b231c1..fed949d445e1f4559d987638d225542fc121ff75 100644 (file)
--- a/gen/rpc/tests/OMakefile
+++ b/gen/rpc/tests/OMakefile
@@ -1,5 +1,3 @@
-.PHONY: clean
-
 rpc_types_json_conv.ml: rpc_types.ml $(JSON_CONV)
        $(JSON_GEN_CONV_DIR)/$(JSON_CONV_PROG) -i $< -o $@
 
@@ -23,6 +21,7 @@ RPC_TEST = $(OCamlProgram $(RPC_TEST_PROG), $(RPC_TEST_FILES))
 
 .DEFAULT: $(RPC_TEST)
 
+.PHONY: clean
 clean:
-       rm -f $(filter-proper-targets $(ls R, .)) *.annot *.cmo rpc_defns_client.ml rpc_defns_server.ml
+       $(CLEAN) $(RPC_TEST) rpc_defns_client.ml rpc_defns_server.ml
 

diff --git a/libs/http/OMakefile b/libs/http/OMakefile
index 5f80d3e26d0b5df9517723210612e6fc5694d3eb..ee930555424e2a76700ffb9e64acb8f73175f95b 100644 (file)
--- a/libs/http/OMakefile
+++ b/libs/http/OMakefile
@@ -1,5 +1,3 @@
-.PHONY: clean
-
 HTTP_FILES[] =
        http
 
@@ -8,7 +6,8 @@ HTTP_LIB = $(OCamlLibrary $(LIB), $(HTTP_FILES))
 
 .DEFAULT: $(HTTP_LIB)
 
+.PHONY: clean
 clean:
-    rm -f $(filter-proper-targets $(ls R, .)) *.annot *.cmo
+       $(CLEAN) $(HTTP_LIB)
 
 .SUBDIRS: tests

diff --git a/libs/http/tests/OMakefile b/libs/http/tests/OMakefile
index 4986567a42672702757163920ed4c4e769e45e18..2be4f6cf90724f50d206c8a4de87bbb556bf232a 100644 (file)
--- a/libs/http/tests/OMakefile
+++ b/libs/http/tests/OMakefile
@@ -1,5 +1,3 @@
-.PHONY: clean
-
 OCAMLFLAGS += -I $(HTTP_LIB_DIR)
 
 OCAML_LIBS += $(HTTP_LIB_DIR)/http
@@ -9,5 +7,6 @@ TEST_PARSER = $(OCamlProgram $(TEST_PARSER_PROG), test_http)
 
 .DEFAULT: $(TEST_PARSER)
 
+.PHONY: clean
 clean:
-    rm -f $(filter-proper-targets $(ls R, .)) *.annot *.cmo
+       $(CLEAN) $(TEST_PARSER)

diff --git a/libs/json/OMakefile b/libs/json/OMakefile
index 5ce3b3d1f9bbdf2a29b5dbc3087eda4f8fea3cd7..879f50398c8744a16d22cb85fb36a68be6c29f60 100644 (file)
--- a/libs/json/OMakefile
+++ b/libs/json/OMakefile
@@ -1,5 +1,3 @@
-.PHONY: clean
-
 JSON_FILES[] =
        json
        json_parse
@@ -10,7 +8,8 @@ JSON_LIB = $(OCamlLibrary $(LIB), $(JSON_FILES))
 
 .DEFAULT: $(JSON_LIB)
 
+.PHONY: clean
 clean:
-    rm -f $(filter-proper-targets $(ls R, .)) *.annot *.cmo
+       $(CLEAN) $(JSON_LIB)
 
 .SUBDIRS: parser_tests

diff --git a/libs/json/parser_tests/OMakefile b/libs/json/parser_tests/OMakefile
index 1380ba842ecfbda1908cd7066dc9fbccfe91dd1c..ba38681fc2dcc3157a4af290503afba4be47c617 100644 (file)
--- a/libs/json/parser_tests/OMakefile
+++ b/libs/json/parser_tests/OMakefile
@@ -1,6 +1,3 @@
-
-.PHONY: clean
-
 OCAMLFLAGS += -I $(JSON_LIB_DIR)
 
 OCAML_LIBS += $(JSON_LIB_DIR)/json
@@ -10,3 +7,7 @@ TEST_PARSER = $(OCamlProgram $(TEST_PARSER_PROG), test_parser)
 
 .DEFAULT: $(TEST_PARSER)
 
+
+.PHONY: clean
+clean:
+       $(CLEAN) $(TEST_PARSER)

diff --git a/libs/jsonrpc/OMakefile b/libs/jsonrpc/OMakefile
index 7b88d3ead5ddef7c5575ecc4e0548406ff0cf30a..39066f95840644197b0cda1077368571062f24b2 100644 (file)
--- a/libs/jsonrpc/OMakefile
+++ b/libs/jsonrpc/OMakefile
@@ -1,5 +1,3 @@
-.PHONY: clean
-
 OCAMLFLAGS += -I $(JSON_LIB_DIR)
 
 JSONRPC_FILES[] =
@@ -10,6 +8,6 @@ JSONRPC_LIB = $(OCamlLibrary $(LIB), $(JSONRPC_FILES))
 
 .DEFAULT: $(JSONRPC_LIB)
 
+.PHONY: clean
 clean:
-    rm -f $(filter-proper-targets $(ls R, .)) *.annot *.cmo
-
+       $(CLEAN) $(JSONRPC_LIB)