From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 1 Mar 2013 16:09:26 +0000 (-0500)
Subject: Use GNU Make patterns to regenerate configure scripts
X-Git-Tag: release_3_0_0_beta1~887
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90424455367021c19f4ac025a683c2cff794e518;p=thirdparty%2Ffreeradius-server.git

Use GNU Make patterns to regenerate configure scripts
---

diff --git a/Makefile b/Makefile
index b73e316e77b..d1eac352837 100644
--- a/Makefile
+++ b/Makefile
@@ -116,34 +116,33 @@ distclean: clean
 #  Automatic remaking rules suggested by info:autoconf#Automatic_Remaking
 #
 ######################################################################
-CONFIG_FILES := $(wildcard src/modules/rlm_*/configure.in src/modules/rlm_*/*/*/configure.in)
+CONFIGURE_IN_FILES := $(shell find . -name configure.in -print)
+CONFIGURE_FILES	   := $(patsubst %.in,%,$(CONFIGURE_IN_FILES))
 
-$(CONFIG_FILES):
-	@echo "Making reconfig in $(dir $@)..."
+# Configure files depend on "in" files.
+# If there are headers, run auto-header, too.
+src/%configure: src/%configure.in
+	@echo AUTOCONF $@
 	@cd $(dir $@) && $(AUTOCONF) -I $(top_builddir)
 	@if grep AC_CONFIG_HEADERS $@ >/dev/null; then\
+		echo AUTOHEADER $@ \
 		cd $(dir $@) && $(AUTOHEADER); \
 	 fi
 
+# "%configure" doesn't match "configure"
+configure: configure.in $(wildcard ac*.m4)
+	@echo AUTOCONF $@
+	@$(AUTOCONF)
 
-.PHONY: reconfig
-reconfig:
-	@$(MAKE) $(MFLAGS) -C src reconfig
-	@$(MAKE) configure
-	@$(MAKE) src/include/autoconf.h.in
+src/include/autoconf.h.in: configure.in
+	@echo AUTOHEADER $@
+	@$(AUTOHEADER)
 
-configure: configure.in aclocal.m4
-	$(AUTOCONF)
-
-.PHONY: src/include/autoconf.h.in
-src/include/autoconf.h.in:
-	$(AUTOHEADER)
+reconfig: $(CONFIGURE_FILES) src/include/autoconf.h.in
 
 config.status: configure
 	./config.status --recheck
 
-configure.in:
-
 .PHONY: check-includes
 check-includes:
 	scripts/min-includes.pl `find . -name "*.c" -print`