aboutsummaryrefslogtreecommitdiffstats
path: root/memdisk
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-08-22 14:42:40 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-08-22 14:42:40 -0700
commit22a37e436ec3b84ba6dadb44952b0535f96a213c (patch)
treef295bff4f5d3861ea4778a155caf1b222114d353 /memdisk
parentbd09a6d828fa492aed4406adde6c412e0e5c640d (diff)
downloadsyslinux.git-22a37e436ec3b84ba6dadb44952b0535f96a213c.tar.gz
syslinux.git-22a37e436ec3b84ba6dadb44952b0535f96a213c.tar.xz
syslinux.git-22a37e436ec3b84ba6dadb44952b0535f96a213c.zip
Clean up embedded Makefile targets; fix build failure
Unify common pieces to "embedded" targets (those that produce code that runs neither in the host nor in a com32 environment); this fixes the broken sample/ directory Makefile.
Diffstat (limited to 'memdisk')
-rw-r--r--memdisk/Makefile13
1 files changed, 1 insertions, 12 deletions
diff --git a/memdisk/Makefile b/memdisk/Makefile
index 66a6e51a..d3023a0e 100644
--- a/memdisk/Makefile
+++ b/memdisk/Makefile
@@ -11,28 +11,17 @@
## -----------------------------------------------------------------------
topdir = ..
-include $(topdir)/MCONFIG
+include $(topdir)/MCONFIG.embedded
-include $(topdir)/version.mk
-GCCOPT := $(call gcc_ok,-m32,) \
- $(call gcc_ok,-ffreestanding,) \
- $(call gcc_ok,-fno-stack-protector) \
- $(call gcc_ok,-falign-functions=0,-malign-functions=0) \
- $(call gcc_ok,-falign-jumps=0,-malign-jumps=0) \
- $(call gcc_ok,-falign-loops=0,-malign-loops=0) \
- -march=i386 -Os -fomit-frame-pointer -mregparm=3 -DREGPARM=3
-
CFLAGS = $(GCCOPT) -g -W -Wall -Wno-sign-compare -DDATE='"$(DATE)"'
SFLAGS = $(GCCOPT) -D__ASSEMBLY__
LDFLAGS = $(GCCOPT) -g
INCLUDE = -I$(topdir)/com32/include
-LD += -m elf_i386
NASM = nasm
NASMOPT = -O9999
NFLAGS = -dDATE='"$(DATE)"' -dWITH_EDD
NINCLUDE =
-OBJCOPY = objcopy
-PERL = perl
SRCS = $(wildcard *.asm *.c *.h)