[syslinux:master] diag/geodsp/Makefile: lib; _f alternate

syslinux-bot for Gene Cumm gene.cumm at gmail.com
Mon Feb 16 12:06:08 PST 2015


Commit-ID:  2b35d34f59694b9622ae246e6b695510bd874345
Gitweb:     http://www.syslinux.org/commit/2b35d34f59694b9622ae246e6b695510bd874345
Author:     Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Mon, 16 Feb 2015 14:30:04 -0500
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Mon, 16 Feb 2015 14:30:04 -0500

diag/geodsp/Makefile: lib; _f alternate

Move library dependendcies to a variable; Add another _f (Force DL == 80h)
variant.

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

---
 diag/geodsp/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/diag/geodsp/Makefile b/diag/geodsp/Makefile
index 3fee73d..a369b03 100644
--- a/diag/geodsp/Makefile
+++ b/diag/geodsp/Makefile
@@ -22,12 +22,13 @@ include $(MAKEDIR)/embedded.mk
 coredir = $(topdir)/core
 VPATH = $(SRC)
 
-BTARGET = geodsp1s.bin geodspms.bin \
-	geodsp1s.img.xz geodspms.img.xz
+BTARGET = geodsp1s.bin geodsp1s_f.bin geodspms.bin \
+	geodsp1s.img.xz geodsp1s_f.img.xz geodspms.img.xz
 
 NASMOPT = -i $(coredir)/ -i $(SRC)/ -Ox -f bin -dBINFMT
 NASMOPT += -w+orphan-labels
 CFLAGS = -g -O
+LIBS = $(coredir)/writehex.inc $(coredir)/macros.inc $(coredir)/diskboot.inc geodsplib.inc
 
 all: $(BTARGET)
 
@@ -42,9 +43,12 @@ all: $(BTARGET)
 %.img: %.bin mk-lba-img.pl
 	$(PERL) $(SRC)/mk-lba-img.pl $< > $@ || ( rm -f $@ ; false )
 
-%.bin: %.asm $(coredir)/writehex.inc $(coredir)/macros.inc $(coredir)/diskboot.inc
+%.bin: %.asm $(LIBS)
 	$(NASM) $(NASMOPT) -o $@ -l $(@:.bin=.lst) $<
 
+%_f.bin: %.asm $(LIBS)
+	$(NASM) $(NASMOPT) -o $@ -dFORCE_80 -l $(@:.bin=.lst) $<
+
 mk-lba-img: mk-lba-img.c
 	$(CC) $(CFLAGS) -o $@ $<
 


More information about the Syslinux-commits mailing list