lurette unstable_1_43.5 Mon, 23 Jan 2006 18:07:26 +0100 by jahier

Parent-Version:      unstable_1_43.4
Version-Log:         empty
Project-Description: Lurette

.lurette.prcs_aux

@@ -97,7 +97,7 @@
 (examples/luckyDraw/ocaml/draw-ex.ml 545 1137765987 l/8_draw-ex.ml 1.1)
 (examples/xlurette/heater/buggy_heater_ctrl.lus 219 1137765987 m/10_buggy_heat 1.1)
 (doc/lurette-man/gnuplot-button.jpg 852 1138032075 p/47_gnuplot-bu 1.1)
-(Makefile 389 1138035557 d/13_Makefile 1.6)
+(Makefile 396 1138036046 d/13_Makefile 1.7)
 (xlurette/Scade/Images/lurun.bmp 822 1122044801 i/22_lurun.bmp 1.1)
 (examples/xlurette/heater/temp_float.luc 704 1137765987 m/9_temp_float 1.1)
 (install/pixmaps/config-params.xpm 2753 1137765987 n/12_config-par 1.1)
@@ -360,7 +360,7 @@
 (test/test_losange-10d.lus 108 1065787303 g/41_test_losan 1.1)
 (source/gen_stubs_sildex.ml 9755 1122044801 h/38_gen_stubs_ 1.5)
 (source/gen_stubs_scade.mli 793 1122044801 f/6_gen_stubs_ 1.4)
-(source/Makefile 19349 1138035557 c/20_Makefile 1.45)
+(source/Makefile 19358 1138036046 c/20_Makefile 1.46)
 (examples/xlurette/heater/test1.rif 1074 1137765987 m/20_test1.rif 1.1)
 (examples/xlurette/Scade-win32/Pilot.vsw 431 1137765987 l/44_Pilot.vsw 1.1)
 (doc/lucky-man/call_external_c_code.tex 1677 1138032075 p/28_call_exter 1.1)

Makefile

@@ -5,11 +5,14 @@ source: gen_version
 	./lnsw
 	cd polka; make all ; make install; cd ..
 	cd GBDDML; make all; make cp; cd ..
-	cd source; make install; cp ..
+	cd source; make install; cd ..
 	cd install; autoconf; cd ..
 	./RUN_ME
 
+
+VERSION:=$(shell prcs info ./lurette.prj | tail -n 1 | awk '{printf "%s\n", $$2}')
+
 gen_version:
-	VERSION = $(shell prcs info ../lurette.prj | tail -n 1 | awk '{printf "%s\n", $$2}')
 	rm -f source/version.ml
-	echo "let str=\"$VER\"" > source/version.ml
\ No newline at end of file
+	echo "let str=\"$(VERSION)\"" > source/version.ml
+

lurette.prj

 ;; -*- Prcs -*-
 (Created-By-Prcs-Version 1 3 3)
 (Project-Description "Lurette")
-(Project-Version lurette unstable_1_43 4)
-(Parent-Version lurette unstable_1_43 3)
-(Version-Log "
-Ditto.
-
-")
+(Project-Version lurette unstable_1_43 5)
+(Parent-Version lurette unstable_1_43 4)
+(Version-Log "")
 (New-Version-Log ""
 )
-(Checkin-Time "Mon, 23 Jan 2006 17:59:17 +0100")
+(Checkin-Time "Mon, 23 Jan 2006 18:07:26 +0100")
 (Checkin-Login jahier)
 (Populate-Ignore ())
 (Project-Keywords)
@@ -129,7 +126,7 @@ Ditto.
   (OcamlMakefile (lurette/17_OcamlMakef 1.54 644))
   (install/Makefile.lurette.in (lurette/b/38_Makefile.l 1.38 644))
   (user-rules (lurette/c/14_myrules 1.75 644))
-  (Makefile (lurette/d/13_Makefile 1.6 644))
+  (Makefile (lurette/d/13_Makefile 1.7 644))
 
   (source/Makefile.lurettetop (lurette/d/14_Makefile.l 1.9 644))
   (source/Makefile.gen_fake_lutin (lurette/d/17_Makefile.g 1.6 644))
@@ -137,7 +134,7 @@ Ditto.
   (source/Makefile.lucky (lurette/b/41_Makefile.i 1.39 644))
   (source/Makefile.gen_stubs (lurette/b/42_Makefile.g 1.15 644))
   (source/Makefile.lurette_lib (lurette/c/2_Makefile.l 1.36 644))
-  (source/Makefile (lurette/c/20_Makefile 1.45 644))
+  (source/Makefile (lurette/c/20_Makefile 1.46 644))
 
 ;; Documentation
   (doc/Interface_draft (lurette/19_Interface_ 1.1 644))

source/Makefile

@@ -566,7 +566,7 @@ all_assert: clean libnc_assert lucky_assert ltop_assert show_assert luc4ocaml_as
 check: 
 	echo "A faire dans le repertoire test, sinon, ca vaut pas !!! "
 
-all: libnc lucky ltop show stubs gnuplot-rif gnuplot-socket gen_luc luc4ocaml-all luc2c draw-all
+all: libnc lucky ltop show stubs gnuplot-rif gnuplot-socket gen_luc luc4ocaml-all luc2c draw-all xlurette
 static: libnc lucky_static ltop_static show_static stubs_static  gen_luc_static