1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
--- 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
@@ -15,15 +15,9 @@
LOCAL_MODULES := $(addprefix raddb/mods-enabled/,$(DEFAULT_MODULES))
-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 \
+RADDB_DIRS := mods-available mods-enabled policy.d \
sites-available sites-enabled \
$(patsubst raddb/%,%,$(shell find raddb/mods-config -type d -print))
@@ -33,7 +27,6 @@
# Grab files from the various subdirectories
INSTALL_FILES := $(wildcard raddb/sites-available/* raddb/mods-available/*) \
$(addprefix raddb/,$(LOCAL_FILES)) \
- $(addprefix raddb/certs/,$(LOCAL_CERT_FILES)) \
$(shell find raddb/mods-config -type f -print) \
$(shell find raddb/policy.d -type f -print)
@@ -111,15 +104,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.
|
