diff options
| author | Gene Cumm <gene.cumm@gmail.com> | 2011-04-29 17:16:57 -0400 |
|---|---|---|
| committer | Gene Cumm <gene.cumm@gmail.com> | 2011-04-29 17:16:57 -0400 |
| commit | dc82fe2210028072a4891d7dcbd0446fd1e77ad4 (patch) | |
| tree | 1439d1924c9755c80041101e434cb95f6a0b8fd8 /diag/geodsp | |
| parent | 4f0170fcc2e521fd6852168d686b531cf5e0b86b (diff) | |
| download | syslinux-dc82fe2210028072a4891d7dcbd0446fd1e77ad4.tar.gz | |
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@gmail.com>
Diffstat (limited to 'diag/geodsp')
| -rw-r--r-- | diag/geodsp/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/diag/geodsp/Makefile b/diag/geodsp/Makefile index 6ea2f69d..bf26104e 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 |