Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
geneC committed Feb 8, 2011
1 parent 79c5db6 commit ecf7474
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 6 deletions.
6 changes: 5 additions & 1 deletion memdisk/Makefile
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion memdisk/ctypes.c

This file was deleted.

1 change: 0 additions & 1 deletion memdisk/strntoumax.c

This file was deleted.

1 change: 0 additions & 1 deletion memdisk/strtoull.c

This file was deleted.

1 change: 0 additions & 1 deletion memdisk/strtox.c

This file was deleted.

1 change: 0 additions & 1 deletion memdisk/suffix_number.c

This file was deleted.

0 comments on commit ecf7474

Please sign in to comment.