ttls: return channel bindings on half round trip success

[freeradius.git] / Makefile

diff --git a/Makefile b/Makefile
index bd3709a..cfcb30c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,8 @@ export DESTDIR := $(R)
 # And over-ride all of the other magic.
 include scripts/boiler.mk
 
-# These are not yet converted to the new system
-SUBDIRS                = $(wildcard raddb)
-
-.PHONY: test
-test:
+test: build.raddb
+       @$(MAKE) -C raddb/certs
        @$(MAKE) -C src/tests tests
 
 #
@@ -55,10 +52,6 @@ install.bindir:
 install.sbindir:
        @[ -d $(R)$(sbindir) ] || $(INSTALL) -d -m 755 $(R)$(sbindir)
 
-.PHONY: install.raddbdir
-install.raddbdir:
-       @[ -d $(R)$(raddbdir) ] || $(INSTALL) -d -m 755 $(R)$(raddbdir)
-
 .PHONY: install.dirs
 install.dirs: install.bindir install.sbindir
        @$(INSTALL) -d -m 755   $(R)$(mandir)
@@ -84,9 +77,6 @@ $(R)$(mandir)/%: man/%
 
 install: install.dirs install.share install.man
 
-install:
-       @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
-
 ifneq ($(RADMIN),)
 ifneq ($(RGROUP),)
 .PHONY: install-chown
@@ -108,20 +98,6 @@ install-chown:
 endif
 endif
 
-.PHONY: common $(SUBDIRS)
-
-#
-#  We need to convert these directories to boilermake!
-#
-all:
-       @$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
-
-common: $(SUBDIRS)
-
-$(SUBDIRS):
-       @echo "Making $(WHAT_TO_MAKE) in $@..."
-       @$(MAKE) $(MFLAGS) -C $@ $(WHAT_TO_MAKE)
-
 distclean: clean
        @rm -f config.cache config.log config.status libtool \
                src/include/radpaths.h src/include/stamp-h \
@@ -140,24 +116,33 @@ distclean: clean
 #  Automatic remaking rules suggested by info:autoconf#Automatic_Remaking
 #
 ######################################################################
-.PHONY: reconfig
-reconfig:
-       @$(MAKE) $(MFLAGS) -C src reconfig
-       @$(MAKE) configure
-       @$(MAKE) src/include/autoconf.h.in
-
-configure: configure.in aclocal.m4
-       $(AUTOCONF)
-
-.PHONY: src/include/autoconf.h.in
-src/include/autoconf.h.in:
-       $(AUTOHEADER)
+CONFIGURE_IN_FILES := $(shell find . -name configure.in -print)
+CONFIGURE_FILES           := $(patsubst %.in,%,$(CONFIGURE_IN_FILES))
+
+# Configure files depend on "in" files, and on the top-level macro files
+# If there are headers, run auto-header, too.
+src/%configure: src/%configure.in acinclude.m4 aclocal.m4
+       @echo AUTOCONF $@
+       @cd $(dir $@) && $(AUTOCONF) -I $(top_builddir) -I $(top_builddir)/m4 -I ./m4
+       @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)
+
+src/include/autoconf.h.in: configure.in
+       @echo AUTOHEADER $@
+       @$(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`