delta/syslinux.git/mk/syslinux.mk, branch syslinux-5.11-pre7

Merge branch 'lwip' into elflink

2013-02-26T11:29:04+00:00

Welcome to Syslinux 5.10.

Conflicts:
	NEWS
	com32/lib/Makefile
	com32/lib/sys/open.c
	com32/lib/syslinux/ipappend.c
	com32/modules/Makefile
	com32/modules/prdhcp.c
	core/Makefile
	core/cmdline.inc
	core/com32.inc
	core/comboot.inc
	core/configinit.inc
	core/fs/chdir.c
	core/fs/fs.c
	core/fs/pxe/dnsresolv.c
	core/fs/pxe/pxe.c
	core/fs/pxe/pxe.h
	core/idle.c
	core/include/ctype.h
	core/init.inc
	core/mem/init.c
	core/parseconfig.inc
	core/runkernel.inc
	core/syslinux.ld
	core/ui.inc
	doc/comboot.txt
	version

mk: Add Makefile variable for python

2012-11-12T15:38:33+00:00

Instead of hard-coding the python executable name use a make variable
like we do for all other executables used during the build. This has
the added bonus of allowing $(PYTHON) to be overridden on the command
line, e.g.

   make PYTHON=python2

which is particularly useful for distributions where /usr/bin/python
is actually python3.

Signed-off-by: Matt Fleming

Merge remote-tracking branch 'zytor/master' into merge/elflink/master

2012-05-31T12:45:42+00:00

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

syslinux.mk: use $(MAKEDIR) not $(makefiledir)

2012-05-18T21:47:40+00:00

Everything else in the system seems to use $(MAKEDIR), not
$(makefiledir)...

Signed-off-by: H. Peter Anvin

core: Add "dprint" facility to assembly

2011-06-28T01:37:00+00:00

Add a "dprint" facility to the assembly files, which simply calls
dprintf if debugging is enabled.

Signed-off-by: H. Peter Anvin

Add "make strip" target

2011-05-10T03:02:27+00:00

Add a "make strip" target, to make doing the official build easier.
We want the official build to have stripped binaries for size reasons,
so do it right and make it an actual build target.

Signed-off-by: H. Peter Anvin

syslinux.mk: $(MAKEDIR), not $(makefiledir)

2011-05-02T01:01:22+00:00

Fix the path for the optional makefile segments.

Signed-off-by: H. Peter Anvin

diag/geodsp/Makefile: Use make variables

2011-04-29T21:16:57+00:00

Use the appropriate variables but for now the flags/options are
overridden in this Makefile.  Also add XZ to mk/syslinux.mk

Signed-off-by: Gene Cumm

Merge remote-tracking branch 'zytor/master' into elflink

2011-04-26T08:46:34+00:00

We need the recent Makefile filename changes to be merged into the
elflink branch because it will make things simpler when converting all
modules to ELF format.

Conflicts:
	com32/Makefile
	com32/modules/Makefile
	version

Makefile: Move Makefile fragments into mk/

2011-04-07T16:59:11+00:00

Move the MCONFIG files into a mk/ directory and give them more
descriptive names.

This is purely a cosmetic change to make the 'include' directives a
bit more coherent by making it obvious exactly which MCONFIG file
we're including. For example, in com32/lua/src/Makefile we exchange
the line,

	include ../../MCONFIG

for the much more comprehensible,

	include $(MAKEDIR)/com32.mk

Signed-off-by: Matt Fleming