hdt: Moving hdt to com32/modules

diff --git a/Makefile b/Makefile
index edcfb7e..ffbc48f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ BOBJECTS = $(BTARGET) \
 # Note: libinstaller is both a BSUBDIR and an ISUBDIR.  It contains
 # files that depend only on the B phase, but may have to be regenerated
 # for "make installer".
-BSUBDIRS = codepage core memdisk modules com32 mbr memdump gpxe sample hdt \
+BSUBDIRS = codepage core memdisk modules com32 mbr memdump gpxe sample \
           libinstaller dos win32
 ITARGET  =
 IOBJECTS = $(ITARGET) dos/copybs.com \

diff --git a/com32/Makefile b/com32/Makefile
index 9dee968..2897e08 100644 (file)
--- a/com32/Makefile
+++ b/com32/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = lib libutil modules menu samples rosh
+SUBDIRS = lib libutil modules menu samples rosh hdt
 
 all tidy dist clean spotless install:
        set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done

diff --git a/hdt/Makefile b/com32/hdt/Makefile
similarity index 99%
rename from hdt/Makefile
rename to com32/hdt/Makefile
index d2c31b7..917c707 100644 (file)
--- a/hdt/Makefile
+++ b/com32/hdt/Makefile
@@ -14,7 +14,7 @@
 ## samples for syslinux users
 ##
 
-topdir = ..
+topdir = ../..
 include $(topdir)/MCONFIG.embedded
 
 INCLUDES   = -I$(com32)/include

diff --git a/hdt/hdt-ata.c b/com32/hdt/hdt-ata.c
similarity index 100%
rename from hdt/hdt-ata.c
rename to com32/hdt/hdt-ata.c

diff --git a/hdt/hdt-ata.h b/com32/hdt/hdt-ata.h
similarity index 100%
rename from hdt/hdt-ata.h
rename to com32/hdt/hdt-ata.h

diff --git a/hdt/hdt-menu-about.c b/com32/hdt/hdt-menu-about.c
similarity index 100%
rename from hdt/hdt-menu-about.c
rename to com32/hdt/hdt-menu-about.c

diff --git a/hdt/hdt-menu-disk.c b/com32/hdt/hdt-menu-disk.c
similarity index 100%
rename from hdt/hdt-menu-disk.c
rename to com32/hdt/hdt-menu-disk.c

diff --git a/hdt/hdt-menu-dmi.c b/com32/hdt/hdt-menu-dmi.c
similarity index 100%
rename from hdt/hdt-menu-dmi.c
rename to com32/hdt/hdt-menu-dmi.c

diff --git a/hdt/hdt-menu-kernel.c b/com32/hdt/hdt-menu-kernel.c
similarity index 100%
rename from hdt/hdt-menu-kernel.c
rename to com32/hdt/hdt-menu-kernel.c

diff --git a/hdt/hdt-menu-pci.c b/com32/hdt/hdt-menu-pci.c
similarity index 100%
rename from hdt/hdt-menu-pci.c
rename to com32/hdt/hdt-menu-pci.c

diff --git a/hdt/hdt-menu-processor.c b/com32/hdt/hdt-menu-processor.c
similarity index 100%
rename from hdt/hdt-menu-processor.c
rename to com32/hdt/hdt-menu-processor.c

diff --git a/hdt/hdt-menu-syslinux.c b/com32/hdt/hdt-menu-syslinux.c
similarity index 100%
rename from hdt/hdt-menu-syslinux.c
rename to com32/hdt/hdt-menu-syslinux.c

diff --git a/hdt/hdt-menu.c b/com32/hdt/hdt-menu.c
similarity index 100%
rename from hdt/hdt-menu.c
rename to com32/hdt/hdt-menu.c

diff --git a/hdt/hdt-menu.h b/com32/hdt/hdt-menu.h
similarity index 100%
rename from hdt/hdt-menu.h
rename to com32/hdt/hdt-menu.h

diff --git a/hdt/hdt.c b/com32/hdt/hdt.c
similarity index 100%
rename from hdt/hdt.c
rename to com32/hdt/hdt.c

diff --git a/hdt/hdt.h b/com32/hdt/hdt.h
similarity index 100%
rename from hdt/hdt.h
rename to com32/hdt/hdt.h