aboutsummaryrefslogtreecommitdiffstats
path: root/com32/MCONFIG
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-03-12 11:39:57 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-03-12 11:39:57 -0700
commit30e642826f25c07ae13138c0dabee1287f4c52c3 (patch)
tree9052f2c1031cc7015d06cec58cab0ec7c3ebc656 /com32/MCONFIG
parent4a0ddf7d4f453f677224ba712e775fa3e6e00513 (diff)
downloadsyslinux.git-30e642826f25c07ae13138c0dabee1287f4c52c3.tar.gz
syslinux.git-30e642826f25c07ae13138c0dabee1287f4c52c3.tar.xz
syslinux.git-30e642826f25c07ae13138c0dabee1287f4c52c3.zip
Add gpllib, gplinclude
Add separate gpllib and gplinclude directories, and have a NOGPL variable in MCONFIG that can be set to exclude these directories.
Diffstat (limited to 'com32/MCONFIG')
-rw-r--r--com32/MCONFIG13
1 files changed, 11 insertions, 2 deletions
diff --git a/com32/MCONFIG b/com32/MCONFIG
index 2b7e018b..cf5334b3 100644
--- a/com32/MCONFIG
+++ b/com32/MCONFIG
@@ -23,10 +23,18 @@ GCCOPT := $(call gcc_ok,-std=gnu99,) \
com32 = $(topdir)/com32
+ifeq ($(NOGPL),1)
+GPLLIB = $(com32)/libcom32gpl.a
+GPLINCLUDE = -I$(com32)/gplinclude
+else
+GPLLIB =
+GPLINCLUDE =
+endif
+
CFLAGS = $(GCCOPT) -W -Wall -march=i386 \
-fomit-frame-pointer -D__COM32__ \
-nostdinc -iwithprefix include \
- -I$(com32)/libutil/include -I$(com32)/include
+ -I$(com32)/libutil/include -I$(com32)/include $(GPLINCLUDE)
SFLAGS = $(GCCOPT) -D__COM32__ -march=i386
LDFLAGS = -m elf_i386 -T $(com32)/lib/com32.ld
LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc)
@@ -35,7 +43,8 @@ LNXCFLAGS = -I$(com32)/libutil/include -W -Wall -O -g -D_GNU_SOURCE
LNXSFLAGS = -g
LNXLDFLAGS = -g
-C_LIBS = $(com32)/libutil/libutil_com.a $(com32)/lib/libcom32.a $(LIBGCC)
+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