Commit fe6d609c authored by Erwan Jahier's avatar Erwan Jahier

lurette 0.136 Mon, 19 May 2003 11:40:43 +0200 by jahier

Parent-Version:      0.135
Version-Log:

source/parse_env.ml:
source/formula.ml:
source/formula.mli:
source/env_state.ml:
source/env_state.mli:
source/automata.ml:
   Change the format of pragma to stick with how they are defined
   in the DC ref man.

   Also take into account programs that were added by yvan that
   let one know which control point in the source lutin program
   each lucky node correspond to.

source/lurette.ml:
   Display a better error msg when the sut and env vars do not match.

source/sim2chro.ml:
   Variables were not display in the same order as in their declaration
   (bug introduced in the previous change).

source/lurettetop.ml:
   The clean command does not remove everything in the tmp dir but only
   the generated files.

ihm/xlurette/xlurette_*.ml:
   The naming of rif files was not working properly.

   Add a clean-up button.

user-rules:
<various other makefiles>:
   Abstract away a few hard-code env var so that its works on cygwin

Project-Description: Lurette
parent 124c55f1
This diff is collapsed.
......@@ -5,10 +5,10 @@
# Where to find libs
INCDIRS = /home/jahier/$(HOST_TYPE)/lib
LIBDIRS = /home/jahier/$(HOST_TYPE)/lib
INCDIRS = $(HOME)/$(HOST_TYPE)/lib
LIBDIRS = $(HOME)/$(HOST_TYPE)/lib
OCAMLMAKEFILE = /home/jahier/lurette/OcamlMakefile
OCAMLMAKEFILE = $(HOME)/lurette/OcamlMakefile
LURETTE_PATH = /home/jahier/lurette
LURETTE_PATH = $(HOME)/lurette
......@@ -5,7 +5,7 @@
# For updates see:
# http://www.oefai.at/~markus/ocaml_sources
#
# $Id: OcamlMakefile 1.49 Thu, 17 Apr 2003 13:22:44 +0200 jahier $
# $Id: OcamlMakefile 1.50 Mon, 19 May 2003 11:40:43 +0200 jahier $
#
###########################################################################
......@@ -172,13 +172,13 @@ NCRESULT := $(addsuffix $(NCSUFFIX), $(RESULT))
TOPRESULT := $(addsuffix $(TOPSUFFIX), $(RESULT))
ifndef OCAMLC
OCAMLC := ocamlc
OCAMLC := ocamlc.opt
endif
export OCAMLC
ifndef OCAMLOPT
OCAMLOPT := ocamlopt
OCAMLOPT := ocamlopt.opt
endif
export OCAMLOPT
......@@ -238,7 +238,7 @@ endif
export CAMLP4
ifndef OCAMLDOC
OCAMLDOC := ocamldoc
OCAMLDOC := ocamldoc.opt
endif
export OCAMLDOC
......
*********** BUGS
* Attention, les gens ne peuvent pas appeler leur variables ok !!!
* Quand on modifie le .lus, je ne recompile pas tout ce qu'il semble t'il ??
*********** A faire maintenant
* attention, xlurette suppose que j'ai du lustre (appel de lusinfo),
alors que j'avais dit que ca aurait pu etre du c ...
* Si l'execution se termine normalement (ie, a la fin de l'expression
reguliere), changer le message d'erreur.
* mettre qques part que j'utilise ocaml, camlidl cuddaux, mlcuddidl,
polka, gmp,autoconf, make, gcc, emacs, latex, dot, gtk, sim2chro, ...
* Mettre les .c generes dans share
* lurettetop :utilise Filename.temp_file pour creer un repertoire temporaire
pour lurette.
......@@ -26,8 +37,6 @@ la verif de type en meme temps que le parsing ->
(1) Portage pour scade et esterel windows ...
-> structure, tableau, types structures, etc.
* le losange ne passe pas avec polkai et passe avec polkag.
Regarder pourquoi et dire à Bertrand
(2) Traiter les variables stables (signaux purs)
......@@ -38,6 +47,10 @@ la verif de type en meme temps que le parsing ->
(2) Faire une doc utilisateur pour lurette (moins urgent depuis qu'il y
a lurettetop et xlurette...)
* le losange ne passe pas avec polkai et passe avec polkag.
Regarder pourquoi et dire à Bertrand
* Inferer la croix, plutot que de verifier !!!
* La notion d'epaisseur est mal branlée, surtout en presence de var
......@@ -89,7 +102,7 @@ la verif de type en meme temps que le parsing ->
* Chercher a detecter des egalites lors de l'ajout d'une inegalité.
(cf code commenter dans store.ml)
(cf code commenté dans store.ml)
* xlurette :
- bouton sim2chro ; mettre les locales en vert -> pragma dans sim2chro !!
......
......@@ -12,18 +12,20 @@ SRCDIR = $(shell pwd)
#
# XXX autoconf
CUDD_INSTALL = /home/jahier/$(HOSTTYPE)
CUDD_INSTALL = $(HOME)/$(HOSTTYPE)
ifndef BIN_INSTALL_DIR
BIN_INSTALL_DIR := /home/jahier/$(HOSTTYPE)/bin
BIN_INSTALL_DIR := $(HOME)/$(HOSTTYPE)/bin
endif
ifndef INC_INSTALL_DIR
INC_INSTALL_DIR := /home/jahier/$(HOSTTYPE)/include
INC_INSTALL_DIR := $(HOME)/$(HOSTTYPE)/include
endif
ifndef LIB_INSTALL_DIR
LIB_INSTALL_DIR := /home/jahier/$(HOSTTYPE)/lib
LIB_INSTALL_DIR := $(HOME)/$(HOSTTYPE)/lib
endif
......
......@@ -30,9 +30,37 @@ opt: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//((Unix.getenv \"LURETTE_PATH\") \^ \"\/share\/pixmaps\/\" \^ \"/' \
| sed -e 's/\"pixmaps\//((Unix.getenv \"PIXMAP_DIR\") \^ \"/' \
| sed -e 's/.xpm\"/.xpm\")/' \
> xlurette_glade_interface.ml
ocamlopt.opt -verbose -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlopt.opt -verbose -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlopt.opt -verbose -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlopt.opt -verbose -I +lablgtk -I +str -labels -o xlurette unix.cmxa lablgtk.cmxa gtkInit.cmx \
xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
try: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//\"/' \
| sed -e 's/.xpm\"/.xpm\"/' \
> xlurette_glade_interface.ml
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlopt.opt -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
ocamlopt.opt -I +lablgtk -I +str -labels -o xlurette unix.cmxa lablgtk.cmxa gtkInit.cmx \
xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
cyg: dummy
mlglade xlurette.glade
mv xlurette_glade_interface.ml xlurette_glade_interface.ml0
cat xlurette_glade_interface.ml0 \
| sed -e 's/\"pixmaps\//(Filename.concat (Unix.getenv \"LURETTE_PATH\") (Filename.concat \"share\" (Filename.concat \"pixmaps\" \"/' \
| sed -e 's/.xpm\"/.xpm\")))/' \
> xlurette_glade_interface.ml
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_interface.ml
ocamlopt.opt -c -I +lablgtk -labels -c xlurette_glade_callbacks.ml
ocamlopt.opt -c -pp "camlp4o" -I +lablgtk $(THREAD) -c xlurette_glade_main.ml
......@@ -52,9 +80,6 @@ opt_opt: dummy
ocamlopt.opt -I +lablgtk -I +str -labels -o xlurette unix.cmxa lablgtk.cmxa gtkInit.cmx \
xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx
# ocamlopt.opt -cclib /usr/openwin/lib/libXext.a -cclib /usr/openwin/lib/libX11.a -cclib /usr/local/lib/libglib.a -cclib /usr/local/lib/libgdk.a -cclib /usr/local/lib/libgtk.a -cclib /usr/local/lib/libgmodule.a -cclib -L/usr/openwin/lib -I /home/jahier/sparc-sun/lib -I +lablgtk -I +str -labels -o xlurette str.cmxa unix.cmxa lablgtk.cmxa gtkInit.cmx xlurette_glade_callbacks.cmx xlurette_glade_interface.cmx xlurette_glade_main.cmx -cclib -v
......
......@@ -626,7 +626,7 @@
<widget>
<class>GtkScrolledWindow</class>
<name>scrolledwindow2</name>
<name>scrolled_output_window</name>
<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
......@@ -643,7 +643,7 @@
<can_default>True</can_default>
<has_default>True</has_default>
<can_focus>True</can_focus>
<editable>False</editable>
<editable>True</editable>
<text></text>
</widget>
</widget>
......@@ -750,7 +750,24 @@
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>button36</name>
<name>clean_up_button</name>
<border_width>4</border_width>
<width>150</width>
<height>100</height>
<tooltip>Clean-up intermediary files (to try when xlurette seems to be broken)</tooltip>
<signal>
<name>clicked</name>
<handler>on_clean_up_button_clicked</handler>
<last_modification_time>Fri, 16 May 2003 14:18:29 GMT</last_modification_time>
</signal>
<label> </label>
<icon>clean-up.xpm</icon>
</widget>
<widget>
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>button38</name>
<border_width>4</border_width>
<width>150</width>
<height>100</height>
......
......@@ -404,16 +404,16 @@ let _ = tooltips#set_tip ~text:"Environment file name: its input (resp output) v
let _ = env_name_entry#set_editable true in
let _ = env_name_entry#set_visibility true in
let _ = env_name_entry#set_max_length 0 in
let scrolledwindow2 = GBin.scrolled_window
let scrolled_output_window = GBin.scrolled_window
~hpolicy:`AUTOMATIC
~vpolicy:`AUTOMATIC
~packing:(vpaned2#add )
()
in
let output_window = GEdit.text
~packing:scrolledwindow2#add
~packing:scrolled_output_window#add
~height:300
~editable:false
~editable:true
()
in
......@@ -466,12 +466,18 @@ let button20 = toolbar4#insert_button
()
in
let _ = tooltips#set_tip ~text:"Stop the current run" button20#coerce in
let button36 = toolbar4#insert_button
let clean_up_button = toolbar4#insert_button
~text: " "
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "LURETTE_PATH") ^ "/share/pixmaps/" ^ "clean-up.xpm") ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Clean-up intermediary files (to try when xlurette seems to be broken)" clean_up_button#coerce in
let button38 = toolbar4#insert_button
~text: " "
~icon:(GMisc.pixmap (GDraw.pixmap_from_xpm ~file:((Unix.getenv "LURETTE_PATH") ^ "/share/pixmaps/" ^ "close.xpm") ()) ())#coerce
()
in
let _ = tooltips#set_tip ~text:"Quit xlurette" button36#coerce in
let _ = tooltips#set_tip ~text:"Quit xlurette" button38#coerce in
let label9 = GMisc.label
~text: "Run "
~xalign:0.5
......@@ -1247,8 +1253,10 @@ let _ = button14#connect#clicked
~callback:callbacks#call_sim2chro_clicked in
let _ = button2#connect#clicked
~callback:callbacks#save_session in
let _ = button36#connect#clicked
let _ = button38#connect#clicked
~callback:callbacks#quit in
let _ = clean_up_button#connect#clicked
~callback:callbacks#on_clean_up_button_clicked in
let _ = button20#connect#clicked
~callback:callbacks#stop_run in
let _ = button19#connect#clicked
......@@ -1310,7 +1318,7 @@ method oracle_node = oracle_node
method oracle_node_entry = oracle_node
method env_name = env_name
method env_name_entry = env_name
method scrolledwindow2 = scrolledwindow2
method scrolled_output_window = scrolled_output_window
method output_window = output_window
method hbox1 = hbox1
method toolbar4 = toolbar4
......@@ -1318,7 +1326,8 @@ method button17 = button17
method button18 = button18
method button19 = button19
method button20 = button20
method button36 = button36
method clean_up_button = clean_up_button
method button38 = button38
method label9 = label9
method option_panel = option_panel
method vbox8 = vbox8
......
......@@ -4,12 +4,13 @@ open GtkEdit
open GtkList
let debug =
(* true *)
false
(* true *)
false
let pid = ref 0
let lpid = ref 0
let rif_file = ref ""
(* Flag telling if any saved package need to be restored *)
let restore = ref false
......@@ -36,6 +37,7 @@ type tok = Genlex.token Stream.t
let ok_str = " OK!
"
(**************************************************************************)
let (give_fresh_file_name : string -> string -> string) =
......@@ -44,16 +46,15 @@ let (give_fresh_file_name : string -> string -> string) =
fun i ->
let file = (prefix ^ (string_of_int i) ^ suffix) in
if
not (Sys.file_exists file)
Sys.file_exists file
then
file
else
give_fresh_file_name_aux (i+1)
else
file
in
give_fresh_file_name_aux 1
let rif_file = ref ""
let get_rif_file _ = !rif_file
......@@ -153,14 +154,19 @@ let (lusinfo : string -> string list) =
in
let cmd = ("lusinfo " ^ file_lus ^ " nodes > " ^ file_info) in
let _ =
if Sys.file_exists file_info then Sys.remove file_info;
if
((Sys.command cmd) <> 0)
then
Sys.file_exists file_lus
then
(
output_string stdout ("*** lusinfo failed.\n" ^ cmd ^ "\n");
flush stdout
)
if Sys.file_exists file_info then Sys.remove file_info;
if
((Sys.command cmd) <> 0)
then
(
output_string stdout ("*** lusinfo failed.\n" ^ cmd ^ "\n");
flush stdout
)
);
in
let ic = open_in file_info in
let nodes = readfile_line ic [] in
......@@ -291,7 +297,13 @@ class customized_callbacks = object(self)
method show_step_window () =
self#top_step_by_step_window#step_by_step_window#show ()
method on_clean_up_button_clicked () =
output_string oc ("clean \n");
flush oc;
prerr_endline "Clean-up temporary files ...";
()
(* sut file selection window *)
method browse_sut_clicked () =
......@@ -426,7 +438,9 @@ class customized_callbacks = object(self)
method call_sim2chro_clicked () =
let cmd_display =
("set_output " ^ (get_rif_file ()) ^ "\n" ^ "sim2chro\n") in
if (get_rif_file ()) = "" then "" else
("set_output \"" ^ (get_rif_file ()) ^ "\"\n" ^ "sim2chro\n")
in
output_string oc cmd_display ;
if debug then output_string stderr cmd_display;
......@@ -458,7 +472,7 @@ class customized_callbacks = object(self)
let rif_file = (get_rif_file ()) in
let cmd_rif_file =
if rif_file = "" then "" else ("set_output " ^ rif_file ^ "\n")
if rif_file = "" then "" else ("set_output \"" ^ rif_file ^ "\"\n")
in
let cmd_step =
......@@ -633,8 +647,8 @@ class customized_callbacks = object(self)
update_rif_file_name
self#top_xlurette#rif_file_basename#text
(remove_extension self#top_xlurette#sut_name#entry#text)
(remove_extension self#top_xlurette#env_name#entry#text)
(remove_extension self#top_xlurette#sut_name_entry#entry#text)
(remove_extension self#top_xlurette#env_name_entry#entry#text)
self#top_xlurette#test_length#text ;
......@@ -659,6 +673,8 @@ class customized_callbacks = object(self)
self#top_xlurette#output_window#insert msg
method save_session () =
output_string oc ("pack " ^ self#top_xlurette#saved_session_file#text ^ " \n");
flush oc;
......@@ -936,13 +952,23 @@ let main () =
let _ =
(* Check that LURETTE_PATH env var is set. *)
try
Sys.getenv "LURETTE_PATH"
Sys.getenv "LURETTE_PATH";
with Not_found ->
(
print_string "*** Can not run xlurette, sorry. \n***";
print_string "You need to set the LURETTE_PATH env variable properly.\n";
flush stdout;
exit 2;
) ;
(* Check that PIXMAP_DIR env var is set. *)
try
Sys.getenv "PIXMAP_DIR";
with Not_found ->
(
print_string "*** Can not run xlurette, sorry. \n***";
print_string "You need to set the PIXMAP_DIR env variable properly.\n";
flush stdout;
exit 2;
)
in
let callbacks = new customized_callbacks in
......@@ -1033,8 +1059,8 @@ let main () =
if (callbacks#get_env () = "") then callbacks#set_env env_saved;
xlurette#xlurette#show() ;
xlurette#xlurette#connect#destroy ~callback: quit;
let _ = xlurette#xlurette#connect#destroy ~callback: quit in
let _ = Timeout.add ~ms:100 ~callback:callbacks#read_pipe in
Main.main ()
......
This diff is collapsed.
......@@ -8,22 +8,22 @@ SRCDIR = $(PWD)
#
# XXX autoconf !!!
CAML_INSTALL = /home/jahier/$(HOSTTYPE)
CUDD_INSTALL = /home/jahier/$(HOSTTYPE)
CAML_INSTALL = $(HOME)/$(HOSTTYPE)
CUDD_INSTALL = $(HOME)/$(HOSTTYPE)
#
# Where to install libs
#
ifndef BIN_INSTALL_DIR
BIN_INSTALL_DIR := /home/jahier/$(HOSTTYPE)/bin
BIN_INSTALL_DIR := $(HOME)/$(HOSTTYPE)/bin
endif
ifndef INC_INSTALL_DIR
INC_INSTALL_DIR := /home/jahier/$(HOSTTYPE)/include
INC_INSTALL_DIR := $(HOME)/$(HOSTTYPE)/include
endif
ifndef LIB_INSTALL_DIR
LIB_INSTALL_DIR := /home/jahier/$(HOSTTYPE)/lib
LIB_INSTALL_DIR := $(HOME)/$(HOSTTYPE)/lib
endif
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -6,15 +6,15 @@
# Installation directory prefix
#
CAML_INSTALL = /home/jahier/$(HOSTTYPE)
CAMLIDL_INSTALL = /home/jahier/$(HOSTTYPE)
CAML_INSTALL = $(HOME)/$(HOSTTYPE)
CAMLIDL_INSTALL = $(HOME)/$(HOSTTYPE)
GMP_INSTALL=$(HOME)/$(HOSTTYPE)
PREFIX = $(POLKA_INSTALL)
# C include and lib directories
INCDIR = /home/jahier/$(HOSTTYPE)/include
LIBDIR = /home/jahier/$(HOSTTYPE)/lib
BINDIR = /home/jahier/$(HOSTTYPE)/bin
INCDIR = $(HOME)/$(HOSTTYPE)/include
LIBDIR = $(HOME)/$(HOSTTYPE)/lib
BINDIR = $(HOME)/$(HOSTTYPE)/bin
#
# Where to find GMP (here, $(GMP_INSTALL)/include, $(GMP_INSTALL)/lib)
#
......
matrix.cmi: vector.cmi
poly.cmi: matrix.cmi vector.cmi
polka.cmo: polka.cmi
polka.cmx: polka.cmi
vector.cmo: polka.cmi polka_lexer.cmi polka_parser.cmi vector.cmi
vector.cmx: polka.cmx polka_lexer.cmi polka_parser.cmx vector.cmi
matrix.cmo: polka.cmi vector.cmi matrix.cmi
matrix.cmx: polka.cmx vector.cmx matrix.cmi
poly.cmo: matrix.cmi vector.cmi poly.cmi
poly.cmx: matrix.cmx vector.cmx poly.cmi
polka_parser.cmo: polka.cmi polka_parser.cmi
polka_parser.cmx: polka.cmx polka_parser.cmi
polka_parser.cmi: polka.cmi
polka_lexer.cmi: polka_parser.cmi
polkaIO.cmo: matrix.cmi polka.cmi poly.cmi vector.cmi polkaIO.cmi
polkaIO.cmx: matrix.cmx polka.cmx poly.cmx vector.cmx polkaIO.cmi
polkaIO.cmi: matrix.cmi poly.cmi vector.cmi
......@@ -15,7 +15,7 @@ INCLUDEDIRS = -I@LURETTEPATH@/@HOST_TYPE@/include -I$(USER_TESTING_DIR)
LIBDIRS = -L@LURETTEPATH@/@HOST_TYPE@/lib
LIBS = -lgmp -lm -ldl
LIBS = -lgmp -lm
SOURCES_C = ocaml2c_stubs.c $(SUT) lurette__sut.c $(ORACLE) lurette__oracle.c lurette_exe.c call_lurette_main.c
......
......@@ -4,9 +4,13 @@
AC_INIT(Makefile.lurette.in)
unset LANG
unset LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
if test $prefix = NONE; then
LURETTEPATH=$PWD/..
LURETTEPATH=$(shell pwd)/..
else
LURETTEPATH=$prefix
fi
......@@ -14,14 +18,14 @@ fi
AC_SUBST(LURETTEPATH)
# HOSTTYPE value is system dependent
case $HOSTTYPE in
*linux*) HOST_TYPE=i386-linux ;;
*sun*) HOST_TYPE=sparc-sun ;;
*sparc*) HOST_TYPE=sparc-sun ;;
*) AC_MSG_ERROR(Unsupported architecture);;
esac
# Determine the system type
case `./config.guess` in
i*86-pc-linux-*) HOST_TYPE=i386-linux ;;
sparc-sun-solaris2.*) HOST_TYPE=sparc-sun ;;
i*86-*-cygwin) HOST_TYPE=cygwin ;;
*) AC_MSG_ERROR(Unsupported architecture);;
esac
AC_SUBST(HOST_TYPE)
......@@ -55,9 +59,6 @@ if test "$EC2C" = no ; then
EC2C=ec2c
fi
AC_SUBST(LUS2EC)
AC_SUBST(EC2C)
......@@ -97,10 +98,8 @@ echo " in your .bashrc (resp .cshrc)."
echo
echo " if you want to install tools anywhere else than lurette-XXX/$HOST_TYPE/{bin,lib}"
echo " you can type "
echo " ./configure --prefix=<where to install bins and libs>"
echo " and then do a "
echo " make install"
echo " in the share directory"
echo " cd share "
echo " ./configure --prefix <where to install bins and libs>"
echo
echo " bye!"
......
......@@ -2,9 +2,10 @@
# Set up environment variables needed by lucky, lurettetop, and xlurette
# (csh syntax)
echo "sourcing the content of lucky_init.csh..."
setenv LURETTE_PATH @LURETTEPATH@
setenv PIXMAP_DIR @LURETTEPATH@/share/pixmaps/
set path=(@LURETTEPATH@/@HOST_TYPE@/bin $path)
setenv PS_VIEWER @GV@
......
......@@ -2,9 +2,10 @@
# Set up environment variables needed by lucky, lurettetop, and xlurette
# (sh syntax)
echo "sourcing the content of lucky_init.sh..."
export LURETTE_PATH=@LURETTEPATH@
export PIXMAP_DIR=@LURETTEPATH@/share/pixmaps/
export path=@LURETTEPATH@/@HOST_TYPE@/bin $path
export PS_VIEWER=@GV@
......
......@@ -14,87 +14,87 @@ INC_INSTALL_DIR = $(LURETTE_PATH)/$(HOST_TYPE)/include
liblurette_lib_nc.a:
cd lurette_util ; rm *; \
ar rcs liblurette_lib_nc.a ../lurette_lib.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libcudd_caml.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcudd_caml.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libcuddaux.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcuddaux.a ;\
ar r liblurette_lib_nc.a ../lurette_lib.o *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libcudd.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcudd.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libpolkag_caml.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libpolkag_caml.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libpolkag.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libpolkag.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libcamlidl.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcamlidl.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libmtr.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libmtr.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libst.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libst.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libepd.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libepd.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libutil.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libutil.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/ocaml/libstr.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/ocaml/libstr.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/ocaml/libasmrun.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/ocaml/libasmrun.a ;\
ar r liblurette_lib_nc.a *.o ; rm *.o ;\
cp liblurette_lib_nc.a ..
liblurette_lib_bc.a:
cd lurette_util ;rm * ;\
ar rcs liblurette_lib_bc.a ../lurette_lib.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libcudd_caml.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcudd_caml.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libcuddaux.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcuddaux.a ;\
ar r liblurette_lib_bc.a ../lurette_lib.o *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libcudd.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcudd.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libpolkag_caml.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libpolkag_caml.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libpolkag.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libpolkag.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libcamlidl.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcamlidl.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libmtr.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libmtr.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libst.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libst.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libepd.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libepd.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libutil.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libutil.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/ocaml/libstr.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/ocaml/libstr.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/ocaml/libcamlrun.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/ocaml/libcamlrun.a ;\
ar r liblurette_lib_bc.a *.o ; rm *.o ;\
cp liblurette_lib_bc.a ..
liblurette_lib_dc.a:
cd lurette_util ;rm * ;\
ar rcs liblurette_lib_dc.a ../lurette_lib.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libcudd_caml.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcudd_caml.a ;\
ar r liblurette_lib_dc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libcuddaux_debug.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcuddaux_debug.a ;\
ar r liblurette_lib_dc.a ../lurette_lib.o *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libcudd.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcudd.a ;\
ar r liblurette_lib_dc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libpolkag_caml.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libpolkag_caml.a ;\
ar r liblurette_lib_dc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libpolkag.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libpolkag.a ;\
ar r liblurette_lib_dc.a *.o ; rm *.o ;\
ar x /home/jahier/$(HOST_TYPE)/lib/libcamlidl.a ;\
ar x $(HOME)/$(HOST_TYPE)/lib/libcamlidl.a ;\