Fix the lutin manual build process

Makefile

@@ -2,7 +2,7 @@ ifndef LURETTE_PATH
   LURETTE_PATH=$(PWD)
 endif
 
-all:build
+all:build man
 
 -include ./Makefile.version
 -include ./Makefile.local

_oasis

 OASISFormat: 0.4
 Name:        Lutin
-Version:     2.38
+Version:     2.39
 Authors:     Erwan Jahier
 Maintainers: erwan.jahier@imag.fr
 License:     PROP
-Plugins:     DevFiles (0.4), META (0.4)
+Plugins:     DevFiles (0.4), META (0.4), StdFiles (0.4)
 Synopsis:    Lutin: modeling stochastic reactive systems.
 Homepage:    http://www-verimag.imag.fr/Lutin.html
 OCamlVersion: >= 4.02

doc/lutin-man/Makefile

-include $(LURETTE_PATH)/Makefile.common.source
+
 
 LUTINSRC=../../lutin/src
 LUT2TEX= $(LURETTE_PATH)/utils/lutintolatex
 SRCS=./commands.tex \
      ./language.tex \
-     ./lutsyntax.tex \
-     ./semantics.tex \
-     ./lutin_toplevel.tex \
-     ./lutin_examples.tex \
-     ./objs/lutyacc.tex \
-     ./objs/version.tex \
 	 ./objs/lutin.tex ./objs/gnuplotrif.tex  ./objs/checkrif.tex \
 	./objs/foo.c.tex \
 	./objs/call_external_c_code.lut.tex \
@@ -17,7 +11,13 @@ SRCS=./commands.tex \
 	./objs/ud.lut.tex \
 	./objs/rabbit.lut.tex \
 	./objs/ud.jpg \
-     bib.bib ./main.tex touch.tex
+     ./lutsyntax.tex \
+     ./semantics.tex \
+     ./lutin_toplevel.tex \
+     ./lutin_examples.tex \
+     ./objs/lutyacc.tex \
+     ./objs/version.tex \
+      ./main.tex touch.tex
 
 
 all: touch.tex lutin-man.pdf 
@@ -39,9 +39,13 @@ lutin-man.pdf: objs/main.pdf
 ./objs/call_external_c_code.lut.tex:../../examples/lutin/external_code/call_external_c_code.lut
 	$(LUT2TEX) ../../examples/lutin/external_code/call_external_c_code.lut > ./objs/call_external_c_code.lut.tex
 
-./objs/ud.jpg:
-	gnuplot-rif$(EXE) -jpg ../../examples/lutin/up_and_down/test.rif.exp 
-	mv ../../examples/lutin/up_and_down/test.rif.jpg objs/ud.jpg
+D=../../examples/lutin/up_and_down/$(shell ocamlc -version)
+objs/ud.rif: $(D)/test.rif.exp
+	cp $< $@
+
+./objs/ud.jpg: objs/ud.rif
+	cd objs ; gnuplot-rif$(EXE) -jpg ud.rif 
+
 
 
 ./objs/polar.lut.tex:
@@ -65,6 +69,7 @@ touch.tex:
 	touch touch.tex
 
 objs/main.pdf: objs $(SRCS)
+	cp main.tex objs; 
 	cd objs; pdflatex main.tex; bibtex main; pdflatex main.tex
 
 objs:
@@ -72,18 +77,15 @@ objs:
 
 BIN=/usr/local/tools/lustre/misc/bin
 
-./objs/lutyacc.tex: ./objs/rules 
-	cat $< | $(BIN)/rules2tex -t tokens  > $@
-
-./objs/rules : $(LUTINSRC)/lutParser.mly
-	$(BIN)/yacc2rules  $(LUTINSRC)/lutParser.mly > $@ 
+./objs/lutyacc.tex: $(LUTINSRC)/lutParser.mly
+	$(BIN)/yacc2latex -t tokens $(LUTINSRC)/lutParser.mly -o $@ 
 
 ./objs/cleanyacc : $(LUTINSRC)/lutParser.mly
 	cat $< | sed -e "s/lut//g" -e "s/TK_EOF//" > $@ 
 
-
-./objs/version.tex: $(LUTINSRC)/lutVersion.ml Makefile
-	cd ../.. ; make gen_version
+.PHONY:objs/version.tex
+./objs/version.tex: 
+	cp ../version.tex objs
 
 clean:
 	rm -f ./objs/*

lutin/src/lutParser.mly

@@ -438,7 +438,7 @@ lutTypedIdentList: lutTypedIdentListA
 			{ $1 }
 	;
 
-lutTypedIdentListA: lutTypedIdent /* ebnf:print=expand */
+lutTypedIdentListA: /* ebnf:print=expand */  lutTypedIdent
 			{ $1 }
 	|   lutTypedIdentListA TK_SEMICOL lutTypedIdent
 			{ $3@$1 }

lutin/src/version.ml

-let str="2.38"
-let sha="7a93e1b"
+let str="2.39"
+let sha="d42b5b1"

utils/lutintolatex

 #!/bin/sh
 #
 # to generate colored latex version of lutin files
-#
+
 
 
 FILE=$1