diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-08-20 15:15:34 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-08-20 15:15:34 -0700 |
| commit | bd09a6d828fa492aed4406adde6c412e0e5c640d (patch) | |
| tree | 660a4813999ba273afb26fd3e137399cb0a57a97 /extlinux | |
| parent | 6aa3a1c8380276387430684eb39650e958b0030a (diff) | |
| download | syslinux-elf-bd09a6d828fa492aed4406adde6c412e0e5c640d.tar.gz syslinux-elf-bd09a6d828fa492aed4406adde6c412e0e5c640d.tar.xz syslinux-elf-bd09a6d828fa492aed4406adde6c412e0e5c640d.zip | |
Major Makefile cleanups; gcc 4.3.0 compatiblity
Cleanup and centralize the Makefile system even more.
Fix a gcc 4.3 incompatibility in memdisk (definition of strlen).
Diffstat (limited to 'extlinux')
| -rw-r--r-- | extlinux/Makefile | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/extlinux/Makefile b/extlinux/Makefile index ec212d68..d915e5a9 100644 --- a/extlinux/Makefile +++ b/extlinux/Makefile @@ -1,16 +1,27 @@ -TMPFILE = $(shell mktemp /tmp/gcc_ok.XXXXXX) -CC = gcc - -gcc_ok = $(shell tmpf=$(TMPFILE); if $(CC) $(1) ../dummy.c -o $$tmpf 2>/dev/null; \ - then echo '$(1)'; else echo '$(2)'; fi; rm -f $$tmpf) - -comma := , -LDHASH := $(call gcc_ok,-Wl$(comma)--hash-style=both,) +## ----------------------------------------------------------------------- +## +## Copyright 2001-2008 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 +## the Free Software Foundation, Inc., 53 Temple Place Ste 330, +## Boston MA 02111-1307, USA; either version 2 of the License, or +## (at your option) any later version; incorporated herein by reference. +## +## ----------------------------------------------------------------------- + +## +## Linux ext2/ext3 installer +## + +topdir = .. +include $(topdir)/MCONFIG OPTFLAGS = -g -Os INCLUDES = -I. -I.. -I../libinstaller -CFLAGS = -W -Wall -Wno-sign-compare -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(INCLUDES) -LDFLAGS = $(LDHASH) # -s +CFLAGS = -W -Wall -Wno-sign-compare -D_FILE_OFFSET_BITS=64 \ + $(OPTFLAGS) $(INCLUDES) +LDFLAGS = # -s SRCS = main.c \ ../libinstaller/setadv.c \ @@ -25,7 +36,7 @@ VPATH = .:../libinstaller all: installer tidy dist: - -rm -f *.o *.i *.s *.a .*.d + -rm -f *.o *.i *.s *.a .*.d *.tmp clean: tidy -rm -f extlinux @@ -45,4 +56,4 @@ extlinux: $(OBJS) %.s: %.c $(CC) $(CFLAGS) -S -o $@ $< --include .*.d +-include .*.d *.tmp |