From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 15 Jun 2015 15:10:37 +0000 (-0400)
Subject: Link DHCP code to libfreeradius-dhcp
X-Git-Tag: release_3_0_9~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c1c626a8f0972573c3cf9cefd340dd9be223cf9;p=thirdparty%2Ffreeradius-server.git

Link DHCP code to libfreeradius-dhcp
---

diff --git a/debian/freeradius-dhcp.install b/debian/freeradius-dhcp.install
index 4fd90acc0f9..aefb0a09ae0 100644
--- 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 7af93fa01da..d098a8af2bc 100644
--- 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
index 00000000000..ab2cfc41808
--- /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 ba888bc0399..c0baecadbf2 100644
--- 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 79d704da81d..9cd33c4f9fd 100644
--- 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