aboutsummaryrefslogtreecommitdiffstats
path: root/dos
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 /dos
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 'dos')
-rw-r--r--dos/Makefile18
1 files changed, 2 insertions, 16 deletions
diff --git a/dos/Makefile b/dos/Makefile
index 028e8330..da73a6d5 100644
--- a/dos/Makefile
+++ b/dos/Makefile
@@ -15,24 +15,12 @@
##
topdir = ..
-include $(topdir)/MCONFIG
+include $(topdir)/MCONFIG.embedded
-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 \
- -msoft-float
-
-LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc)
-
-LDFLAGS = -m elf_i386 -T com16.ld
+LDFLAGS = -T com16.ld
OPTFLAGS = -g
INCLUDES = -include code16.h -nostdinc -iwithprefix include \
-I. -I.. -I../libfat -I ../libinstaller
-CFLAGS = $(GCCOPT) -W -Wall -msoft-float $(OPTFLAGS) $(INCLUDES)
SRCS = syslinux.c \
../libinstaller/syslxmod.c \
@@ -44,8 +32,6 @@ OBJS = crt0.o $(patsubst %.c,%.o,$(notdir $(SRCS)))
LIBOBJS = conio.o memcpy.o memset.o skipatou.o atou.o malloc.o free.o \
argv.o printf.o __divdi3.o __udivmoddi4.o
-.SUFFIXES: .c .o .i .s .S .elf .com .asm .lst
-
VPATH = .:../libfat:../libinstaller
TARGETS = syslinux.com copybs.com