aboutsummaryrefslogtreecommitdiffstats
path: root/com32
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-04-27 20:58:14 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-04-27 20:58:14 -0700
commitfe9385228a7845e98485c925031ee5a46f5dfd3b (patch)
tree93f63bc09e86b3f8c0139e87a017f3c0f015eccb /com32
parentf2dc4e108dbec03b05f8629626b0006454e6195e (diff)
downloadsyslinux.git-fe9385228a7845e98485c925031ee5a46f5dfd3b.tar.gz
syslinux.git-fe9385228a7845e98485c925031ee5a46f5dfd3b.tar.xz
syslinux.git-fe9385228a7845e98485c925031ee5a46f5dfd3b.zip
Unify dependency generation
Make the dependency generation more common; have a general pattern in MCONFIG, and use it in rules (not in CFLAGS). For NASM source, in order to stay compatible with old versions of NASM, run NASM twice; newer versions of NASM is capable of generating dependencies simultaneously like gcc can, but that would break compatibility with older distros. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32')
-rw-r--r--com32/MCONFIG18
1 files changed, 10 insertions, 8 deletions
diff --git a/com32/MCONFIG b/com32/MCONFIG
index 599cfb67..e02ec67c 100644
--- a/com32/MCONFIG
+++ b/com32/MCONFIG
@@ -35,10 +35,12 @@ endif
CFLAGS = $(GCCOPT) -W -Wall -march=i386 \
-fomit-frame-pointer -D__COM32__ \
-nostdinc -iwithprefix include \
- -I$(com32)/libutil/include -I$(com32)/include $(GPLINCLUDE) \
- -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d
-SFLAGS = $(GCCOPT) -D__COM32__ -march=i386 \
- -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d
+ -I$(com32)/libutil/include -I$(com32)/include $(GPLINCLUDE)
+SFLAGS = $(GCCOPT) -W -Wall -march=i386 \
+ -fomit-frame-pointer -D__COM32__ \
+ -nostdinc -iwithprefix include \
+ -I$(com32)/libutil/include -I$(com32)/include $(GPLINCLUDE)
+
LDFLAGS = -m elf_i386 -T $(com32)/lib/com32.ld
LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc)
@@ -54,11 +56,11 @@ C_LNXLIBS = $(com32)/libutil/libutil_lnx.a
.PRECIOUS: %.o
%.o: %.S
- $(CC) $(SFLAGS) -c -o $@ $<
+ $(CC) $(MAKEDEPS) $(SFLAGS) -c -o $@ $<
.PRECIOUS: %.o
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(CC) $(MAKEDEPS) $(CFLAGS) -c -o $@ $<
.PRECIOUS: %.elf
%.elf: %.o $(LIBS) $(C_LIBS)
@@ -66,11 +68,11 @@ C_LNXLIBS = $(com32)/libutil/libutil_lnx.a
.PRECIOUS: %.lo
%.lo: %.S
- $(CC) $(LNXSFLAGS) -c -o $@ $<
+ $(CC) $(MAKEDEPS) $(LNXSFLAGS) -c -o $@ $<
.PRECIOUS: %.lo
%.lo: %.c
- $(CC) $(LNXCFLAGS) -c -o $@ $<
+ $(CC) $(MAKEDEPS) $(LNXCFLAGS) -c -o $@ $<
.PRECIOUS: %.lnx
%.lnx: %.lo $(LNXLIBS) $(C_LNXLIBS)