delta/syslinux.git/Makefile, branch syslinux-6.00-pre3

Merge tag 'syslinux-5.00' into firmware

2012-12-07T11:33:45+00:00

Conflicts:
	Makefile
	com32/elflink/ldlinux/Makefile
	com32/lib/sys/module/elf_module.c
	core/cleanup.c
	core/comboot.inc
	core/conio.c
	core/fs/fs.c
	core/init.c
	core/mem/free.c
	core/mem/malloc.c
	core/timer.inc
	diag/geodsp/Makefile
	extlinux/main.c
	mk/embedded.mk
	modules/Makefile

Signed-off-by: Matt Fleming

Delete 16-bit COMBOOT support

2012-12-06T10:47:31+00:00

16-bit COMBOOT files are no longer supported by Syslinux in 5.00 so
delete all references and change any 32-bit COMBOOT image references
to mention ELF instead.

Some of the COMBOOT stuff is still used internally so we can't nuke
core/comboot.inc yet, but that will disappear in a future release.

Signed-off-by: Matt Fleming

gpllib: Distribute libcom32gpl.c32 in releases

2012-11-27T13:12:36+00:00

This is a partial revert of commit b26d1c8642a8 ("Clean up $(GPLLIB)
leak"). While we do need to use $(C_LIBS) and respect $(NOGPL), we
should also be distributing libcom32gpl.c32. Now that we have ELF
modules, such as hdt.c32, that need to have some of their symbols
dynamically resolved at runtime we need to distribute libcom32gpl.c32.

Signed-off-by: Matt Fleming

Makefile: Add libmenu.c32 to list of modules

2012-11-27T11:01:54+00:00

We need to install libmenu.c32 as it is required by modules like
hdt.c32.

Signed-off-by: Matt Fleming

Makefile: Move Makefile.private inclusion to change default target

2012-11-14T11:04:55+00:00

If no make target is specified on the command line we'll try to build
the first target we encounter in Makefile. Because we include
Makefile.private before any targets that means we'll try to build
isolinux.iso by default, which probably isn't what the user expected.

Move Makefile.private *after* our first target in Makefile so that the
user needs to explicitly build the targets in Makefile.private.

Signed-off-by: Matt Fleming

Makefile: Add upload targets to $(private-targets)

2012-11-09T16:53:05+00:00

So that the catch-all $(MAKECMDGOALS) rule isn't used when trying to
upload a release, add 'preupload' and 'upload' to the list of make
targets that are handled by other Makefiles.

Signed-off-by: Matt Fleming

Makefile: Every invocation of make needs access to syslinux.mk

2012-11-09T16:46:05+00:00

syslinux.mk provides variables like $(PERL) which are extremely useful
in most Makefiles, so include it regardless of whether this is the
first invocation of make or a sub-make.

Signed-off-by: Matt Fleming

Makefile.private: Update for new per-firmware object directories

2012-11-09T16:00:07+00:00

Update the exported variables when invoking make in the 'official'
target.

Signed-off-by: Matt Fleming

Makefile: Change default object directory

2012-11-09T16:00:07+00:00

Instead of building all objects in 'obj' if no O= argument is
specified on the make command line, create all the firmware object
directories in the top-level of the source repository.

Signed-off-by: Matt Fleming

Makefile: Correct version.mk path

2012-11-09T15:59:54+00:00

Each firmware generates its own version.mk, but they're all exactly
the same. Place a single version.mk in the top-level output directory
(as specified with the O= command line argument) so that this can be
included by Makefile.private.

Signed-off-by: Matt Fleming