[syslinux:master] dosutil: move copybs here, update Makefile

syslinux-bot for H. Peter Anvin hpa at zytor.com
Mon Feb 15 15:24:11 PST 2010


Commit-ID:  cece96bdd71da5ad1492c2d96485320f78ba8a83
Gitweb:     http://syslinux.zytor.com/commit/cece96bdd71da5ad1492c2d96485320f78ba8a83
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Mon, 15 Feb 2010 15:19:54 -0800
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Mon, 15 Feb 2010 15:20:56 -0800

dosutil: move copybs here, update Makefile

Move copybs to dosutil, change the Makefile to deal with UPX being
able to compress (e.g. very small files.)

Signed-off-by: H. Peter Anvin <hpa at zytor.com>


---
 dos/Makefile                |    2 +-
 dosutil/Makefile            |   10 ++++++++--
 {dos => dosutil}/copybs.asm |    0
 dosutil/mdiskchk.com        |  Bin 7273 -> 7273 bytes
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dos/Makefile b/dos/Makefile
index 9d8ce33..eb0ca1a 100644
--- a/dos/Makefile
+++ b/dos/Makefile
@@ -36,7 +36,7 @@ LIBOBJS	 = int2526.o conio.o memcpy.o memset.o  skipatou.o atou.o \
 
 VPATH = .:../libfat:../libinstaller
 
-TARGETS = syslinux.com copybs.com
+TARGETS = syslinux.com
 
 all: $(TARGETS)
 
diff --git a/dosutil/Makefile b/dosutil/Makefile
index 2a10573..fc10ff9 100644
--- a/dosutil/Makefile
+++ b/dosutil/Makefile
@@ -13,7 +13,7 @@ NASM    = nasm
 NASMOPT = -O9999
 
 WCTARGETS = mdiskchk.com
-NSTARGETS = eltorito.sys
+NSTARGETS = eltorito.sys copybs.com
 TARGETS   = $(WCTARGETS) $(NSTARGETS)
 
 %.obj: %.c
@@ -24,23 +24,29 @@ TARGETS   = $(WCTARGETS) $(NSTARGETS)
 	$(UPX) --ultra-brute --lzma $@ || \
 		$(UPX) --ultra-brute $@ || \
 		true
+	rm -f $*.0*
+	chmod a-x $@
 
 %.sys: %.asm
 	$(NASM) $(NASMOPT) -f bin -o $@ -l $*.lst $<
 	$(UPX) --ultra-brute --lzma $@ || \
 		$(UPX) --ultra-brute $@ || \
 		true
+	rm -f $*.0*
+	chmod a-x $@
 
 %.com: %.asm
 	$(NASM) $(NASMOPT) -f bin -o $@ -l $*.lst $<
 	$(UPX) --ultra-brute --lzma $@ || \
 		$(UPX) --ultra-brute $@ || \
 		true
+	rm -f $*.0*
+	chmod a-x $@
 
 all: $(TARGETS)
 
 tidy dist:
-	-rm -f *.obj *.lst *.o
+	-rm -f *.obj *.lst *.o *.0*
 
 clean: tidy
 
diff --git a/dos/copybs.asm b/dosutil/copybs.asm
similarity index 100%
rename from dos/copybs.asm
rename to dosutil/copybs.asm
diff --git a/dosutil/mdiskchk.com b/dosutil/mdiskchk.com
old mode 100755
new mode 100644



More information about the Syslinux-commits mailing list