From 37bfb1cb8b4c1d670e0d407b83c5270f7c457389 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Mon, 2 Mar 2009 10:51:25 -0800 Subject: [PATCH] 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. --- com32/Makefile | 2 +- {menu => com32/cmenu}/CHANGES | 0 {menu => com32/cmenu}/HISTORY | 0 {menu => com32/cmenu}/MANUAL | 0 {menu => com32/cmenu}/MENU_FORMAT | 0 {menu => com32/cmenu}/Makefile | 8 ++++---- {menu => com32/cmenu}/README | 0 {menu => com32/cmenu}/TODO | 0 {menu => com32/cmenu}/adv_menu.tpl | 0 {menu => com32/cmenu}/complex.c | 0 {menu => com32/cmenu}/display.c | 0 {menu => com32/cmenu}/libmenu/com32io.c | 0 {menu => com32/cmenu}/libmenu/com32io.h | 0 {menu => com32/cmenu}/libmenu/des.c | 0 {menu => com32/cmenu}/libmenu/des.h | 0 {menu => com32/cmenu}/libmenu/help.c | 0 {menu => com32/cmenu}/libmenu/help.h | 0 {menu => com32/cmenu}/libmenu/menu.c | 0 {menu => com32/cmenu}/libmenu/menu.h | 0 {menu => com32/cmenu}/libmenu/passwords.c | 0 {menu => com32/cmenu}/libmenu/passwords.h | 0 {menu => com32/cmenu}/libmenu/scancodes.h | 0 {menu => com32/cmenu}/libmenu/syslnx.c | 0 {menu => com32/cmenu}/libmenu/syslnx.h | 0 {menu => com32/cmenu}/libmenu/tui.c | 0 {menu => com32/cmenu}/libmenu/tui.h | 0 {menu => com32/cmenu}/menugen.py | 0 {menu => com32/cmenu}/password | 0 {menu => com32/cmenu}/simple.c | 0 {menu => com32/cmenu}/test.menu | 0 {menu => com32/cmenu}/test2.menu | 0 com32/hdt/Makefile | 23 +++++++++++++---------- 32 files changed, 18 insertions(+), 15 deletions(-) rename {menu => com32/cmenu}/CHANGES (100%) rename {menu => com32/cmenu}/HISTORY (100%) rename {menu => com32/cmenu}/MANUAL (100%) rename {menu => com32/cmenu}/MENU_FORMAT (100%) rename {menu => com32/cmenu}/Makefile (92%) rename {menu => com32/cmenu}/README (100%) rename {menu => com32/cmenu}/TODO (100%) rename {menu => com32/cmenu}/adv_menu.tpl (100%) rename {menu => com32/cmenu}/complex.c (100%) rename {menu => com32/cmenu}/display.c (100%) rename {menu => com32/cmenu}/libmenu/com32io.c (100%) rename {menu => com32/cmenu}/libmenu/com32io.h (100%) rename {menu => com32/cmenu}/libmenu/des.c (100%) rename {menu => com32/cmenu}/libmenu/des.h (100%) rename {menu => com32/cmenu}/libmenu/help.c (100%) rename {menu => com32/cmenu}/libmenu/help.h (100%) rename {menu => com32/cmenu}/libmenu/menu.c (100%) rename {menu => com32/cmenu}/libmenu/menu.h (100%) rename {menu => com32/cmenu}/libmenu/passwords.c (100%) rename {menu => com32/cmenu}/libmenu/passwords.h (100%) rename {menu => com32/cmenu}/libmenu/scancodes.h (100%) rename {menu => com32/cmenu}/libmenu/syslnx.c (100%) rename {menu => com32/cmenu}/libmenu/syslnx.h (100%) rename {menu => com32/cmenu}/libmenu/tui.c (100%) rename {menu => com32/cmenu}/libmenu/tui.h (100%) rename {menu => com32/cmenu}/menugen.py (100%) rename {menu => com32/cmenu}/password (100%) rename {menu => com32/cmenu}/simple.c (100%) rename {menu => com32/cmenu}/test.menu (100%) rename {menu => com32/cmenu}/test2.menu (100%) diff --git a/com32/Makefile b/com32/Makefile index 2897e08..9fbfb67 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 similarity index 100% rename from menu/CHANGES rename to com32/cmenu/CHANGES diff --git a/menu/HISTORY b/com32/cmenu/HISTORY similarity index 100% rename from menu/HISTORY rename to com32/cmenu/HISTORY diff --git a/menu/MANUAL b/com32/cmenu/MANUAL similarity index 100% rename from menu/MANUAL rename to com32/cmenu/MANUAL diff --git a/menu/MENU_FORMAT b/com32/cmenu/MENU_FORMAT similarity index 100% rename from menu/MENU_FORMAT rename to com32/cmenu/MENU_FORMAT diff --git a/menu/Makefile b/com32/cmenu/Makefile similarity index 92% rename from menu/Makefile rename to com32/cmenu/Makefile index 3c58531..e8627a9 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 similarity index 100% rename from menu/README rename to com32/cmenu/README diff --git a/menu/TODO b/com32/cmenu/TODO similarity index 100% rename from menu/TODO rename to com32/cmenu/TODO diff --git a/menu/adv_menu.tpl b/com32/cmenu/adv_menu.tpl similarity index 100% rename from menu/adv_menu.tpl rename to com32/cmenu/adv_menu.tpl diff --git a/menu/complex.c b/com32/cmenu/complex.c similarity index 100% rename from menu/complex.c rename to com32/cmenu/complex.c diff --git a/menu/display.c b/com32/cmenu/display.c similarity index 100% rename from menu/display.c rename to com32/cmenu/display.c diff --git a/menu/libmenu/com32io.c b/com32/cmenu/libmenu/com32io.c similarity index 100% rename from menu/libmenu/com32io.c rename to com32/cmenu/libmenu/com32io.c diff --git a/menu/libmenu/com32io.h b/com32/cmenu/libmenu/com32io.h similarity index 100% rename from menu/libmenu/com32io.h rename to com32/cmenu/libmenu/com32io.h diff --git a/menu/libmenu/des.c b/com32/cmenu/libmenu/des.c similarity index 100% rename from menu/libmenu/des.c rename to com32/cmenu/libmenu/des.c diff --git a/menu/libmenu/des.h b/com32/cmenu/libmenu/des.h similarity index 100% rename from menu/libmenu/des.h rename to com32/cmenu/libmenu/des.h diff --git a/menu/libmenu/help.c b/com32/cmenu/libmenu/help.c similarity index 100% rename from menu/libmenu/help.c rename to com32/cmenu/libmenu/help.c diff --git a/menu/libmenu/help.h b/com32/cmenu/libmenu/help.h similarity index 100% rename from menu/libmenu/help.h rename to com32/cmenu/libmenu/help.h diff --git a/menu/libmenu/menu.c b/com32/cmenu/libmenu/menu.c similarity index 100% rename from menu/libmenu/menu.c rename to com32/cmenu/libmenu/menu.c diff --git a/menu/libmenu/menu.h b/com32/cmenu/libmenu/menu.h similarity index 100% rename from menu/libmenu/menu.h rename to com32/cmenu/libmenu/menu.h diff --git a/menu/libmenu/passwords.c b/com32/cmenu/libmenu/passwords.c similarity index 100% rename from menu/libmenu/passwords.c rename to com32/cmenu/libmenu/passwords.c diff --git a/menu/libmenu/passwords.h b/com32/cmenu/libmenu/passwords.h similarity index 100% rename from menu/libmenu/passwords.h rename to com32/cmenu/libmenu/passwords.h diff --git a/menu/libmenu/scancodes.h b/com32/cmenu/libmenu/scancodes.h similarity index 100% rename from menu/libmenu/scancodes.h rename to com32/cmenu/libmenu/scancodes.h diff --git a/menu/libmenu/syslnx.c b/com32/cmenu/libmenu/syslnx.c similarity index 100% rename from menu/libmenu/syslnx.c rename to com32/cmenu/libmenu/syslnx.c diff --git a/menu/libmenu/syslnx.h b/com32/cmenu/libmenu/syslnx.h similarity index 100% rename from menu/libmenu/syslnx.h rename to com32/cmenu/libmenu/syslnx.h diff --git a/menu/libmenu/tui.c b/com32/cmenu/libmenu/tui.c similarity index 100% rename from menu/libmenu/tui.c rename to com32/cmenu/libmenu/tui.c diff --git a/menu/libmenu/tui.h b/com32/cmenu/libmenu/tui.h similarity index 100% rename from menu/libmenu/tui.h rename to com32/cmenu/libmenu/tui.h diff --git a/menu/menugen.py b/com32/cmenu/menugen.py similarity index 100% rename from menu/menugen.py rename to com32/cmenu/menugen.py diff --git a/menu/password b/com32/cmenu/password similarity index 100% rename from menu/password rename to com32/cmenu/password diff --git a/menu/simple.c b/com32/cmenu/simple.c similarity index 100% rename from menu/simple.c rename to com32/cmenu/simple.c diff --git a/menu/test.menu b/com32/cmenu/test.menu similarity index 100% rename from menu/test.menu rename to com32/cmenu/test.menu diff --git a/menu/test2.menu b/com32/cmenu/test2.menu similarity index 100% rename from menu/test2.menu rename to com32/cmenu/test2.menu diff --git a/com32/hdt/Makefile b/com32/hdt/Makefile index a8f87c9..a9861bb 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 -- 2.7.4