Link DHCP code to libfreeradius-dhcp

diff --git a/debian/freeradius-dhcp.install b/debian/freeradius-dhcp.install
index 4fd90acc0f90f5595aa0ab186d6ffc9887731f55..aefb0a09ae058c47023b20cf0d0046c819af13b9 100644 (file)
--- a/debian/freeradius-dhcp.install
+++ b/debian/freeradius-dhcp.install
@@ -1,2 +1,3 @@
 usr/lib/freeradius/rlm_dhcp*.so
 usr/lib/freeradius/proto_dhcp*.so
+usr/lib/freeradius/libfreeradius-dhcp.so

diff --git a/src/modules/proto_dhcp/all.mk b/src/modules/proto_dhcp/all.mk
index 7af93fa01da2ec9300942b5c8208ed94214ac7d4..d098a8af2bcfcddbabd0208efc2a6ec87c8761f9 100644 (file)
--- a/src/modules/proto_dhcp/all.mk
+++ b/src/modules/proto_dhcp/all.mk
@@ -1 +1 @@
-SUBMAKEFILES := proto_dhcp.mk rlm_dhcp.mk dhcpclient.mk
+SUBMAKEFILES := libfreeradius-dhcp.mk proto_dhcp.mk rlm_dhcp.mk dhcpclient.mk

diff --git a/src/modules/proto_dhcp/libfreeradius-dhcp.mk b/src/modules/proto_dhcp/libfreeradius-dhcp.mk
new file mode 100644 (file)
index 0000000..ab2cfc4
--- /dev/null
+++ b/src/modules/proto_dhcp/libfreeradius-dhcp.mk
@@ -0,0 +1,3 @@
+TARGET         := libfreeradius-dhcp.a
+
+SOURCES                := dhcp.c

diff --git a/src/modules/proto_dhcp/proto_dhcp.mk b/src/modules/proto_dhcp/proto_dhcp.mk
index ba888bc03994875a6e309062977847ecb3e0bdc5..c0baecadbf21ed30cab90476c4435b68f14476fd 100644 (file)
--- a/src/modules/proto_dhcp/proto_dhcp.mk
+++ b/src/modules/proto_dhcp/proto_dhcp.mk
@@ -4,4 +4,6 @@ ifneq "$(TARGETNAME)" ""
 TARGET         := $(TARGETNAME).a
 endif
 
-SOURCES                := dhcpd.c dhcp.c
+SOURCES                := dhcpd.c
+
+TGT_PREREQS    := libfreeradius-dhcp.a

diff --git a/src/modules/proto_dhcp/rlm_dhcp.mk b/src/modules/proto_dhcp/rlm_dhcp.mk
index 79d704da81d2abb7a7a825554b02135d2ed9a3d4..9cd33c4f9fdd8ed270728a2381394c569d9288c9 100644 (file)
--- a/src/modules/proto_dhcp/rlm_dhcp.mk
+++ b/src/modules/proto_dhcp/rlm_dhcp.mk
@@ -1,2 +1,4 @@
 TARGET         := rlm_dhcp.a
-SOURCES                := rlm_dhcp.c ${top_srcdir}/src/modules/proto_dhcp/dhcp.c
+SOURCES                := rlm_dhcp.c
+
+TGT_PREREQS    := libfreeradius-dhcp.a