[syslinux:master] diag/geodsp/Makefile: Use make variables

[syslinux-bot for Gene Cumm]

Commit-ID:  dc82fe2210028072a4891d7dcbd0446fd1e77ad4
Gitweb:     http://syslinux.zytor.com/commit/dc82fe2210028072a4891d7dcbd0446fd1e77ad4
Author:     Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Fri, 29 Apr 2011 17:16:57 -0400
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Fri, 29 Apr 2011 17:16:57 -0400

diag/geodsp/Makefile: Use make variables

Use the appropriate variables but for now the flags/options are
overridden in this Makefile.  Also add XZ to mk/syslinux.mk

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


---
 diag/geodsp/Makefile |   12 +++++++-----
 mk/syslinux.mk       |    1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/diag/geodsp/Makefile b/diag/geodsp/Makefile
index 6ea2f69..bf26104 100644
--- a/diag/geodsp/Makefile
+++ b/diag/geodsp/Makefile
@@ -19,7 +19,8 @@
 #
 
 topdir = ../..
-# include $(topdir)/mk/embedded.mk
+MAKEDIR = $(topdir)/mk
+include $(MAKEDIR)/embedded.mk
 coredir = $(topdir)/core
 
 BTARGET = geodsp1s.bin geodspms.bin \
@@ -27,21 +28,22 @@ BTARGET = geodsp1s.bin geodspms.bin \
 
 NASMOPT = -i $(coredir)/ -Ox -f bin
 NASMOPT += -w+orphan-labels
+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 )
+	./mk-lba-img < $< | $(XZ) -0f > $@ || ( rm -f $@ ; false )
 
 %.img.gz: %.bin mk-lba-img
-	./mk-lba-img < $< | gzip -9 > $@ || ( rm -f $@ ; false )
+	./mk-lba-img < $< | $(GZIP) -9 > $@ || ( rm -f $@ ; false )
 
 %.bin: %.asm $(coredir)/writehex.inc $(coredir)/macros.inc $(coredir)/diskboot.inc
-	nasm $(NASMOPT) -o $@ -l $(@:.bin=.lst) $<
+	$(NASM) $(NASMOPT) -o $@ -l $(@:.bin=.lst) $<
 
 mk-lba-img: mk-lba-img.c
-	gcc -g -O -o $@ $<
+	$(CC) $(CFLAGS) -o $@ $<
 
 tidy dist:
 	rm -Rf *.lst *.img
diff --git a/mk/syslinux.mk b/mk/syslinux.mk
index 2d47f81..d9f1c5b 100644
--- a/mk/syslinux.mk
+++ b/mk/syslinux.mk
@@ -54,6 +54,7 @@ AR       = ar
 NM       = nm
 RANLIB   = ranlib
 GZIPPROG = gzip
+XZ	 = xz
 PNGTOPNM = pngtopnm
 MCOPY    = mcopy
 MFORMAT  = mformat