aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-08-27 16:23:24 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-08-27 16:23:24 -0700
commitc1b3d04474c24e4908868e6c7bedb5824d15b066 (patch)
treecf82cbb2589003c1a44bc5bc6e8cdf94eb49547a /Makefile
parent2a6fef03f88e7aa56009f608dccd17e6f24dde97 (diff)
downloadsyslinux-elf-c1b3d04474c24e4908868e6c7bedb5824d15b066.tar.gz
syslinux-elf-c1b3d04474c24e4908868e6c7bedb5824d15b066.tar.xz
syslinux-elf-c1b3d04474c24e4908868e6c7bedb5824d15b066.zip
Add pxechain.com; new modules direction; reorganize installation
Add the pxechain module from Jeffery Hutzelman at CMU. Create new modules directory for non-com32 modules. Centralize installation, since we have three types of install, and only one of them was distributed. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 11 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 6c056d8b..040a7ed1 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,11 @@ include $(topdir)/MCONFIG
# directories.
#
+# List of module objects that should be installed for all derivatives
+MODULES = memdisk/memdisk memdump/memdump.com \
+ modules/*.com com32/menu/*.c32 com32/modules/*.c32
+
+
# syslinux.exe is BTARGET so as to not require everyone to have the
# mingw suite installed
BTARGET = version.gen version.h version.mk
@@ -35,7 +40,7 @@ BOBJECTS = $(BTARGET) \
mbr/mbr.bin mbr/gptmbr.bin \
core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
- memdisk/memdisk memdump/memdump.com
+ $(MODULES)
# BSUBDIRs build the on-target binary components.
# ISUBDIRs build the installer (host) components.
@@ -58,20 +63,19 @@ INSTALL_SBIN = extlinux/extlinux
INSTALL_AUX = core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \
core/isolinux-debug.bin \
dos/syslinux.com dos/copybs.com win32/syslinux.exe \
- memdisk/memdisk memdump/memdump.com \
- mbr/mbr.bin mbr/gptmbr.bin
+ mbr/mbr.bin mbr/gptmbr.bin \
+ $(MODULES)
INSTALL_AUX_OPT = win32/syslinux.exe
# These directories manage their own installables
INSTALLSUBDIRS = com32 utils
# Things to install in /boot/extlinux
-EXTBOOTINSTALL = memdisk/memdisk memdump/memdump.com \
- com32/menu/*.c32 com32/modules/*.c32
+EXTBOOTINSTALL = $(MODULES)
# Things to install in /tftpboot
-NETINSTALLABLE = core/pxelinux.0 gpxe/gpxelinux.0 memdisk/memdisk \
- memdump/memdump.com com32/menu/*.c32 com32/modules/*.c32
+NETINSTALLABLE = core/pxelinux.0 gpxe/gpxelinux.0 \
+ $(MODULES)
all:
$(MAKE) all-local