diff --git a/src/datalog/Makefile.in b/src/datalog/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..8a52f55325525dfa4d081e71844f4ba389c80e2f
--- /dev/null
+++ b/src/datalog/Makefile.in
@@ -0,0 +1,52 @@
+##########################################################################
+# #
+# ACG development toolkit #
+# #
+# Copyright 2008 INRIA #
+# #
+# More information on "http://acg.gforge.loria.fr/" #
+# License: CeCILL, see the LICENSE file or "http://www.cecill.info" #
+# Authors: see the AUTHORS file #
+# #
+# #
+# #
+# #
+# $Rev:: 211 $: Revision of last commit #
+# $Author:: pogodall $: Author of last commit #
+# $Date:: 2008-10-21 17:11:50 +0200 (#$: Date of last commit #
+# #
+##########################################################################
+
+include ../Makefile.master
+
+###############################
+# #
+# Set the following variables #
+# #
+###############################
+
+# Used libraries
+LIBS +=
+
+# The corresponding directories
+# (if not in the main ocaml lib directory,
+# ex. -I +campl4
+LIBDIR = -I +camlp4
+
+# Directories to which the current source files depend on
+PREVIOUS_DIRS =
+
+# Source files in the right order of dependance
+
+ML = signature.ml string_map.ml int_map.ml int_set.ml program.ml pmcfg.ml pmcfg_to_datalog.ml oriented_pmcfg.ml lexicalizer.ml pmcfg_syn.ml program_printer.ml prefix_correct_program.ml adornment2.ml magic_set_rewritting2.ml kanazawa_transform.ml datalog_solver.ml
+
+EXE_SOURCES = test.ml
+
+####################################
+# #
+# End of the configuration section #
+# #
+####################################
+
+include ../Makefile.common
+
diff --git a/src/datalog/adornment2.ml b/src/datalog/adornment2.ml
index 88c5b71db841bee5e104241284367afee0ce53bd..0137e76c6526317f63b394386a740b667dfe8ac7 100644
--- a/src/datalog/adornment2.ml
+++ b/src/datalog/adornment2.ml
@@ -1,3 +1,7 @@
+open Signature
+open Program
+open Int_set
+
module Adornment =
struct
type adornment = Ad of Signature.predicate*((int*bool) list)
diff --git a/src/datalog/datalog_solver.ml b/src/datalog/datalog_solver.ml
index f8156446bb0b9cf5d302601639ef6a50d1d13a13..b3e0af2ce86c4ecadd6a14f97f54d3da86bd1ab3 100644
--- a/src/datalog/datalog_solver.ml
+++ b/src/datalog/datalog_solver.ml
@@ -1,3 +1,7 @@
+open Signature
+open Int_map
+open Program
+
module Datalog_solver =
struct
diff --git a/src/datalog/kanazawa_transform.ml b/src/datalog/kanazawa_transform.ml
index 9d7443d774f80be8df2123d0a3cb5e119a72f2d7..29622f702d2be72965c296e09a1a924bd9514614 100644
--- a/src/datalog/kanazawa_transform.ml
+++ b/src/datalog/kanazawa_transform.ml
@@ -1,3 +1,13 @@
+open Adornment2
+open Program
+open Signature
+open Prefix_correct_program
+open Program_printer
+open Magic_set_rewritting2
+open Pmcfg
+open Oriented_pmcfg
+open Pmcfg_to_datalog
+
module Kanazawa_transform =
struct
let is_impermissible n=
diff --git a/src/datalog/magic_set_rewritting2.ml b/src/datalog/magic_set_rewritting2.ml
index c18993968d8df8e211d3a0e861c728b535086544..3ed16e9d2a9c344d3a0fe0d370c186d7a6e95a37 100644
--- a/src/datalog/magic_set_rewritting2.ml
+++ b/src/datalog/magic_set_rewritting2.ml
@@ -1,3 +1,9 @@
+open Adornment2
+open Signature
+open Program
+open Int_map
+
+
module Magic_set_rewritting =
struct
diff --git a/src/datalog/oriented_pmcfg.ml b/src/datalog/oriented_pmcfg.ml
index 25778295bb4cc9cefd3b4f6f614201ef4b054c56..35d6bb9793cb078730044df2b1bb0445002ba23b 100644
--- a/src/datalog/oriented_pmcfg.ml
+++ b/src/datalog/oriented_pmcfg.ml
@@ -1,3 +1,10 @@
+open Pmcfg
+open Signature
+open String_map
+open Int_map
+open Program
+
+
module Oriented_pmcfg =
struct open PMCFG
diff --git a/src/datalog/pmcfg.ml b/src/datalog/pmcfg.ml
index 54b58415ebc9d7c9bcda48a7c3835cff6a23aed4..594aea3adea6fc7e6bd6203cd53752e32afe9497 100644
--- a/src/datalog/pmcfg.ml
+++ b/src/datalog/pmcfg.ml
@@ -1,3 +1,9 @@
+open Signature
+open String_map
+open Int_map
+open Program
+
+
module PMCFG =
struct
type argument = Var of int | Val of string
diff --git a/src/datalog/pmcfg_syn.ml b/src/datalog/pmcfg_syn.ml
index e6bd1a6777a218bf2c1a5139b6bf8131b8416ce4..7c27322c934acb98c3c4dcf0971b4f26944770ec 100644
--- a/src/datalog/pmcfg_syn.ml
+++ b/src/datalog/pmcfg_syn.ml
@@ -1,3 +1,7 @@
+open Signature
+open String_map
+open Pmcfg
+
module PMCFG_syn =
struct
(*
@@ -14,7 +18,7 @@ RHS_ARG_LIST -> Ident F_RHS_ARG_LIST
F_RHS_ARG_LIST -> COMMA RHS_ARG_LIST | RPAR PREMISSES
*)
- open Lexicalizer
+open Lexicalizer.Lexicalizer
(*The parser*)
diff --git a/src/datalog/pmcfg_to_datalog.ml b/src/datalog/pmcfg_to_datalog.ml
index 9aa3d15e6c3bbf7a3ed6c14f032857030a4192dd..64fd4d2c0526e4e116c45b06f521c71bd7235c4e 100644
--- a/src/datalog/pmcfg_to_datalog.ml
+++ b/src/datalog/pmcfg_to_datalog.ml
@@ -1,3 +1,9 @@
+open Pmcfg
+open Signature
+open String_map
+open Int_map
+open Program
+
module PMCFG_to_datalog =
struct
open PMCFG
diff --git a/src/datalog/prefix_correct_program.ml b/src/datalog/prefix_correct_program.ml
index 38cdc22a46100f68f466d99c138230c6d4f7630f..9fa74b4ad0af5589f3d5225adcfb4a2185873d5e 100644
--- a/src/datalog/prefix_correct_program.ml
+++ b/src/datalog/prefix_correct_program.ml
@@ -1,3 +1,8 @@
+open Signature
+open Int_map
+open Program
+open Int_set
+
module Prefix_correct_program =
struct
diff --git a/src/datalog/program.ml b/src/datalog/program.ml
index 1a14e5356fec16345d499601da8e37ffa454bb49..6717bbee5c356e073f2724a59443428efff67891 100644
--- a/src/datalog/program.ml
+++ b/src/datalog/program.ml
@@ -1,3 +1,6 @@
+open Signature
+open Int_set
+
module Program =
struct
type predicate = Pred of (Signature.predicate*(int list))
diff --git a/src/datalog/program_printer.ml b/src/datalog/program_printer.ml
index 240f7114685f8c5eb6bccb939b38eca5f7aa2695..fbf2c51e80d88832159925e5e33774f5cb87e552 100644
--- a/src/datalog/program_printer.ml
+++ b/src/datalog/program_printer.ml
@@ -1,3 +1,6 @@
+open Program
+open Signature
+
module Program_printer =
struct
open Program
diff --git a/src/datalog/test.ml b/src/datalog/test.ml
index e6de8689cfe11e2b85e262ba8d78b3ae46b53a1d..1a1fac2f43048e25142b9ee05591febed4fa48e2 100644
--- a/src/datalog/test.ml
+++ b/src/datalog/test.ml
@@ -1,4 +1,4 @@
-#use "signature.ml";;
+(*#use "signature.ml";;
#use "string_map.ml";;
#use "int_map.ml";;
#use "int_set.ml";;
@@ -13,7 +13,13 @@
#use "adornment2.ml";;
#use "magic_set_rewritting2.ml";;
#use "kanazawa_transform.ml";;
-#use "datalog_solver.ml";;
+#use "datalog_solver.ml";;*)
+
+open Pmcfg_syn
+open Kanazawa_transform
+open Program_printer
+open Datalog_solver
+
(*opening the file containing the grammar, here gram.pmcfg*)
let ch_in = open_in "kan.pmcfg";;
(*parsing the grammar*)
diff --git a/src/utils/version.ml b/src/utils/version.ml
index 68f1f3d0d434176f9a3b7816ca3b295aa460b660..f25e4cf09fbcf0d41dfee5817462a79c20a7072b 100644
--- a/src/utils/version.ml
+++ b/src/utils/version.ml
@@ -17,7 +17,7 @@
(* *)
(**************************************************************************)
-DEFINE VERSION = "20081120"
+DEFINE VERSION = "20081201"
let version = VERSION