Oh, please, merge me hardly !
Merge branch 'master' of ssh://tetalab.org:2213/tTh/DD2-monitor
This commit is contained in:
		
						commit
						054d0f574c
					
				
							
								
								
									
										14
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								Makefile
									
									
									
									
									
								
							@ -2,18 +2,18 @@
 | 
				
			|||||||
#	must be run with gnu make
 | 
					#	must be run with gnu make
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CC = gcc
 | 
					CC	= gcc
 | 
				
			||||||
 | 
					CCOPT	= -Wall -g 
 | 
				
			||||||
CCOPT = -Wall -g 
 | 
					CLIB	= core/libdd2m-core.a
 | 
				
			||||||
 | 
					
 | 
				
			||||||
all:	essai fake-values
 | 
					all:	essai fake-values
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# ---------------------------------------------
 | 
					# ---------------------------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
essai:	essai.c  Makefile
 | 
					essai:	essai.c  Makefile $(CLIB)
 | 
				
			||||||
	gcc ${CCOPT} $< core/utils.o -o $@
 | 
						$(CC) ${CCOPT} $< $(CLIB) -o $@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
fake-values:	fake-values.c  Makefile
 | 
					fake-values:	fake-values.c  Makefile $(CLIB)
 | 
				
			||||||
	gcc ${CCOPT} $< core/utils.o  -o $@
 | 
						$(CC) ${CCOPT} $< $(CLIB)  -o $@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# ---------------------------------------------
 | 
					# ---------------------------------------------
 | 
				
			||||||
 | 
				
			|||||||
@ -32,7 +32,7 @@ if (verbosity > 1) {
 | 
				
			|||||||
	fprintf(stderr, "fake values - %s %s\n", __DATE__, __TIME__);
 | 
						fprintf(stderr, "fake values - %s %s\n", __DATE__, __TIME__);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
printf("%.3f %d\n", dtime(), random1000(type));
 | 
					printf("%.3f %4d\n", dtime(), random1000(type));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
return 0;
 | 
					return 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -13,7 +13,7 @@ set output 	"${IMAGE}"
 | 
				
			|||||||
set grid
 | 
					set grid
 | 
				
			||||||
set title	"Hourly average on the last ${NBLINES} samples"
 | 
					set title	"Hourly average on the last ${NBLINES} samples"
 | 
				
			||||||
set xlabel	"Heures"
 | 
					set xlabel	"Heures"
 | 
				
			||||||
set ylabel 	"Température"
 | 
					set ylabel 	"Temperature"
 | 
				
			||||||
set yrange	[ 5.0 : 30.0]
 | 
					set yrange	[ 5.0 : 30.0]
 | 
				
			||||||
plot "${TMPFILE}" with lines
 | 
					plot "${TMPFILE}" with lines
 | 
				
			||||||
__EOC__
 | 
					__EOC__
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user