Merge branch 'master' into chaindev

Conflicts:
	com32/Makefile
	com32/modules/chain.c

Note: add ReactOS' stuff introduced in old chain.c

Signed-off-by: Michal Soltys <soltys@ziu.info>

diff --cc Makefile
Simple merge

diff --cc com32/Makefile
index 43847bd,da632a1..b59fd3f
--- 1/com32/Makefile
--- 2/com32/Makefile
+++ b/com32/Makefile
@@@ -1,5 -1,5 +1,5 @@@
- SUBDIRS = tools lib gpllib libutil modules mboot menu samples rosh cmenu \
+ SUBDIRS = libupload tools lib gpllib libutil modules mboot menu samples rosh cmenu \
 -        hdt gfxboot sysdump lua/src
 +        hdt gfxboot sysdump lua/src chain
  
  all tidy dist clean spotless install:
        set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done

diff --cc com32/chain/Makefile
index a5602d9,0000000..9d398a8
mode 100644,000000..100644
--- 1/com32/chain/Makefile
--- /dev/null
+++ b/com32/chain/Makefile
@@@ -1,41 -1,0 +1,42 @@@
- include ../MCONFIG
 +## -----------------------------------------------------------------------
 +##
 +##   Copyright 2001-2010 H. Peter Anvin - All Rights Reserved
 +##   Copyright 2010 Michal Soltys
 +##
 +##   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
 +##   the Free Software Foundation, Inc., 53 Temple Place Ste 330,
 +##   Boston MA 02111-1307, USA; either version 2 of the License, or
 +##   (at your option) any later version; incorporated herein by reference.
 +##
 +## -----------------------------------------------------------------------
 +
 +
 +topdir = ../..
++MAKEDIR = $(topdir)/mk
++include $(MAKEDIR)/com32.mk
 +
 +OBJS = chain.o partiter.o utility.o options.o mangle.o
 +
 +all: chain.c32
 +
 +chain.elf: $(OBJS) $(LIBS) $(C_LIBS)
 +      $(LD) $(LDFLAGS) -o $@ $^
 +
 +%.o: %.c
 +      $(CC) $(MAKEDEPS) $(CFLAGS) $(CHAINEXTOPT) -c -o $@ $<
 +
 +tidy dist:
 +      rm -f *.o *.lo *.a *.lst *.elf .*.d *.tmp
 +
 +clean: tidy
 +      rm -f *.lnx
 +
 +spotless: clean
 +      rm -f *.lss *.c32 *.com
 +      rm -f *~ \#*
 +
 +install:
 +
 +
 +-include .*.d

diff --cc com32/lib/Makefile
Simple merge

diff --cc com32/modules/Makefile
index e1b62b5,e9ce1d1..1b2854f
--- 1/com32/modules/Makefile
--- 2/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@@ -16,9 -16,10 +16,10 @@@
  ##
  
  topdir = ../..
- include ../MCONFIG
+ MAKEDIR = $(topdir)/mk
+ include $(MAKEDIR)/com32.mk
  
 -MODULES         = chain.c32 config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \
 +MODULES         = config.c32 ethersel.c32 dmitest.c32 cpuidtest.c32 \
            disk.c32 pcitest.c32 elf.c32 linux.c32 reboot.c32 pmload.c32 \
            meminfo.c32 sdi.c32 sanboot.c32 ifcpu64.c32 vesainfo.c32 \
            kbdmap.c32 cmd.c32 vpdtest.c32 host.c32 ls.c32 gpxecmd.c32 \