From 8e4b87918fab1788438463e3f54dac2472318c34 Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Wed, 14 Nov 2012 14:12:56 +0000 Subject: [PATCH] Header-file dependency checking in Makefile. --- CHANGELOG | 3 +++ Makefile | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 42f7f73..9013579 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -48,6 +48,9 @@ version 2.64 Don't include lease-time in DHCPACK replies to DHCPINFORM queries, since RFC-2131 says we shouldn't. Thanks to Wouter Ibens for pointing this out. + + Makefile tweak to do dependency checking on header files. + Thanks to Johan Peeters for the patch. version 2.63 diff --git a/Makefile b/Makefile index ee7d36f..d524924 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,8 @@ all : $(BUILDDIR) clean : rm -f *~ $(BUILDDIR)/*.mo contrib/*/*~ */*~ $(BUILDDIR)/*.pot - rm -f $(BUILDDIR)/*.o $(BUILDDIR)/dnsmasq.a $(BUILDDIR)/dnsmasq core */core + rm -f $(BUILDDIR)/.configured $(BUILDDIR)/*.o $(BUILDDIR)/dnsmasq.a $(BUILDDIR)/dnsmasq + rm -rf core */core install : all install-common @@ -113,7 +114,11 @@ $(BUILDDIR): mkdir -p $(BUILDDIR) -# rules below are targets in recusive makes with cwd=$(SRC) +# rules below are targets in recusive makes with cwd=$(BUILDDIR) + +.configured: $(hdrs) + @rm -f *.o + @touch $@ $(objs:.o=.c) $(hdrs): ln -s $(top)/$(SRC)/$@ . @@ -121,7 +126,7 @@ $(objs:.o=.c) $(hdrs): .c.o: $(CC) $(CFLAGS) $(COPTS) $(i18n) $(build_cflags) $(RPM_OPT_FLAGS) -c $< -dnsmasq : $(hdrs) $(objs) +dnsmasq : .configured $(hdrs) $(objs) $(CC) $(LDFLAGS) -o $@ $(objs) $(build_libs) $(LIBS) dnsmasq.pot : $(objs:.o=.c) $(hdrs)