diff options
author | Matt Fleming <matt.fleming@intel.com> | 2012-05-31 12:16:22 +0100 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2012-05-31 13:45:42 +0100 |
commit | 894c81b75aa2ffc4eef3c56e4c72fe70c4080b99 (patch) | |
tree | 37b5135e79a69a30e2eac3f81a17efdd4701a813 /Makefile | |
parent | 98e33fa25fb8feeb66cbf20b9cba0d5adff3e658 (diff) | |
parent | ba42e1409ece2e9d56728e0ee6a6342c05ec6e52 (diff) | |
download | syslinux-894c81b75aa2ffc4eef3c56e4c72fe70c4080b99.tar.gz |
Merge remote-tracking branch 'zytor/master' into merge/elflink/master
A lot of development has gone on in the 'master' branch since the last
time we merged; new features, bug fixes, etc, etc.
Conflicts:
Makefile
com32/Makefile
com32/lib/Makefile
com32/lib/syslinux/load_linux.c
com32/modules/Makefile
com32/modules/chain.c
core/bootsect.inc
core/init.inc
version
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -34,7 +34,7 @@ include $(MAKEDIR)/syslinux.mk 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/sysdump/*.c32 com32/lua/src/*.c32 \ + com32/sysdump/*.c32 com32/lua/src/*.c32 com32/chain/.*c32 \ com32/lib/*.c32 com32/libutil/*.c32 com32/gpllib/*.c32 # syslinux.exe is BTARGET so as to not require everyone to have the @@ -100,6 +100,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 |