aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>1998-12-04 07:11:38 +0000
committerhpa <hpa>1998-12-04 07:11:38 +0000
commit38d28551c6ef958eade367bb8aad7c6debb72e6a (patch)
tree558dd1579f68bee110aff05405d0bd970a5efad8
parent13f69230feecad016bd41bf54cea84c398771094 (diff)
downloadsyslinux.git-38d28551c6ef958eade367bb8aad7c6debb72e6a.tar.gz
syslinux.git-38d28551c6ef958eade367bb8aad7c6debb72e6a.tar.xz
syslinux.git-38d28551c6ef958eade367bb8aad7c6debb72e6a.zip
Change the boot loader/installer boundary slightly
-rw-r--r--Makefile17
1 files changed, 11 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 54b8c090..905a25f3 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ VERSION = $(shell cat version)
# want to recompile the installers (ITARGET).
#
SOURCES = ldlinux.asm syslinux.asm syslinux.c copybs.asm
-BTARGET = bootsect.bin ldlinux.sys stupid.c stupid.inc ldlinux.bin ldlinux.lst
+BTARGET = bootsect.bin ldlinux.sys ldlinux.bin ldlinux.lst
ITARGET = syslinux.com syslinux copybs.com
DOCS = COPYING NEWS README TODO syslinux.doc keytab-lilo.doc
OTHER = Makefile bin2c.pl now.pl genstupid.pl keytab-lilo.pl version
@@ -54,7 +54,7 @@ ifndef DATE
DATE := $(HEXDATE)
endif
-ldlinux.bin: ldlinux.asm genstupid.pl
+ldlinux.bin: ldlinux.asm
$(NASM) -f bin -dVERSION="'$(VERSION)'" -dDATE_STR="'$(DATE)'" -dHEXDATE="$(HEXDATE)" -l ldlinux.lst -o ldlinux.bin ldlinux.asm
perl genstupid.pl < ldlinux.lst
@@ -80,17 +80,22 @@ syslinux: syslinux.o bootsect_bin.o ldlinux_bin.o stupid.o
$(CC) $(LDFLAGS) -o syslinux \
syslinux.o bootsect_bin.o ldlinux_bin.o stupid.o
-stupid.o: stupid.c
+ldlinux.lst: ldlinux.bin
+ : Generated by side effect
+
+stupid.c: ldlinux.lst genstupid.pl
+ perl genstupid.pl < ldlinux.lst
-stupid.c: ldlinux.asm
+stupid.inc: stupid.c
+ : Generated by side effect
-stupid.inc: ldlinux.asm
+stupid.o: stupid.c
install: all
install -c syslinux $(BINDIR)
tidy:
- rm -f syslinux.lst *.o *_bin.c
+ rm -f syslinux.lst copybs.lst *.o *_bin.c stupid.*
clean: tidy
rm -f $(ITARGET)