Move complex menu to com32/cmenu; clean up the Makefiles

Move the complex menu system into the com32 directory so it can be
sequenced properly with respect to hdt (it needs to be built after
com32/lib but before com32/hdt).  While we're at it, clean up the
Makefiles somewhat.

32 files changed, 18 insertions, 15 deletions

diff --git a/com32/Makefile b/com32/Makefile
index 2897e084..9fbfb67c 100644
--- a/com32/Makefile
+++ b/com32/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = lib libutil modules menu samples rosh hdt
+SUBDIRS = lib libutil modules menu samples rosh cmenu hdt
 
 all tidy dist clean spotless install:
 	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
diff --git a/menu/CHANGES b/com32/cmenu/CHANGES
index cce21838..cce21838 100644
--- a/menu/CHANGES
+++ b/com32/cmenu/CHANGES
diff --git a/menu/HISTORY b/com32/cmenu/HISTORY
index 8e9beb3f..8e9beb3f 100644
--- a/menu/HISTORY
+++ b/com32/cmenu/HISTORY
diff --git a/menu/MANUAL b/com32/cmenu/MANUAL
index 4e70149c..4e70149c 100644
--- a/menu/MANUAL
+++ b/com32/cmenu/MANUAL
diff --git a/menu/MENU_FORMAT b/com32/cmenu/MENU_FORMAT
index 24cb02f8..24cb02f8 100644
--- a/menu/MENU_FORMAT
+++ b/com32/cmenu/MENU_FORMAT
diff --git a/menu/Makefile b/com32/cmenu/Makefile
index 3c585319..e8627a9f 100644
--- a/menu/Makefile
+++ b/com32/cmenu/Makefile
@@ -1,6 +1,6 @@
 ## -----------------------------------------------------------------------
 ##
-##   Copyright 2001-2008 H. Peter Anvin - All Rights Reserved
+##   Copyright 2001-2009 H. Peter Anvin - All Rights Reserved
 ##
 ##   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
@@ -11,14 +11,14 @@
 ## -----------------------------------------------------------------------
 
 ##
-## samples for syslinux users
+## Makefile for the complex menu system
 ##
 
 # This must be defined before MCONFIG is included
 LIBS   = libmenu/libmenu.a
 
-topdir = ..
-include $(topdir)/com32/MCONFIG
+topdir = ../..
+include ../MCONFIG
 
 CFLAGS	  += -I./libmenu
 
diff --git a/menu/README b/com32/cmenu/README
index d585d2fa..d585d2fa 100644
--- a/menu/README
+++ b/com32/cmenu/README
diff --git a/menu/TODO b/com32/cmenu/TODO
index d2ee82c4..d2ee82c4 100644
--- a/menu/TODO
+++ b/com32/cmenu/TODO
diff --git a/menu/adv_menu.tpl b/com32/cmenu/adv_menu.tpl
index 6ce4acf8..6ce4acf8 100644
--- a/menu/adv_menu.tpl
+++ b/com32/cmenu/adv_menu.tpl
diff --git a/menu/complex.c b/com32/cmenu/complex.c
index 94627c4f..94627c4f 100644
--- a/menu/complex.c
+++ b/com32/cmenu/complex.c
diff --git a/menu/display.c b/com32/cmenu/display.c
index 5391d7fd..5391d7fd 100644
--- a/menu/display.c
+++ b/com32/cmenu/display.c
diff --git a/menu/libmenu/com32io.c b/com32/cmenu/libmenu/com32io.c
index 31aec5df..31aec5df 100644
--- a/menu/libmenu/com32io.c
+++ b/com32/cmenu/libmenu/com32io.c
diff --git a/menu/libmenu/com32io.h b/com32/cmenu/libmenu/com32io.h
index 78ce72fa..78ce72fa 100644
--- a/menu/libmenu/com32io.h
+++ b/com32/cmenu/libmenu/com32io.h
diff --git a/menu/libmenu/des.c b/com32/cmenu/libmenu/des.c
index 47ff78c4..47ff78c4 100644
--- a/menu/libmenu/des.c
+++ b/com32/cmenu/libmenu/des.c
diff --git a/menu/libmenu/des.h b/com32/cmenu/libmenu/des.h
index 67fc6b70..67fc6b70 100644
--- a/menu/libmenu/des.h
+++ b/com32/cmenu/libmenu/des.h
diff --git a/menu/libmenu/help.c b/com32/cmenu/libmenu/help.c
index 31944c79..31944c79 100644
--- a/menu/libmenu/help.c
+++ b/com32/cmenu/libmenu/help.c
diff --git a/menu/libmenu/help.h b/com32/cmenu/libmenu/help.h
index 06832d84..06832d84 100644
--- a/menu/libmenu/help.h
+++ b/com32/cmenu/libmenu/help.h
diff --git a/menu/libmenu/menu.c b/com32/cmenu/libmenu/menu.c
index 56a7426c..56a7426c 100644
--- a/menu/libmenu/menu.c
+++ b/com32/cmenu/libmenu/menu.c
diff --git a/menu/libmenu/menu.h b/com32/cmenu/libmenu/menu.h
index d8db6c25..d8db6c25 100644
--- a/menu/libmenu/menu.h
+++ b/com32/cmenu/libmenu/menu.h
diff --git a/menu/libmenu/passwords.c b/com32/cmenu/libmenu/passwords.c
index 40b5c49f..40b5c49f 100644
--- a/menu/libmenu/passwords.c
+++ b/com32/cmenu/libmenu/passwords.c
diff --git a/menu/libmenu/passwords.h b/com32/cmenu/libmenu/passwords.h
index 00e5702d..00e5702d 100644
--- a/menu/libmenu/passwords.h
+++ b/com32/cmenu/libmenu/passwords.h
diff --git a/menu/libmenu/scancodes.h b/com32/cmenu/libmenu/scancodes.h
index d3f625a6..d3f625a6 100644
--- a/menu/libmenu/scancodes.h
+++ b/com32/cmenu/libmenu/scancodes.h
diff --git a/menu/libmenu/syslnx.c b/com32/cmenu/libmenu/syslnx.c
index d2b0aef4..d2b0aef4 100644
--- a/menu/libmenu/syslnx.c
+++ b/com32/cmenu/libmenu/syslnx.c
diff --git a/menu/libmenu/syslnx.h b/com32/cmenu/libmenu/syslnx.h
index 755b9690..755b9690 100644
--- a/menu/libmenu/syslnx.h
+++ b/com32/cmenu/libmenu/syslnx.h
diff --git a/menu/libmenu/tui.c b/com32/cmenu/libmenu/tui.c
index cb8c1936..cb8c1936 100644
--- a/menu/libmenu/tui.c
+++ b/com32/cmenu/libmenu/tui.c
diff --git a/menu/libmenu/tui.h b/com32/cmenu/libmenu/tui.h
index 92f93863..92f93863 100644
--- a/menu/libmenu/tui.h
+++ b/com32/cmenu/libmenu/tui.h
diff --git a/menu/menugen.py b/com32/cmenu/menugen.py
index 70ec1f87..70ec1f87 100644
--- a/menu/menugen.py
+++ b/com32/cmenu/menugen.py
diff --git a/menu/password b/com32/cmenu/password
index 3caffe22..3caffe22 100644
--- a/menu/password
+++ b/com32/cmenu/password
diff --git a/menu/simple.c b/com32/cmenu/simple.c
index 92e8ab12..92e8ab12 100644
--- a/menu/simple.c
+++ b/com32/cmenu/simple.c
diff --git a/menu/test.menu b/com32/cmenu/test.menu
index 061c548e..061c548e 100644
--- a/menu/test.menu
+++ b/com32/cmenu/test.menu
diff --git a/menu/test2.menu b/com32/cmenu/test2.menu
index 4570dc2c..4570dc2c 100644
--- a/menu/test2.menu
+++ b/com32/cmenu/test2.menu
diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile
index a8f87c91..a9861bb6 100644
--- a/com32/hdt/Makefile
+++ b/com32/hdt/Makefile
@@ -17,15 +17,15 @@
 topdir = ../..
 include $(topdir)/MCONFIG.embedded
 
-INCLUDES   = -I$(com32)/include
+INCLUDES   = -I$(com32)/include -I$(com32)/cmenu/libmenu
 
 LIBGCC    := $(shell $(CC) $(GCCOPT) --print-libgcc)
 LIB	   = liboldcom32.a
 
-
-com32 = $(topdir)/com32
-C_LIBS	   = $(com32)/libutil/libutil_com.a $(com32)/lib/libcom32.a $(LIBGCC)
-LDFLAGS    = -m elf_i386 -T $(com32)/lib/com32.ld
+com32	= $(topdir)/com32
+LIBS	= $(LIB) $(com32)/cmenu/libmenu/libmenu.a \
+	$(com32)/libutil/libutil_com.a $(com32)/lib/libcom32.a $(LIBGCC)
+LDFLAGS	= -m elf_i386 -T $(com32)/lib/com32.ld
 
 all:  hdt.c32 $(LIB)
 
@@ -35,17 +35,20 @@ all:  hdt.c32 $(LIB)
 
 .PRECIOUS: %.o
 %.o: %.c
-	$(CC) $(CFLAGS) -std=gnu99  -D__COM32__ -I$(topdir)/menu/libmenu/ -c -o $@ $<
+	$(CC) $(CFLAGS) -std=gnu99  -D__COM32__ -c -o $@ $<
 
 .PRECIOUS: %.elf
 %.elf: c32entry.o %.o $(LIB)
 	$(LD) -Ttext 0x101000 -e _start -o $@ $^
 
 hdt.elf: hdt.o hdt-ata.o hdt-menu.o hdt-menu-pci.o hdt-menu-kernel.o \
-	 hdt-menu-disk.o hdt-menu-dmi.o hdt-menu-processor.o hdt-menu-syslinux.o hdt-menu-about.o \
-	 hdt-cli.o hdt-common.o hdt-cli-pci.o hdt-cli-dmi.o hdt-cli-cpu.o hdt-cli-pxe.o hdt-cli-kernel.o\
-	 hdt-menu-pxe.o\
-	$(com32)/modules/cpuid.o $(com32)/modules/dmi.o $(topdir)/menu/libmenu/libmenu.a $(LIB) $(C_LIBS)
+	hdt-menu-disk.o hdt-menu-dmi.o hdt-menu-processor.o \
+	hdt-menu-syslinux.o hdt-menu-about.o \
+	hdt-cli.o hdt-common.o hdt-cli-pci.o hdt-cli-dmi.o \
+	hdt-cli-cpu.o hdt-cli-pxe.o hdt-cli-kernel.o \
+	hdt-menu-pxe.o \
+	$(com32)/modules/cpuid.o $(com32)/modules/dmi.o \
+	$(LIBS)
 	$(LD) $(LDFLAGS) -o $@ $^
 
 %.c32: %.elf