debrotch in progress

Makefile

@@ -28,7 +28,7 @@ targa:	tmp/ridelles.tga tmp/electric.tga tmp/citerne.tga	\
 	echo "on a fait les targas" >> log.toto
 
 GLOBDEPS=${INCS}/train.inc ${INCS}/plancher.inc ${INCS}/poteaux.inc 	\
-	${INCS}/rails.inc						\
+	${INCS}/rails.inc ${INCS}/grue.inc				\
 	${INCS}/constantes.inc
 
 #--------------------------------------------------------
@@ -81,12 +81,8 @@ wagons.jpg:	tmp/wagons.tga
 inside.png: inside.pov $(GLOBDEPS) Makefile
 	$(POVRAY) +Iinside  $(DIMS) $(OPTS) +v
 
-tmp/benne.tga:	train.inc benne.pov constantes.inc rails.inc	\
-		benne.inc  Makefile
-	$(POVRAY) +Ibenne +Otmp/benne +FT $(DIMS) $(OPTS) +v
-
-benne.jpg:	tmp/benne.tga 
-	cjpeg $(CJPEGOPT) tmp/benne.tga > benne.jpg
+benne.png: benne.pov $(GLOBDEPS) Makefile
+	$(POVRAY) +Ibenne  $(DIMS) $(OPTS) +v
 
 tmp/citerne.tga: citerne.pov citerne.inc  $(GLOBDEPS)
 	$(POVRAY) +Iciterne +Otmp/citerne +FT $(DIMS) $(OPTS) +v
@@ -94,17 +90,11 @@ citerne.jpg:	tmp/citerne.tga
 	cjpeg $(CJPEGOPT) tmp/citerne.tga >  citerne.jpg
 
 
-tmp/electric.tga: electric.pov electric.inc train.inc rails.inc	\
-		instruments.inc Makefile
-	$(POVRAY) +Ielectric +FT +Otmp/electric $(DIMS) $(OPTS) +v
-electric.jpg:	tmp/electric.tga 
-	cjpeg $(CJPEGOPT) tmp/electric.tga >  electric.jpg
+electric.png: electric.pov $(GLOBDEPS) Makefile
+	$(POVRAY) +Ielectric  $(DIMS) $(OPTS) +v
 	
-truc.tga:	truc.pov train.inc poteaux.inc 			\
-		decor.inc voiture.inc constantes.inc		\
-		enseigne.inc electric.inc corail.inc		\
-		grue.inc instruments.inc galerie.inc
-	$(POVRAY) +Itruc +FT $(DIMS) $(LOWR) -v 
+truc.png: truc.pov $(GLOBDEPS) Makefile
+	$(POVRAY) +Itruc  $(DIMS) $(OPTS) +v
 
 
 tmp/ridelles.tga: ridelles.pov ridelles.inc $(GLOBDEPS)
@@ -128,7 +118,7 @@ tmp/voiture.tga:	voiture.inc voiture.pov $(GLOBDEPS)
 
 #--------------------------------------------------------
 
-SRCFILES=*.inc *.pov *.txt Makefile *.sh
+SRCFILES = *.inc *.pov *.txt Makefile *.sh
 
 lines:
 	wc $(SRCFILES) | sort -n