aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2004-12-30 21:24:11 +0000
committerhpa <hpa>2004-12-30 21:24:11 +0000
commitcfdc49d27148795f10f71d6458084928eaffa68d (patch)
tree6c2809b0c01697e806e8a0e2ef7adff76092f3c6
parent9d75a1cdad8565fd03fdfe2320d504ccf2ce70a3 (diff)
downloadsyslinux-elf-cfdc49d27148795f10f71d6458084928eaffa68d.tar.gz
syslinux-elf-cfdc49d27148795f10f71d6458084928eaffa68d.tar.xz
syslinux-elf-cfdc49d27148795f10f71d6458084928eaffa68d.zip
Fix BTARGET/ITARGET dependencies
-rw-r--r--Makefile17
1 files changed, 10 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 52d3c62b..cd9824ee 100644
--- a/Makefile
+++ b/Makefile
@@ -51,13 +51,16 @@ VERSION = $(shell cat version)
CSRC = syslxmod.c gethostip.c
NASMSRC = ldlinux.asm copybs.asm pxelinux.asm mbr.asm isolinux.asm
SOURCES = $(CSRC) *.h $(NASMSRC) *.inc
+
+# _bin.c files required by both BTARGET and ITARGET installers
+BINFILES = bootsect_bin.c ldlinux_bin.c mbr_bin.c \
+ extlinux_bss_bin.c extlinux_sys_bin.c
+
# syslinux.exe is BTARGET so as to not require everyone to have the
# mingw suite installed
BTARGET = kwdhash.gen version.gen ldlinux.bss ldlinux.sys ldlinux.bin \
pxelinux.0 mbr.bin isolinux.bin isolinux-debug.bin \
- extlinux.bin extlinux.bss extlinux.sys \
- bootsect_bin.c ldlinux_bin.c mbr_bin.c \
- extlinux_bss_bin.c extlinux_sys_bin.c
+ extlinux.bin extlinux.bss extlinux.sys
BOBJECTS = $(BTARGET) dos/syslinux.com win32/syslinux.exe memdisk/memdisk
BSUBDIRS = memdisk dos win32
ITARGET = copybs.com gethostip mkdiskimage
@@ -97,19 +100,19 @@ MAKE += DATE=$(DATE) HEXDATE=$(HEXDATE)
# error every time you try to build.
#
-all: $(BTARGET) $(ITARGET)
+all: all-local
set -e ; for i in $(BSUBDIRS) $(ISUBDIRS) ; do $(MAKE) -C $$i $@ ; done
$(MAKE) all-local
-ls -l $(BOBJECTS) $(IOBJECTS)
-all-local: $(BTARGET) $(ITARGET)
+all-local: $(BTARGET) $(ITARGET) $(BINFILES)
installer: installer-local
-
-installer-local: $(ITARGET)
set -e ; for i in $(ISUBDIRS); do $(MAKE) -C $$i all ; done
-ls -l $(BOBJECTS) $(IOBJECTS)
+installer-local: $(ITARGET) $(BINFILES)
+
version.gen: version version.pl
$(PERL) version.pl version