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 /mk | |
| 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 'mk')
| -rw-r--r-- | mk/elf.mk | 3 | ||||
| -rw-r--r-- | mk/syslinux.mk | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -32,6 +32,7 @@ GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0) GCCOPT += $(call gcc_ok,-mpreferred-stack-boundary=2,) com32 = $(topdir)/com32 +core = $(topdir)/core ifneq ($(NOGPL),1) GPLLIB = $(com32)/gpllib/libcom32gpl.c32 @@ -45,7 +46,7 @@ CFLAGS = $(GCCOPT) -W -Wall -march=i386 \ -fomit-frame-pointer -D__COM32__ -DDYNAMIC_MODULE \ -nostdinc -iwithprefix include \ -I$(com32)/libutil/include -I$(com32)/include $(GPLINCLUDE) \ - -I../../core/include + -I$(core)/include SFLAGS = $(GCCOPT) -D__COM32__ -march=i386 LDFLAGS = -m elf_i386 -shared --hash-style=gnu -T $(com32)/lib/elf32.ld diff --git a/mk/syslinux.mk b/mk/syslinux.mk index 95235286..4cf34e36 100644 --- a/mk/syslinux.mk +++ b/mk/syslinux.mk @@ -54,7 +54,9 @@ STRIP = strip AR = ar NM = nm RANLIB = ranlib +STRIP = strip GZIPPROG = gzip +XZ = xz PNGTOPNM = pngtopnm MCOPY = mcopy MFORMAT = mformat |