diag/geodsp: Use perl to make the image; Fix Makefile

This reduces the host binary dependence and prevents the need for a
rebuild of the images after a 'make clean'.

This has the unfortunate side effect of going from 0.03s to 0.30s to
build an image.

Also fix Makefile to include (optional) raw targets and use $(GZIPPROG)

Signed-off-by: Gene Cumm <gene.cumm@gmail.com>

diff --git a/diag/geodsp/Makefile b/diag/geodsp/Makefile
index 119ccbc..5516085 100644 (file)
--- a/diag/geodsp/Makefile
+++ b/diag/geodsp/Makefile
@@ -33,11 +33,15 @@ CFLAGS = -g -O
 all: $(BTARGET)
 
 # Higher compression levels result in larger files
-%.img.xz: %.bin mk-lba-img
-       ./mk-lba-img < $< | $(XZ) -0f > $@ || ( rm -f $@ ; false )
+%.img.xz: %.bin mk-lba-img.pl
+       $(PERL) mk-lba-img $< | $(XZ) -0 > $@ || ( rm -f $@ ; false )
 
-%.img.gz: %.bin mk-lba-img
-       ./mk-lba-img < $< | $(GZIP) -9 > $@ || ( rm -f $@ ; false )
+%.img.gz: %.bin mk-lba-img.pl
+       $(PERL) mk-lba-img $< | $(GZIPPROG) -9 > $@ || ( rm -f $@ ; false )
+
+# in case someone really wants these without needing a decompressor
+%.img: %.bin mk-lba-img.pl
+       $(PERL) mk-lba-img $< > $@ || ( rm -f $@ ; false )
 
 %.bin: %.asm $(coredir)/writehex.inc $(coredir)/macros.inc $(coredir)/diskboot.inc
        $(NASM) $(NASMOPT) -o $@ -l $(@:.bin=.lst) $<