--- a/Makefile +++ b/Makefile @@ -40,7 +40,6 @@ # Only redirect STDOUT, which should contain details of why the test failed. # Don't molest STDERR as this may be used to receive output from a debugger. $(BUILD_DIR)/tests/radiusd-c: raddb/test.conf ${BUILD_DIR}/bin/radiusd | build.raddb - @$(MAKE) -C raddb/certs @printf "radiusd -C... " @if ! ./build/make/jlibtool --mode=execute ./build/bin/radiusd -XCMd ./raddb -D ./share -n test > $(BUILD_DIR)/tests/radiusd.config.log; then \ @rm -f raddb/test.conf; \ @@ -224,13 +223,6 @@ .PHONY: TAGS TAGS: etags `find src -type f -name '*.[ch]' -print` > $@ - -# -# Make test certificates. -# -.PHONY: certs -certs: - @$(MAKE) -C raddb/certs ###################################################################### # --- a/raddb/all.mk +++ b/raddb/all.mk @@ -18,9 +18,6 @@ LOCAL_CERT_FILES := Makefile README xpextensions \ ca.cnf server.cnf client.cnf bootstrap -LOCAL_CERT_PRODUCTS := $(addprefix $(R)$(raddbdir)/certs/,ca.key ca.pem \ - client.key client.pem server.key server.pem) - LEGACY_LINKS := $(addprefix $(R)$(raddbdir)/,users huntgroups hints) RADDB_DIRS := certs mods-available mods-enabled policy.d \ @@ -111,15 +108,6 @@ $(R)$(raddbdir)/users: $(R)$(modconfdir)/files/authorize @[ -e $@ ] || echo LN-S $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) @[ -e $@ ] || ln -s $(patsubst $(R)$(raddbdir)/%,./%,$<) $@ - -$(LOCAL_CERT_PRODUCTS): - @echo BOOTSTRAP raddb/certs/ - @$(MAKE) -C $(R)$(raddbdir)/certs/ - -# Bootstrap is special -$(R)$(raddbdir)/certs/bootstrap: | raddb/certs/bootstrap $(LOCAL_CERT_PRODUCTS) - @echo INSTALL $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) - @$(INSTALL) -m 750 $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) $@ # List directories before the file targets. # It's not clear why GNU Make doesn't deal well with this.