From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 8 Nov 2012 20:22:49 +0000 (-0500)
Subject: Fix build rules to have proper dependencies
X-Git-Tag: release_3_0_0_beta1~1581
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73be66a41c6592ace8997340b6e0571189ff2a2d;p=thirdparty%2Ffreeradius-server.git

Fix build rules to have proper dependencies
---

diff --git a/src/include/all.mk b/src/include/all.mk
index 170a81d5331..0c2f377e03c 100644
--- a/src/include/all.mk
+++ b/src/include/all.mk
@@ -13,7 +13,7 @@ HEADERS	= conf.h conffile.h detail.h dhcp.h event.h features.h hash.h heap.h \
 TARGET := src/include/radpaths.h
 
 src/include/radpaths.h: src/include/build-radpaths-h
-	cd src/include && /bin/sh build-radpaths-h
+	@cd src/include && /bin/sh build-radpaths-h
 
 #
 #  Build dynamic headers by substituting various values from autoconf.h, these
@@ -22,7 +22,7 @@ src/include/radpaths.h: src/include/build-radpaths-h
 #
 
 HEADERS_AC = src/include/missing.h src/include/tls.h
-HEADERS_DY = src/include/autoconf.sed src/include/features.h $(HEADERS_AC)
+HEADERS_DY = src/include/features.h $(HEADERS_AC)
 
 define clean_others
 @rm -f $(HEADERS_DY)
@@ -30,21 +30,24 @@ endef
 
 TGT_POSTCLEAN := ${clean_others}
 
-all: $(HEADERS_DY)
-
-src/include/features.h:
-	@cp src/include/features-h src/include/features.h
-	@grep -o "^\#define\s*WITH_.*" src/include/autoconf.h >> src/include/features.h
-
-src/include/autoconf.sed:
+src/include/autoconf.sed: src/include/autoconf.h
 	@grep ^#define src/include/autoconf.h | sed 's,/\*\*/,1,;' | awk '{print "\
 	s,#[[:blank:]]*ifdef[[:blank:]]*" $$2 ",#if "$$3 ",g;\
 	s,#[[:blank:]]*ifndef[[:blank:]]*" $$2 ",#if !"$$3 ",g;\
 	s,defined(" $$2 ")," $$3 ",g;\
-	s," $$2 ","$$3 ",g;"}' > src/include/autoconf.sed
+	s," $$2 ","$$3 ",g;"}' > $@
+
+src/include/features.h: src/include/features-h src/include/autoconf.h
+	@cp $< $@
+	@grep "^\#define *WITH_.*" src/include/autoconf.h >> $@
 
-$(HEADERS_AC): src/include/autoconf.sed
-	@sed -f src/include/autoconf.sed < `echo $@ | sed 's/\\./-/'` > $@
+src/include/missing.h: src/include/missing-h src/include/autoconf.sed
+	@sed -f src/include/autoconf.sed < $< > $@
+
+src/include/tls.h: src/include/tls-h src/include/autoconf.sed
+	@sed -f src/include/autoconf.sed < $< > $@
+
+all: $(HEADERS_DY)
 
 #
 #  Installation