aboutsummaryrefslogtreecommitdiffstats
path: root/memdisk
diff options
context:
space:
mode:
authorGene Cumm <gene.cumm@gmail.com>2011-02-08 12:05:25 -0500
committerGene Cumm <gene.cumm@gmail.com>2011-02-08 12:05:25 -0500
commitecf7474b269c442d1277c08a50a487a9fc0b574e (patch)
tree5773f03793c62910431a9c13fe6d8429d04cd3ee /memdisk
parent79c5db6df34806d082fbf7d7c40e249f6a10d823 (diff)
downloadsyslinux-ecf7474b269c442d1277c08a50a487a9fc0b574e.tar.gz
syslinux-ecf7474b269c442d1277c08a50a487a9fc0b574e.tar.xz
syslinux-ecf7474b269c442d1277c08a50a487a9fc0b574e.zip
memdisk: remove unnecessary files; add vpath instead; add files to CSRC
This removes the need to have these tiny files around. This also changes it to be relative to $(topdir), allowing for memdisk to be moved if needed in the future.
Diffstat (limited to 'memdisk')
-rw-r--r--memdisk/Makefile6
-rw-r--r--memdisk/ctypes.c1
-rw-r--r--memdisk/strntoumax.c1
-rw-r--r--memdisk/strtoull.c1
-rw-r--r--memdisk/strtox.c1
-rw-r--r--memdisk/suffix_number.c1
6 files changed, 5 insertions, 6 deletions
diff --git a/memdisk/Makefile b/memdisk/Makefile
index 73305d5e..beead608 100644
--- a/memdisk/Makefile
+++ b/memdisk/Makefile
@@ -43,12 +43,16 @@ OBJS32 = start32.o setup.o msetup.o e820func.o conio.o memcpy.o memset.o \
memdisk_chs_512.o memdisk_edd_512.o \
memdisk_iso_512.o memdisk_iso_2048.o
-CSRC = setup.c msetup.c e820func.c conio.c unzip.c dskprobe.c eltorito.c
+CSRC = setup.c msetup.c e820func.c conio.c unzip.c dskprobe.c eltorito.c \
+ $(topdir)/com32/lib/ctypes.c $(topdir)/com32/lib/strntoumax.c \
+ $(topdir)/com32/lib/strtoull.c $(topdir)/com32/libutil/suffix_number.c
SSRC = start32.S memcpy.S memset.S memmove.S
NASMSRC = memdisk_chs_512.asm memdisk_edd_512.asm \
memdisk_iso_512.asm memdisk_iso_2048.asm \
memdisk16.asm
+vpath %.c $(topdir)/com32/lib:$(topdir)/com32/libutil
+
all: memdisk # e820test
# tidy, clean removes everything except the final binary
diff --git a/memdisk/ctypes.c b/memdisk/ctypes.c
deleted file mode 100644
index f87ca055..00000000
--- a/memdisk/ctypes.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../com32/lib/ctypes.c"
diff --git a/memdisk/strntoumax.c b/memdisk/strntoumax.c
deleted file mode 100644
index 6fa2f357..00000000
--- a/memdisk/strntoumax.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../com32/lib/strntoumax.c"
diff --git a/memdisk/strtoull.c b/memdisk/strtoull.c
deleted file mode 100644
index e2425df3..00000000
--- a/memdisk/strtoull.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../com32/lib/strtoull.c"
diff --git a/memdisk/strtox.c b/memdisk/strtox.c
deleted file mode 100644
index 445681f4..00000000
--- a/memdisk/strtox.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../com32/lib/strtox.c"
diff --git a/memdisk/suffix_number.c b/memdisk/suffix_number.c
deleted file mode 100644
index dd266426..00000000
--- a/memdisk/suffix_number.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../com32/libutil/suffix_number.c"