[syslinux:master] memdisk: remove unnecessary files; add vpath instead; add files to CSRC
syslinux-bot for Gene Cumm
gene.cumm at gmail.com
Wed Mar 2 15:12:48 PST 2011
Commit-ID: ecf7474b269c442d1277c08a50a487a9fc0b574e
Gitweb: http://syslinux.zytor.com/commit/ecf7474b269c442d1277c08a50a487a9fc0b574e
Author: Gene Cumm <gene.cumm at gmail.com>
AuthorDate: Tue, 8 Feb 2011 12:05:25 -0500
Committer: Gene Cumm <gene.cumm at gmail.com>
CommitDate: Tue, 8 Feb 2011 12:05:25 -0500
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.
---
memdisk/Makefile | 6 +++++-
memdisk/ctypes.c | 1 -
memdisk/strntoumax.c | 1 -
memdisk/strtoull.c | 1 -
memdisk/strtox.c | 1 -
memdisk/suffix_number.c | 1 -
6 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/memdisk/Makefile b/memdisk/Makefile
index 73305d5..beead60 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 f87ca05..0000000
--- 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 6fa2f35..0000000
--- 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 e2425df..0000000
--- 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 445681f..0000000
--- 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 dd26642..0000000
--- a/memdisk/suffix_number.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../com32/libutil/suffix_number.c"
More information about the Syslinux-commits
mailing list