aboutsummaryrefslogtreecommitdiffstats
path: root/utils
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 /utils
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 'utils')
-rw-r--r--utils/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/utils/Makefile b/utils/Makefile
index de8c9992..179d5da6 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -26,7 +26,7 @@ ASIS = keytab-lilo lss16toppm md5pass ppmtolss16 sha1pass syslinux2ansi
all: $(TARGETS)
%.o: %.c
- $(CC) $(CFLAGS) -c -o $@ $<
+ $(CC) $(UMAKEDEPS) $(CFLAGS) -c -o $@ $<
mkdiskimage: mkdiskimage.in ../mbr/mbr.bin bin2hex.pl
$(PERL) bin2hex.pl < ../mbr/mbr.bin | cat mkdiskimage.in - > $@
@@ -40,7 +40,7 @@ gethostip: gethostip.o
$(CC) $(LDFLAGS) -o $@ $^
tidy dist:
- rm -f *.o
+ rm -f *.o .*.d
clean: tidy
rm -f $(TARGETS)
@@ -52,3 +52,5 @@ installer: all
install: installer
mkdir -m 755 -p $(INSTALLROOT)$(BINDIR)
install -m 755 $(TARGETS) $(ASIS) $(INSTALLROOT)$(BINDIR)
+
+-include .*.d