comboot: remove comapi_chainboot

[profile/ivi/syslinux.git] / Makefile

diff --git a/Makefile b/Makefile
index 37dc3e9..1b419ae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 ## -----------------------------------------------------------------------
 ##
 ##   Copyright 1998-2009 H. Peter Anvin - All Rights Reserved
-##   Copyright 2009 Intel Corporation; author: H. Peter Anvin
+##   Copyright 2009-2010 Intel Corporation; author: H. Peter Anvin
 ##
 ##   This program is free software; you can redistribute it and/or modify
 ##   it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
 # Main Makefile for SYSLINUX
 #
 topdir = .
-include $(topdir)/MCONFIG
+MAKEDIR = $(topdir)/mk
+include $(MAKEDIR)/syslinux.mk
 -include $(topdir)/version.mk
 
 #
@@ -32,17 +33,18 @@ include $(topdir)/MCONFIG
 # 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 com32/mboot/*.c32 \
-       com32/hdt/*.c32 com32/rosh/*.c32 com32/gfxboot/*.c32
+       com32/hdt/*.c32 com32/rosh/*.c32 com32/gfxboot/*.c32 \
+       com32/sysdump/*.c32 com32/lua/src/*.c32 com32/chain/*.c32
 
 # syslinux.exe is BTARGET so as to not require everyone to have the
 # mingw suite installed
 BTARGET  = version.gen version.h version.mk
 BOBJECTS = $(BTARGET) \
-       mbr/mbr.bin mbr/altmbr.bin mbr/gptmbr.bin \
-       mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \
-       mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \
+       mbr/*.bin \
        core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
-       gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
+       gpxe/gpxelinux.0 dos/syslinux.com \
+       win32/syslinux.exe win64/syslinux64.exe \
+       dosutil/*.com dosutil/*.sys \
        $(MODULES)
 
 # BSUBDIRs build the on-target binary components.
@@ -52,9 +54,9 @@ BOBJECTS = $(BTARGET) \
 # files that depend only on the B phase, but may have to be regenerated
 # for "make installer".
 BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
-          libinstaller dos win32
+          diag libinstaller dos win32 win64 dosutil
 ITARGET  =
-IOBJECTS = $(ITARGET) dos/copybs.com \
+IOBJECTS = $(ITARGET) \
        utils/gethostip utils/isohybrid utils/mkdiskimage \
        mtools/syslinux linux/syslinux extlinux/extlinux
 ISUBDIRS = libinstaller mtools linux extlinux utils
@@ -64,14 +66,16 @@ INSTALL_BIN   =     mtools/syslinux
 # Things to install in /sbin
 INSTALL_SBIN  = extlinux/extlinux
 # Things to install in /usr/lib/syslinux
-INSTALL_AUX   =        core/pxelinux.0 gpxe/gpxelinux.0 core/isolinux.bin \
-               core/isolinux-debug.bin \
-               dos/syslinux.com dos/copybs.com win32/syslinux.exe \
+INSTALL_AUX   =        core/pxelinux.0 gpxe/gpxelinux.0 gpxe/gpxelinuxk.0 \
+               core/isolinux.bin core/isolinux-debug.bin \
+               dos/syslinux.com \
                mbr/*.bin $(MODULES)
-INSTALL_AUX_OPT = win32/syslinux.exe
+INSTALL_AUX_OPT = win32/syslinux.exe win64/syslinux64.exe
+INSTALL_DIAG  =        diag/mbr/handoff.bin \
+               diag/geodsp/geodsp1s.img.xz diag/geodsp/geodspms.img.xz
 
 # These directories manage their own installables
-INSTALLSUBDIRS = com32 utils
+INSTALLSUBDIRS = com32 utils dosutil
 
 # Things to install in /boot/extlinux
 EXTBOOTINSTALL = $(MODULES)
@@ -94,6 +98,13 @@ installer:
 
 installer-local: $(ITARGET) $(BINFILES)
 
+strip:
+       $(MAKE) strip-local
+       set -e ; for i in $(ISUBDIRS); do $(MAKE) -C $$i strip ; done
+       -ls -l $(BOBJECTS) $(IOBJECTS)
+
+strip-local:
+
 version.gen: version version.pl
        $(PERL) version.pl $< $@ '%define < @'
 version.h: version version.pl
@@ -109,6 +120,8 @@ local-install: installer
        mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)
        install -m 644 -c $(INSTALL_AUX) $(INSTALLROOT)$(AUXDIR)
        -install -m 644 -c $(INSTALL_AUX_OPT) $(INSTALLROOT)$(AUXDIR)
+       mkdir -m 755 -p $(INSTALLROOT)$(DIAGDIR)
+       install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)
        mkdir -m 755 -p $(INSTALLROOT)$(MANDIR)/man1
        install -m 644 -c man/*.1 $(INSTALLROOT)$(MANDIR)/man1
        : mkdir -m 755 -p $(INSTALLROOT)$(MANDIR)/man8