aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2006-10-17 15:25:00 -0700
committerH. Peter Anvin <hpa@zytor.com>2006-10-17 15:25:00 -0700
commitf44248bc9677a6e82c700f91a72d1a798aaa097a (patch)
tree2d212cd4fba894086b997fa8ebd2f48a4fa29501
parent413b6d181f1abe16742437b56217d47567982a92 (diff)
downloadsyslinux-elf-syslinux-3.32-pre2.tar.gz
syslinux-elf-syslinux-3.32-pre2.tar.xz
syslinux-elf-syslinux-3.32-pre2.zip
Makefile cleanup to be able to build with CC='gcc -m32'syslinux-3.32-pre2
-rw-r--r--dos/Makefile4
-rw-r--r--dos/code16.h4
-rw-r--r--win32/Makefile46
3 files changed, 30 insertions, 24 deletions
diff --git a/dos/Makefile b/dos/Makefile
index 5029f4a9..61423cec 100644
--- a/dos/Makefile
+++ b/dos/Makefile
@@ -51,7 +51,9 @@ syslinux.com: syslinux.elf
$(CC) $(CFLAGS) -E -o $@ $<
%.s: %.c
$(CC) $(CFLAGS) -S -o $@ $<
+%.o: %.S
+ $(CC) -Wp,-MT,$@,-MD,.$@.d $(CFLAGS) -D__ASSEMBLY__ -c -o $@ $<
%.s: %.S
- $(CC) $(CFLAGS) -D__ASSEMBLY__ -S -o $@ $<
+ $(CC) $(CFLAGS) -E -o $@ $<
-include .*.d
diff --git a/dos/code16.h b/dos/code16.h
index ceb1600c..ca765651 100644
--- a/dos/code16.h
+++ b/dos/code16.h
@@ -1,2 +1,6 @@
/* Must be included first of all */
+#ifdef __ASSEMBLY__
+ .code16
+#else
__asm__ (".code16gcc");
+#endif
diff --git a/win32/Makefile b/win32/Makefile
index b83a91ec..7843819d 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1,6 +1,6 @@
## -----------------------------------------------------------------------
##
-## Copyright 1998-2004 H. Peter Anvin - All Rights Reserved
+## Copyright 1998-2006 H. Peter Anvin - All Rights Reserved
##
## 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
@@ -19,30 +19,30 @@
OSTYPE = $(shell uname -msr)
ifeq ($(findstring CYGWIN,$(OSTYPE)),CYGWIN)
-CC = gcc
-AR = ar
-RANLIB = ranlib
-CFLAGS = -mno-cygwin -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-PIC =
-LDFLAGS = -mno-cygwin -Os -s
+WINCC = gcc
+WINAR = ar
+WINRANLIB = ranlib
+WINCFLAGS = -mno-cygwin -W -Wall -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
+WINPIC =
+WINLDFLAGS = -mno-cygwin -Os -s
else
ifeq ($(findstring MINGW32,$(OSTYPE)),MINGW32)
-CC = gcc
-AR = ar
-RANLIB = ranlib
+WINCC = gcc
+WINAR = ar
+WINRANLIB = ranlib
else
-CC = mingw-gcc
-AR = mingw-ar
-RANLIB = mingw-ranlib
+WINCC = mingw-gcc
+WINAR = mingw-ar
+WINRANLIB = mingw-ranlib
endif
-CFLAGS = -W -Wall -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
-PIC =
-LDFLAGS = -Os -s
+WINCFLAGS = -W -Wall -Wno-sign-compare -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
+WINPIC =
+WINLDFLAGS = -Os -s
endif
-CFLAGS += -I. -I.. -I../libfat
+WINCFLAGS += -I. -I.. -I../libfat
-CC_IS_GOOD := $(shell $(CC) $(CFLAGS) $(LDFLAGS) -o hello.exe hello.c >/dev/null 2>&1 ; echo $$?)
+WINCC_IS_GOOD := $(shell $(WINCC) $(WINCFLAGS) $(WINLDFLAGS) -o hello.exe hello.c >/dev/null 2>&1 ; echo $$?)
.SUFFIXES: .c .o .i .s .S
@@ -54,7 +54,7 @@ VPATH = .:..:../libfat
TARGETS = syslinux.exe
-ifeq ($(CC_IS_GOOD),0)
+ifeq ($(WINCC_IS_GOOD),0)
all: $(TARGETS)
else
all:
@@ -72,14 +72,14 @@ spotless: clean
installer:
syslinux.exe: $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $^
+ $(WINCC) $(WINLDFLAGS) -o $@ $^
%.o: %.c
- $(CC) -Wp,-MT,$@,-MMD,.$@.d $(CFLAGS) -c -o $@ $<
+ $(WINCC) -Wp,-MT,$@,-MMD,.$@.d $(WINCFLAGS) -c -o $@ $<
%.i: %.c
- $(CC) $(CFLAGS) -E -o $@ $<
+ $(WINCC) $(WINCFLAGS) -E -o $@ $<
%.s: %.c
- $(CC) $(CFLAGS) -S -o $@ $<
+ $(WINCC) $(WINCFLAGS) -S -o $@ $<
-include .*.d