summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-02-15 15:19:54 -0800
committerH. Peter Anvin <hpa@zytor.com>2010-02-15 15:20:56 -0800
commitcece96bdd71da5ad1492c2d96485320f78ba8a83 (patch)
treed0daf3a0a07e0160fb1914c9fda0ad02830552d6
parentb82686b524d2ee4441ce411fa6db3a210edbaa34 (diff)
downloadsyslinux-cece96bdd71da5ad1492c2d96485320f78ba8a83.tar.gz
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@zytor.com>
-rw-r--r--dos/Makefile2
-rw-r--r--dosutil/Makefile10
-rw-r--r--dosutil/copybs.asm (renamed from dos/copybs.asm)0
-rw-r--r--[-rwxr-xr-x]dosutil/mdiskchk.combin7273 -> 7273 bytes
4 files changed, 9 insertions, 3 deletions
diff --git a/dos/Makefile b/dos/Makefile
index 9d8ce33c..eb0ca1a6 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 2a105731..fc10ff90 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
index 26407148..26407148 100644
--- a/dos/copybs.asm
+++ b/dosutil/copybs.asm
diff --git a/dosutil/mdiskchk.com b/dosutil/mdiskchk.com
index 78257519..78257519 100755..100644
--- a/dosutil/mdiskchk.com
+++ b/dosutil/mdiskchk.com
Binary files differ