Merge remote-tracking branch 'mfleming/for-hpa/makefile-cleanup'

Resolved Conflicts:
	com32/hdt/Makefile
	com32/sysdump/Makefile

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --cc com32/gpllib/Makefile
index 8e7fb43,1c07068..4b7b846
--- 1/com32/gpllib/Makefile
--- 2/com32/gpllib/Makefile
+++ b/com32/gpllib/Makefile
@@@ -4,11 -4,12 +4,12 @@@
  
  # Include configuration rules
  topdir = ../..
- include ../lib/MCONFIG
+ MAKEDIR = $(topdir)/mk
+ include $(MAKEDIR)/lib.mk
  
 -REQFLAGS += -I../gplinclude
 +REQFLAGS += -I../gplinclude -I../gplinclude/zzjson
  
 -GPLDIRS := . disk dmi vpd acpi
 +GPLDIRS := . disk dmi vpd acpi zzjson
  LIBOBJS := $(foreach dir,$(GPLDIRS),$(patsubst %.c,%.o,$(wildcard $(dir)/*.c)))
  
  BINDIR   = /usr/bin

diff --cc com32/hdt/Makefile
index edacd85,8900a2e..b4f4e35
--- 1/com32/hdt/Makefile
--- 2/com32/hdt/Makefile
+++ b/com32/hdt/Makefile
@@@ -16,11 -16,11 +16,11 @@@
  ##
  
  topdir = ../..
- include ../MCONFIG
+ MAKEDIR = $(topdir)/mk
+ include $(MAKEDIR)/com32.mk
  
- LIBS     = ../cmenu/libmenu/libmenu.a ../libutil/libutil_com.a \
-            ../lib/libcom32.a ../libupload/libcom32upload.a $(LIBGCC)
- CFLAGS    += -I$(com32)/cmenu/libmenu -I$(com32)
 -LIBS      = ../cmenu/libmenu/libmenu.a
++LIBS      = ../cmenu/libmenu/libmenu.a ../libupload/libcom32upload.a
+ CFLAGS    += -I$(com32)/cmenu/libmenu
  
  MODULES         = hdt.c32
  TESTFILES =

diff --cc com32/lib/Makefile
Simple merge

diff --cc com32/libupload/Makefile
index c009b6b,0000000..8305335
mode 100644,000000..100644
--- 1/com32/libupload/Makefile
--- /dev/null
+++ b/com32/libupload/Makefile
@@@ -1,38 -1,0 +1,39 @@@
- include ../lib/MCONFIG
 +# Include configuration rules
 +topdir = ../..
++MAKEDIR = $(topdir)/mk
++include $(MAKEDIR)/com32.mk
 +
 +REQFLAGS += -I./
 +
 +SUBDIRS := . 
 +LIBOBJS := $(foreach dir,$(SUBDIRS),$(patsubst %.c,%.o,$(wildcard $(dir)/*.c)))
 +
 +BINDIR   = /usr/bin
 +LIBDIR   = /usr/lib
 +DATADIR  = /usr/share
 +AUXDIR   = $(DATADIR)/syslinux
 +INCDIR   = /usr/include
 +COM32DIR = $(AUXDIR)/com32
 +
 +all: libcom32upload.a
 +
 +libcom32upload.a : $(LIBOBJS)
 +      rm -f $@
 +      $(AR) cq $@ $^
 +      $(RANLIB) $@
 +
 +tidy dist clean:
 +      find . \( -name \*.o -o -name \*.a -o -name .\*.d -o -name \*.tmp \) -print0 | \
 +              xargs -0r rm -f
 +
 +spotless: clean
 +      rm -f *.a
 +      rm -f *~ \#* */*~ */\#*
 +
 +install: all
 +      mkdir -m 755 -p $(INSTALLROOT)$(COM32DIR)
 +      install -m 644 libcom32upload.a $(INSTALLROOT)$(COM32DIR)
 +      mkdir -p $(INSTALLROOT)$(COM32DIR)/include/
 +      cp -r *.h $(INSTALLROOT)$(COM32DIR)/include/
 +
 +-include .*.d */.*.d */*/.*.d

diff --cc com32/libutil/Makefile
index 7a6b527,5942a08..83e23a0
--- 1/com32/libutil/Makefile
--- 2/com32/libutil/Makefile
+++ b/com32/libutil/Makefile
@@@ -30,10 -30,10 +30,11 @@@
  ##
  
  topdir = ../..
- include ../MCONFIG
+ MAKEDIR = $(topdir)/mk
+ include $(MAKEDIR)/com32.mk
  
 -LIBOBJS          = ansiline.o ansiraw.o get_key.o sha1hash.o unbase64.o \
 +LIBOBJS          = ansiline.o ansiraw.o get_key.o keyname.o \
 +           sha1hash.o unbase64.o \
             md5.o crypt-md5.o sha256crypt.o sha512crypt.o base64.o
  LNXLIBOBJS = $(patsubst %.o,%.lo,$(LIBOBJS))
  

diff --cc com32/modules/Makefile
Simple merge

diff --cc com32/sysdump/Makefile
index 3de8a5b,5d7f4ef..e429099
--- 1/com32/sysdump/Makefile
--- 2/com32/sysdump/Makefile
+++ b/com32/sysdump/Makefile
@@@ -16,14 -16,12 +16,15 @@@
  ##
  
  topdir = ../..
- include ../MCONFIG
+ MAKEDIR = $(topdir)/mk
+ include $(MAKEDIR)/com32.mk
  -include $(topdir)/version.mk
  
- LIBS     = ../libutil/libutil_com.a ../lib/libcom32.a ../libupload/libcom32upload.a $(LIBGCC)
++LIBS     = ../libupload/libcom32upload.a
  LNXLIBS          = ../libutil/libutil_lnx.a
  
 +CFLAGS += -I$(com32) -I$(topdir)
 +
  MODULES         = sysdump.c32
  TESTFILES =
  

diff --cc core/Makefile
Simple merge

diff --cc diag/geodsp/Makefile
index 44002bb,04fd89e..b76eb77
--- 1/diag/geodsp/Makefile
--- 2/diag/geodsp/Makefile
+++ b/diag/geodsp/Makefile
@@@ -19,10 -19,10 +19,10 @@@
  #
  
  topdir = ../..
- # include $(topdir)/MCONFIG.embedded
+ # include $(topdir)/mk/embedded.mk
  coredir = $(topdir)/core
  
 -BTARGET = geodsp1s.bin geodspms.bin mk-lba-img \
 +BTARGET = geodsp1s.bin geodspms.bin \
        geodsp1s.img.xz geodspms.img.xz
  #     lba-1s.img.xz lba-ms.img.xz
    # lba-1s.img lba-ms.img