aboutsummaryrefslogtreecommitdiffstats
path: root/com32/MCONFIG
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@linux.intel.com>2011-04-07 17:12:08 +0100
committerMatt Fleming <matt.fleming@linux.intel.com>2011-04-07 17:59:11 +0100
commitd7e6cfaa6a990eb8fe2eaabe7fad1d1c8367a7ee (patch)
treebc682bbbae1ec577e2763386a476a99b1fbee255 /com32/MCONFIG
parent868c474546ba68e9e448734e1833f873fd50ec0a (diff)
downloadsyslinux-d7e6cfaa6a990eb8fe2eaabe7fad1d1c8367a7ee.tar.gz
syslinux-d7e6cfaa6a990eb8fe2eaabe7fad1d1c8367a7ee.tar.xz
syslinux-d7e6cfaa6a990eb8fe2eaabe7fad1d1c8367a7ee.zip
Makefile: Move Makefile fragments into mk/
Move the MCONFIG files into a mk/ directory and give them more descriptive names. This is purely a cosmetic change to make the 'include' directives a bit more coherent by making it obvious exactly which MCONFIG file we're including. For example, in com32/lua/src/Makefile we exchange the line, include ../../MCONFIG for the much more comprehensible, include $(MAKEDIR)/com32.mk Signed-off-by: Matt Fleming <matt.fleming@linux.intel.com>
Diffstat (limited to 'com32/MCONFIG')
-rw-r--r--com32/MCONFIG98
1 files changed, 0 insertions, 98 deletions
diff --git a/com32/MCONFIG b/com32/MCONFIG
deleted file mode 100644
index a74ed326..00000000
--- a/com32/MCONFIG
+++ /dev/null
@@ -1,98 +0,0 @@
-## -*- makefile -*- -------------------------------------------------------
-##
-## Copyright 2008-2009 H. Peter Anvin - All Rights Reserved
-## Copyright 2009 Intel Corporation; author: H. Peter Anvin
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-## Boston MA 02110-1301, USA; either version 2 of the License, or
-## (at your option) any later version; incorporated herein by reference.
-##
-## -----------------------------------------------------------------------
-
-##
-## COM32 common configurables
-##
-
-include $(topdir)/MCONFIG
-
-GCCOPT := $(call gcc_ok,-std=gnu99,)
-GCCOPT += $(call gcc_ok,-m32,)
-GCCOPT += $(call gcc_ok,-fno-stack-protector,)
-GCCOPT += $(call gcc_ok,-fwrapv,)
-GCCOPT += $(call gcc_ok,-freg-struct-return,)
-GCCOPT += -mregparm=3 -DREGPARM=3 -march=i386 -Os
-GCCOPT += $(call gcc_ok,-fPIE,-fPIC)
-GCCOPT += $(call gcc_ok,-fno-exceptions,)
-GCCOPT += $(call gcc_ok,-fno-asynchronous-unwind-tables,)
-GCCOPT += $(call gcc_ok,-fno-strict-aliasing,)
-GCCOPT += $(call gcc_ok,-falign-functions=0,-malign-functions=0)
-GCCOPT += $(call gcc_ok,-falign-jumps=0,-malign-jumps=0)
-GCCOPT += $(call gcc_ok,-falign-labels=0,-malign-labels=0)
-GCCOPT += $(call gcc_ok,-falign-loops=0,-malign-loops=0)
-GCCOPT += $(call gcc_ok,-mpreferred-stack-boundary=2,)
-GCCOPT += $(call gcc_ok,-incoming-stack-boundary=2,)
-
-com32 := $(topdir)/com32
-RELOCS := $(com32)/tools/relocs
-
-ifneq ($(NOGPL),1)
-GPLLIB = $(com32)/gpllib/libcom32gpl.a
-GPLINCLUDE = -I$(com32)/gplinclude
-else
-GPLLIB =
-GPLINCLUDE =
-endif
-
-CFLAGS = $(GCCOPT) $(GCCWARN) -march=i386 \
- -fomit-frame-pointer -D__COM32__ \
- -nostdinc -iwithprefix include \
- -I$(com32)/libutil/include -I$(com32)/include $(GPLINCLUDE)
-SFLAGS = $(GCCOPT) $(GCCWARN) -march=i386 \
- -fomit-frame-pointer -D__COM32__ \
- -nostdinc -iwithprefix include \
- -I$(com32)/libutil/include -I$(com32)/include $(GPLINCLUDE)
-
-COM32LD = $(com32)/lib/com32.ld
-LDFLAGS = -m elf_i386 --emit-relocs -T $(COM32LD)
-LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc)
-
-LNXCFLAGS = -I$(com32)/libutil/include $(GCCWARN) -O -g \
- -D_GNU_SOURCE -D_FORTIFY_SOURCE=0 -Wno-error
-LNXSFLAGS = -g
-LNXLDFLAGS = -g
-
-C_LIBS = $(com32)/libutil/libutil_com.a $(GPLLIB) \
- $(com32)/lib/libcom32.a $(LIBGCC)
-C_LNXLIBS = $(com32)/libutil/libutil_lnx.a
-
-.SUFFIXES: .lss .c .lo .o .elf .c32 .lnx
-
-.PRECIOUS: %.o
-%.o: %.S
- $(CC) $(MAKEDEPS) $(SFLAGS) -c -o $@ $<
-
-.PRECIOUS: %.o
-%.o: %.c
- $(CC) $(MAKEDEPS) $(CFLAGS) -c -o $@ $<
-
-.PRECIOUS: %.elf
-%.elf: %.o $(LIBS) $(C_LIBS) $(COM32LD)
- $(LD) $(LDFLAGS) -o $@ $(filter-out $(COM32LD),$^)
-
-.PRECIOUS: %.lo
-%.lo: %.S
- $(CC) $(MAKEDEPS) $(LNXSFLAGS) -c -o $@ $<
-
-.PRECIOUS: %.lo
-%.lo: %.c
- $(CC) $(MAKEDEPS) $(LNXCFLAGS) -c -o $@ $<
-
-.PRECIOUS: %.lnx
-%.lnx: %.lo $(LNXLIBS) $(C_LNXLIBS)
- $(CC) $(LNXCFLAGS) -o $@ $^
-
-%.c32: %.elf
- $(OBJCOPY) -O binary $< $@
- $(RELOCS) $< >> $@ || ( rm -f $@ ; false )